Compare commits
11 Commits
79a7bb639a
...
71a0889ad8
Author | SHA1 | Date |
---|---|---|
Fleur Kelpin | 71a0889ad8 | |
Fleur Kelpin | f43b21bcc6 | |
Fleur Kelpin | 367c63eaa5 | |
Fleur Kelpin | 55ad5b26fb | |
Fleur Kelpin | 86d6dfb86b | |
Fleur Kelpin | b58a1d2042 | |
Fleur Kelpin | 28bf98e6b2 | |
Fleur Kelpin | 26d366f1a1 | |
Fleur Kelpin | b64ee00cff | |
Fleur Kelpin | 2190ada376 | |
Fleur Kelpin | f6905334e1 |
|
@ -0,0 +1,16 @@
|
|||
pipeline {
|
||||
agent {
|
||||
kubernetes {
|
||||
label 'helm'
|
||||
}
|
||||
}
|
||||
stages {
|
||||
stage('Test') {
|
||||
steps {
|
||||
container('chart-testing') {
|
||||
sh "chart_test.sh --no-install --all"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -5,4 +5,8 @@ name: molgenis-httpd
|
|||
version: 0.1.0
|
||||
sources:
|
||||
- https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
|
||||
icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-httpd/catalogIcon-molgenis-httpd.svg
|
||||
icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-httpd/catalogIcon-molgenis-httpd.svg
|
||||
home: http://httpd.apache.org
|
||||
maintainers:
|
||||
- name: sidohaakma
|
||||
- name: fdlk
|
Before Width: | Height: | Size: 89 KiB After Width: | Height: | Size: 89 KiB |
|
@ -48,4 +48,4 @@ nodeSelector: {}
|
|||
|
||||
tolerations: []
|
||||
|
||||
affinity: {}
|
||||
affinity: {}
|
|
@ -1,8 +1,11 @@
|
|||
name: molgenis-jenkins
|
||||
home: https://jenkins.io/
|
||||
version: 0.8.0
|
||||
appVersion: 2.121
|
||||
version: 0.8.1
|
||||
appVersion: 2.138.1
|
||||
description: Molgenis installation for the jenkins chart.
|
||||
sources:
|
||||
- https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
|
||||
icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-jenkins/catalogIcon-molgenis-jenkins.svg
|
||||
maintainers:
|
||||
- name: fdlk
|
||||
- name: sidohaakma
|
Before Width: | Height: | Size: 133 KiB After Width: | Height: | Size: 133 KiB |
|
@ -1,7 +1,5 @@
|
|||
jenkins:
|
||||
Master:
|
||||
NodeSelector:
|
||||
deployPod: "true"
|
||||
HostName: jenkins.molgenis.org
|
||||
ServiceType: ClusterIP
|
||||
InstallPlugins:
|
||||
|
@ -492,9 +490,7 @@ jenkins:
|
|||
Command: cat
|
||||
WorkingDir: /home/jenkins
|
||||
TTY: true
|
||||
NodeSelector: {
|
||||
deployPod: "true"
|
||||
}
|
||||
NodeSelector: {}
|
||||
node:
|
||||
Label: node-carbon
|
||||
NodeUsageMode: EXCLUSIVE
|
||||
|
@ -524,9 +520,7 @@ jenkins:
|
|||
key: VAULT_ADDR
|
||||
secretName: molgenis-pipeline-vault-secret
|
||||
secretKey: addr
|
||||
NodeSelector: {
|
||||
deployPod: "true"
|
||||
}
|
||||
NodeSelector: {}
|
||||
molgenis-it:
|
||||
InheritFrom: molgenis
|
||||
Label: molgenis-it
|
||||
|
@ -588,11 +582,20 @@ jenkins:
|
|||
limits:
|
||||
cpu: "1"
|
||||
memory: "512Mi"
|
||||
NodeSelector: {
|
||||
deployPod: "true"
|
||||
}
|
||||
NodeSelector: {}
|
||||
helm:
|
||||
Label: helm
|
||||
NodeUsageMode: EXCLUSIVE
|
||||
Containers:
|
||||
chart-testing:
|
||||
Image: "quay.io/helmpack/chart-testing"
|
||||
ImageTag: v1.1.0
|
||||
Command: cat
|
||||
WorkingDir: /home/jenkins
|
||||
TTY: true
|
||||
NodeSelector: {}
|
||||
|
||||
#secret contains configuration for the kubernetes secrets that jenkins can access
|
||||
# secret contains configuration for the kubernetes secrets that jenkins can access
|
||||
secret:
|
||||
# vault configures the vault secret
|
||||
vault:
|
||||
|
@ -614,4 +617,4 @@ secret:
|
|||
# dockerHubPassword contains password for hub.docker.com
|
||||
dockerHub:
|
||||
user: molgenisci
|
||||
password: xxxx
|
||||
password: xxxx
|
|
@ -5,4 +5,8 @@ name: molgenis-nexus
|
|||
version: 0.4.2
|
||||
sources:
|
||||
- https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
|
||||
icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-nexus/catalogIcon-molgenis-nexus.svg
|
||||
icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-nexus/catalogIcon-molgenis-nexus.svg
|
||||
home: https://www.sonatype.com/nexus-repository-oss
|
||||
maintainers:
|
||||
- name: sidohaakma
|
||||
- name: fdlk
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
|
@ -5,4 +5,8 @@ name: molgenis-opencpu
|
|||
version: 0.1.1
|
||||
sources:
|
||||
- https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
|
||||
icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-opencpu/catalogIcon-molgenis-opencpu.svg
|
||||
icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-opencpu/catalogIcon-molgenis-opencpu.svg
|
||||
home: https://www.opencpu.org
|
||||
maintainers:
|
||||
- name: sidohaakma
|
||||
- name: fdlk
|
Before Width: | Height: | Size: 245 KiB After Width: | Height: | Size: 245 KiB |
|
@ -31,7 +31,5 @@ spec:
|
|||
ports:
|
||||
- containerPort: {{ .service.port }}
|
||||
{{- end }}
|
||||
{{- with .Values.nodeSelector }}
|
||||
nodeSelector:
|
||||
{{ toYaml . | indent 8 }}
|
||||
{{- end }}
|
||||
|
||||
|
|
@ -34,9 +34,7 @@ ingress:
|
|||
- name: opencpu.molgenis.org
|
||||
tls: []
|
||||
|
||||
nodeSelector: {
|
||||
deployPod: "true"
|
||||
}
|
||||
nodeSelector: {}
|
||||
|
||||
tolerations: []
|
||||
|
|
@ -4,3 +4,7 @@ description: MOLGENIS vault
|
|||
name: molgenis-vault
|
||||
version: 0.1.1
|
||||
icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-vault/catalogIcon-molgenis-vault.svg
|
||||
home: https://github.com/coreos/vault-operator
|
||||
maintainers:
|
||||
- name: fdlk
|
||||
- name: sidohaakma
|
|
@ -38,7 +38,7 @@ Parameter | Description | Default
|
|||
`ui.image.repository` | Vault UI container image repository | `djenriquez/vault-ui`
|
||||
`ui.image.tag` | Vault UI container image tag | `latest`
|
||||
`ui.resources` | Vault UI pod resource requests & limits | `{}`
|
||||
`ui.nodeSelector` | node labels for Vault UI pod assignment | `{deployPod: "true"}`
|
||||
`ui.nodeSelector` | node labels for Vault UI pod assignment | `{}`
|
||||
`ui.ingress.enabled` | If true, Vault UI Ingress will be created | `true`
|
||||
`ui.ingress.annotations` | Vault UI Ingress annotations | `{}`
|
||||
`ui.ingress.host` | Vault UI Ingress hostname | `vault.molgenis.org`
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 46 KiB |
|
@ -18,10 +18,6 @@ backupJob:
|
|||
# schedule gives the cron schedule for the backup job
|
||||
schedule: "0 12 * * 1"
|
||||
|
||||
vault-operator:
|
||||
nodeSelector:
|
||||
deployPod: "true"
|
||||
|
||||
###
|
||||
# All of the config variables related to setting up the etcd-operator
|
||||
# If you want more information about the variables exposed, please visit:
|
||||
|
@ -48,8 +44,6 @@ etcd-operator:
|
|||
restoreOperator:
|
||||
image:
|
||||
tag: v0.9.2
|
||||
nodeSelector:
|
||||
deployPod: "true"
|
||||
|
||||
ui:
|
||||
name: "vault-ui"
|
||||
|
@ -76,11 +70,10 @@ ui:
|
|||
# limits:
|
||||
# cpu: 100m
|
||||
# memory: 128Mi
|
||||
#requests:
|
||||
# requests:
|
||||
# cpu: 100m
|
||||
# memory: 128Mi
|
||||
nodeSelector:
|
||||
deployPod: "true"
|
||||
nodeSelector: {}
|
||||
vault:
|
||||
auth: GITHUB
|
||||
url: https://vault.vault-operator:8200
|
||||
url: https://vault.vault-operator:8200
|
|
@ -5,4 +5,8 @@ name: molgenis
|
|||
version: 0.4.3
|
||||
sources:
|
||||
- https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
|
||||
icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis/catalogIcon-molgenis.svg
|
||||
icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis/catalogIcon-molgenis.svg
|
||||
home: http://molgenis.org
|
||||
maintainers:
|
||||
- name: sidohaakma
|
||||
- name: fdlk
|
Before Width: | Height: | Size: 77 KiB After Width: | Height: | Size: 77 KiB |
|
@ -64,12 +64,12 @@ elasticsearch:
|
|||
javaOpts: "-Xms1g -Xmx1g"
|
||||
clusterName: molgenis
|
||||
resources:
|
||||
limits:
|
||||
cpu: 2
|
||||
memory: 3Gi
|
||||
requests:
|
||||
cpu: 100m
|
||||
memory: 1Gi
|
||||
limits:
|
||||
cpu: 2
|
||||
memory: 3Gi
|
||||
requests:
|
||||
cpu: 100m
|
||||
memory: 1Gi
|
||||
persistence:
|
||||
claim: elasticsearch-nfs-claim
|
||||
size: 5Gi
|
||||
|
@ -94,8 +94,9 @@ persistence:
|
|||
enabled: true
|
||||
retain: false
|
||||
|
||||
nodeSelector:
|
||||
nodeSelector: {
|
||||
deployPod: "true"
|
||||
}
|
||||
|
||||
tolerations: []
|
||||
|