Merge pull request #226 from Luis-TT/add-nodeselector

metalmatze · web-flow · commit 5d95a5375615 · 2021-06-02T15:34:04.000+02:00
.*: Only schedule on linux nodes
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ We use *breaking* word for marking changes that are not backward compatible (rel
 ### Breaking Changes
 
 ### Changed
+- [226](https://github.com/thanos-io/kube-thanos/pull/226) Only schedule thanos components on linux nodes.
 
 ### Added
 
diff --git a/examples/all/manifests/store-shard0-statefulSet.yaml b/examples/all/manifests/store-shard0-statefulSet.yaml
@@ -148,6 +148,8 @@ spec:
         - mountPath: /var/thanos/store
           name: data
           readOnly: false
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       securityContext:
         fsGroup: 65534
         runAsUser: 65534
diff --git a/examples/all/manifests/store-shard1-statefulSet.yaml b/examples/all/manifests/store-shard1-statefulSet.yaml
@@ -148,6 +148,8 @@ spec:
         - mountPath: /var/thanos/store
           name: data
           readOnly: false
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       securityContext:
         fsGroup: 65534
         runAsUser: 65534
diff --git a/examples/all/manifests/store-shard2-statefulSet.yaml b/examples/all/manifests/store-shard2-statefulSet.yaml
@@ -148,6 +148,8 @@ spec:
         - mountPath: /var/thanos/store
           name: data
           readOnly: false
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       securityContext:
         fsGroup: 65534
         runAsUser: 65534
diff --git a/examples/all/manifests/thanos-bucket-deployment.yaml b/examples/all/manifests/thanos-bucket-deployment.yaml
@@ -76,6 +76,8 @@ spec:
             cpu: 0.123
             memory: 123Mi
         terminationMessagePolicy: FallbackToLogsOnError
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       securityContext:
         fsGroup: 65534
         runAsUser: 65534
diff --git a/examples/all/manifests/thanos-compact-statefulSet.yaml b/examples/all/manifests/thanos-compact-statefulSet.yaml
@@ -87,6 +87,8 @@ spec:
         - mountPath: /var/thanos/compact
           name: data
           readOnly: false
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       securityContext:
         fsGroup: 65534
         runAsUser: 65534
diff --git a/examples/all/manifests/thanos-query-deployment.yaml b/examples/all/manifests/thanos-query-deployment.yaml
@@ -92,6 +92,8 @@ spec:
           periodSeconds: 5
         resources: {}
         terminationMessagePolicy: FallbackToLogsOnError
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       securityContext:
         fsGroup: 65534
         runAsUser: 65534
diff --git a/examples/all/manifests/thanos-query-frontend-deployment.yaml b/examples/all/manifests/thanos-query-frontend-deployment.yaml
@@ -112,6 +112,8 @@ spec:
             cpu: 0.123
             memory: 123Mi
         terminationMessagePolicy: FallbackToLogsOnError
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       securityContext:
         fsGroup: 65534
         runAsUser: 65534
diff --git a/examples/all/manifests/thanos-receive-default-statefulSet.yaml b/examples/all/manifests/thanos-receive-default-statefulSet.yaml
@@ -138,6 +138,8 @@ spec:
           readOnly: false
         - mountPath: /var/lib/thanos-receive
           name: hashring-config
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       securityContext:
         fsGroup: 65534
         runAsUser: 65534
diff --git a/examples/all/manifests/thanos-receive-region-1-statefulSet.yaml b/examples/all/manifests/thanos-receive-region-1-statefulSet.yaml
@@ -138,6 +138,8 @@ spec:
           readOnly: false
         - mountPath: /var/lib/thanos-receive
           name: hashring-config
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       securityContext:
         fsGroup: 65534
         runAsUser: 65534
diff --git a/examples/all/manifests/thanos-receive-statefulSet.yaml b/examples/all/manifests/thanos-receive-statefulSet.yaml
@@ -134,6 +134,8 @@ spec:
           readOnly: false
         - mountPath: /var/lib/thanos-receive
           name: hashring-config
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       securityContext:
         fsGroup: 65534
         runAsUser: 65534
diff --git a/examples/all/manifests/thanos-rule-statefulSet.yaml b/examples/all/manifests/thanos-rule-statefulSet.yaml
@@ -104,6 +104,8 @@ spec:
         volumeMounts:
         - mountPath: /etc/thanos/rules/test
           name: test
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       securityContext:
         fsGroup: 65534
         runAsUser: 65534
diff --git a/examples/all/manifests/thanos-store-statefulSet.yaml b/examples/all/manifests/thanos-store-statefulSet.yaml
@@ -136,6 +136,8 @@ spec:
         - mountPath: /var/thanos/store
           name: data
           readOnly: false
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       securityContext:
         fsGroup: 65534
         runAsUser: 65534
diff --git a/jsonnet/kube-thanos/kube-thanos-bucket.libsonnet b/jsonnet/kube-thanos/kube-thanos-bucket.libsonnet
@@ -155,6 +155,9 @@ function(params) {
             securityContext: tb.config.securityContext,
             containers: [container],
             terminationGracePeriodSeconds: 120,
+            nodeSelector: {
+              'beta.kubernetes.io/os': 'linux',
+            },
           },
         },
       },
diff --git a/jsonnet/kube-thanos/kube-thanos-compact.libsonnet b/jsonnet/kube-thanos/kube-thanos-compact.libsonnet
@@ -181,6 +181,9 @@ function(params) {
             containers: [c],
             volumes: [],
             terminationGracePeriodSeconds: 120,
+            nodeSelector: {
+              'beta.kubernetes.io/os': 'linux',
+            },
           },
         },
         volumeClaimTemplates: if std.length(tc.config.volumeClaimTemplate) > 0 then [tc.config.volumeClaimTemplate {
diff --git a/jsonnet/kube-thanos/kube-thanos-query-frontend.libsonnet b/jsonnet/kube-thanos/kube-thanos-query-frontend.libsonnet
@@ -216,6 +216,9 @@ function(params) {
             serviceAccountName: tqf.serviceAccount.metadata.name,
             securityContext: tqf.config.securityContext,
             terminationGracePeriodSeconds: 120,
+            nodeSelector: {
+              'beta.kubernetes.io/os': 'linux',
+            },
             affinity: { podAntiAffinity: {
               preferredDuringSchedulingIgnoredDuringExecution: [{
                 podAffinityTerm: {
diff --git a/jsonnet/kube-thanos/kube-thanos-query.libsonnet b/jsonnet/kube-thanos/kube-thanos-query.libsonnet
@@ -183,6 +183,9 @@ function(params) {
             securityContext: tq.config.securityContext,
             serviceAccountName: tq.serviceAccount.metadata.name,
             terminationGracePeriodSeconds: 120,
+            nodeSelector: {
+              'beta.kubernetes.io/os': 'linux',
+            },
             affinity: { podAntiAffinity: {
               preferredDuringSchedulingIgnoredDuringExecution: [{
                 podAffinityTerm: {
diff --git a/jsonnet/kube-thanos/kube-thanos-receive.libsonnet b/jsonnet/kube-thanos/kube-thanos-receive.libsonnet
@@ -156,6 +156,9 @@ function(params) {
               configMap: { name: tr.config.hashringConfigMapName },
             }] else [],
             terminationGracePeriodSeconds: 900,
+            nodeSelector: {
+              'beta.kubernetes.io/os': 'linux',
+            },
             affinity: { podAntiAffinity: {
               local labelSelector = { matchExpressions: [{
                 key: 'app.kubernetes.io/name',
diff --git a/jsonnet/kube-thanos/kube-thanos-rule.libsonnet b/jsonnet/kube-thanos/kube-thanos-rule.libsonnet
@@ -214,6 +214,9 @@ function(params) {
               { name: ruleConfig.name, configMap: { name: ruleConfig.name } }
               for ruleConfig in tr.config.rulesConfig
             ],
+            nodeSelector: {
+              'beta.kubernetes.io/os': 'linux',
+            },
           },
         },
         volumeClaimTemplates: if std.length(tr.config.volumeClaimTemplate) > 0 then [tr.config.volumeClaimTemplate {
diff --git a/jsonnet/kube-thanos/kube-thanos-store.libsonnet b/jsonnet/kube-thanos/kube-thanos-store.libsonnet
@@ -158,6 +158,9 @@ function(params) {
             containers: [c],
             volumes: [],
             terminationGracePeriodSeconds: 120,
+            nodeSelector: {
+              'beta.kubernetes.io/os': 'linux',
+            },
             affinity: { podAntiAffinity: {
               preferredDuringSchedulingIgnoredDuringExecution: [{
                 podAffinityTerm: {
diff --git a/manifests/thanos-query-deployment.yaml b/manifests/thanos-query-deployment.yaml
@@ -76,6 +76,8 @@ spec:
           periodSeconds: 5
         resources: {}
         terminationMessagePolicy: FallbackToLogsOnError
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       securityContext:
         fsGroup: 65534
         runAsUser: 65534
diff --git a/manifests/thanos-store-statefulSet.yaml b/manifests/thanos-store-statefulSet.yaml
@@ -89,6 +89,8 @@ spec:
         - mountPath: /var/thanos/store
           name: data
           readOnly: false
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       securityContext:
         fsGroup: 65534
         runAsUser: 65534
