Revert "Merge branch 'chore/nodeSelector' of P129679/molgenis-ops-docker-helm into master"
This reverts commitf94e6da6e3
, reversing changes made tob73fd578ea
.
This commit is contained in:
parent
f94e6da6e3
commit
f6905334e1
@ -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,9 +582,7 @@ jenkins:
|
||||
limits:
|
||||
cpu: "1"
|
||||
memory: "512Mi"
|
||||
NodeSelector: {
|
||||
deployPod: "true"
|
||||
}
|
||||
NodeSelector: {}
|
||||
|
||||
#secret contains configuration for the kubernetes secrets that jenkins can access
|
||||
secret:
|
||||
|
@ -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: []
|
||||
|
||||
|
@ -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`
|
||||
|
@ -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"
|
||||
@ -79,8 +73,7 @@ ui:
|
||||
#requests:
|
||||
# cpu: 100m
|
||||
# memory: 128Mi
|
||||
nodeSelector:
|
||||
deployPod: "true"
|
||||
nodeSelector: {}
|
||||
vault:
|
||||
auth: GITHUB
|
||||
url: https://vault.vault-operator:8200
|
@ -94,8 +94,9 @@ persistence:
|
||||
enabled: true
|
||||
retain: false
|
||||
|
||||
nodeSelector:
|
||||
nodeSelector: {
|
||||
deployPod: "true"
|
||||
}
|
||||
|
||||
tolerations: []
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user