Merge pull request #2692 from rparsonsbb/master

Adds nodeSelector to deployment templates for mixed OS clusters
fluxcd · Dec 17, 2019 · 1a8d1aa · 1a8d1aa
2 parents 67aae05 + 8db03a4
commit 1a8d1aa
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git a/chart/flux/templates/deployment.yaml b/chart/flux/templates/deployment.yaml
@@ -273,8 +273,9 @@ spec:
       dnsConfig:
 {{ toYaml .Values.dnsConfig | indent 8 }}
 {{- end }}
-    {{- with .Values.nodeSelector }}
-      nodeSelector:
+      nodeSelector: 
+        beta.kubernetes.io/os: linux
+      {{- with .Values.nodeSelector }}
 {{ toYaml . | indent 8 }}
     {{- end }}
     {{- with .Values.affinity }}

diff --git a/chart/flux/templates/memcached.yaml b/chart/flux/templates/memcached.yaml
@@ -51,8 +51,9 @@ spec:
 {{ toYaml .Values.memcached.resources | indent 10 }}
         securityContext:
 {{ toYaml .Values.memcached.securityContext | indent 10 }}
-    {{- with .Values.memcached.nodeSelector }}
       nodeSelector:
+        beta.kubernetes.io/os: linux
+      {{- with .Values.memcached.nodeSelector }}
 {{ toYaml . | indent 8 }}
     {{- end }}
     {{- with .Values.memcached.affinity }}

diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml
@@ -18,6 +18,8 @@ spec:
       labels:
         name: flux
     spec:
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       serviceAccountName: flux
       volumes:
       - name: git-key

diff --git a/deploy/memcache-dep.yaml b/deploy/memcache-dep.yaml
@@ -16,6 +16,8 @@ spec:
       labels:
         name: memcached
     spec:
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       containers:
       - name: memcached
         image: memcached:1.5.20

diff --git a/pkg/install/generated_templates.gogen.go b/pkg/install/generated_templates.gogen.go
diff --git a/pkg/install/templates/flux-deployment.yaml.tmpl b/pkg/install/templates/flux-deployment.yaml.tmpl
@@ -18,6 +18,8 @@ spec:
       labels:
         name: flux
     spec:
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       serviceAccountName: flux
       volumes:
       - name: git-key

diff --git a/pkg/install/templates/memcache-dep.yaml.tmpl b/pkg/install/templates/memcache-dep.yaml.tmpl
@@ -16,6 +16,8 @@ spec:
       labels:
         name: memcached
     spec:
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       containers:
       - name: memcached
         image: memcached:1.5.20