1
0
Fork 0

Merge branch 'chore/nodeSelector' of P129679/molgenis-ops-docker-helm into master

This commit is contained in:
Sido Haakma 2018-09-28 20:50:18 +02:00 committed by Gogs
commit f94e6da6e3
6 changed files with 28 additions and 10 deletions

View File

@ -1,5 +1,7 @@
jenkins:
Master:
NodeSelector:
deployPod: "true"
HostName: jenkins.molgenis.org
ServiceType: ClusterIP
InstallPlugins:
@ -490,7 +492,9 @@ jenkins:
Command: cat
WorkingDir: /home/jenkins
TTY: true
NodeSelector: {}
NodeSelector: {
deployPod: "true"
}
node:
Label: node-carbon
NodeUsageMode: EXCLUSIVE
@ -520,7 +524,9 @@ jenkins:
key: VAULT_ADDR
secretName: molgenis-pipeline-vault-secret
secretKey: addr
NodeSelector: {}
NodeSelector: {
deployPod: "true"
}
molgenis-it:
InheritFrom: molgenis
Label: molgenis-it
@ -582,7 +588,9 @@ jenkins:
limits:
cpu: "1"
memory: "512Mi"
NodeSelector: {}
NodeSelector: {
deployPod: "true"
}
#secret contains configuration for the kubernetes secrets that jenkins can access
secret:

View File

@ -31,5 +31,7 @@ spec:
ports:
- containerPort: {{ .service.port }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
{{- end }}

View File

@ -34,7 +34,9 @@ ingress:
- name: opencpu.molgenis.org
tls: []
nodeSelector: {}
nodeSelector: {
deployPod: "true"
}
tolerations: []

View File

@ -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 | `{}`
`ui.nodeSelector` | node labels for Vault UI pod assignment | `{deployPod: "true"}`
`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`

View File

@ -18,6 +18,10 @@ 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:
@ -44,6 +48,8 @@ etcd-operator:
restoreOperator:
image:
tag: v0.9.2
nodeSelector:
deployPod: "true"
ui:
name: "vault-ui"
@ -73,7 +79,8 @@ ui:
#requests:
# cpu: 100m
# memory: 128Mi
nodeSelector: {}
nodeSelector:
deployPod: "true"
vault:
auth: GITHUB
url: https://vault.vault-operator:8200

View File

@ -94,9 +94,8 @@ persistence:
enabled: true
retain: false
nodeSelector: {
nodeSelector:
deployPod: "true"
}
tolerations: []