From f6905334e120ba29527388e514d684f6c4cc14bb Mon Sep 17 00:00:00 2001
From: Fleur Kelpin <f.kelpin@umcg.nl>
Date: Sat, 29 Sep 2018 11:29:53 +0200
Subject: [PATCH] Revert "Merge branch 'chore/nodeSelector' of
 P129679/molgenis-ops-docker-helm into master"

This reverts commit f94e6da6e35930d633c5fa819352eb7799beb553, reversing
changes made to b73fd578ea042093b2e6659472e7ab0d977ee158.
---
 molgenis-jenkins/values.yaml               | 14 +++-----------
 molgenis-opencpu/templates/deployment.yaml |  6 ++----
 molgenis-opencpu/values.yaml               |  4 +---
 molgenis-vault/README.md                   |  2 +-
 molgenis-vault/values.yaml                 |  9 +--------
 molgenis/values.yaml                       |  3 ++-
 6 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/molgenis-jenkins/values.yaml b/molgenis-jenkins/values.yaml
index deba807..190ae98 100644
--- a/molgenis-jenkins/values.yaml
+++ b/molgenis-jenkins/values.yaml
@@ -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:
diff --git a/molgenis-opencpu/templates/deployment.yaml b/molgenis-opencpu/templates/deployment.yaml
index b2b1cca..ddb57c7 100644
--- a/molgenis-opencpu/templates/deployment.yaml
+++ b/molgenis-opencpu/templates/deployment.yaml
@@ -31,7 +31,5 @@ spec:
         ports:
         - containerPort: {{ .service.port }}
       {{- end }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-      {{- end }}
+
+
diff --git a/molgenis-opencpu/values.yaml b/molgenis-opencpu/values.yaml
index 0a1668a..c21be14 100644
--- a/molgenis-opencpu/values.yaml
+++ b/molgenis-opencpu/values.yaml
@@ -34,9 +34,7 @@ ingress:
   - name: opencpu.molgenis.org
   tls: []
 
-nodeSelector: {
-  deployPod: "true"
-}
+nodeSelector: {}
 
 tolerations: []
 
diff --git a/molgenis-vault/README.md b/molgenis-vault/README.md
index da2e77a..5ebac64 100644
--- a/molgenis-vault/README.md
+++ b/molgenis-vault/README.md
@@ -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`
diff --git a/molgenis-vault/values.yaml b/molgenis-vault/values.yaml
index 16b76da..aaca8f3 100644
--- a/molgenis-vault/values.yaml
+++ b/molgenis-vault/values.yaml
@@ -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
\ No newline at end of file
diff --git a/molgenis/values.yaml b/molgenis/values.yaml
index 72241f7..c9fa30c 100644
--- a/molgenis/values.yaml
+++ b/molgenis/values.yaml
@@ -94,8 +94,9 @@ persistence:
   enabled: true
   retain: false
 
-nodeSelector:
+nodeSelector: {
   deployPod: "true"
+}
 
 tolerations: []