1
0
Fork 0

chore: add nodeSelectors to the charts

This commit is contained in:
Fleur Kelpin 2018-09-28 14:26:42 +02:00
parent 2a1e9eacbb
commit d8b8bd9a22
6 changed files with 28 additions and 10 deletions

View File

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

View File

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

View File

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

View File

@ -38,7 +38,7 @@ Parameter | Description | Default
`ui.image.repository` | Vault UI container image repository | `djenriquez/vault-ui` `ui.image.repository` | Vault UI container image repository | `djenriquez/vault-ui`
`ui.image.tag` | Vault UI container image tag | `latest` `ui.image.tag` | Vault UI container image tag | `latest`
`ui.resources` | Vault UI pod resource requests & limits | `{}` `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.enabled` | If true, Vault UI Ingress will be created | `true`
`ui.ingress.annotations` | Vault UI Ingress annotations | `{}` `ui.ingress.annotations` | Vault UI Ingress annotations | `{}`
`ui.ingress.host` | Vault UI Ingress hostname | `vault.molgenis.org` `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 gives the cron schedule for the backup job
schedule: "0 12 * * 1" schedule: "0 12 * * 1"
vault-operator:
nodeSelector:
deployPod: "true"
### ###
# All of the config variables related to setting up the etcd-operator # All of the config variables related to setting up the etcd-operator
# If you want more information about the variables exposed, please visit: # If you want more information about the variables exposed, please visit:
@ -44,6 +48,8 @@ etcd-operator:
restoreOperator: restoreOperator:
image: image:
tag: v0.9.2 tag: v0.9.2
nodeSelector:
deployPod: "true"
ui: ui:
name: "vault-ui" name: "vault-ui"
@ -73,7 +79,8 @@ ui:
#requests: #requests:
# cpu: 100m # cpu: 100m
# memory: 128Mi # memory: 128Mi
nodeSelector: {} nodeSelector:
deployPod: "true"
vault: vault:
auth: GITHUB auth: GITHUB
url: https://vault.vault-operator:8200 url: https://vault.vault-operator:8200

View File

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