chore: remove affinity

joryirving · Feb 22, 2024 · 2fc458a · 2fc458a
1 parent 8ee9e96
commit 2fc458a
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 99 deletions.
diff --git a/kubernetes/teyvat/apps/database/dragonfly-operator/app/helmrelease.yaml b/kubernetes/teyvat/apps/database/dragonfly-operator/app/helmrelease.yaml
@@ -109,8 +109,6 @@ spec:
                         values:
                           - amd64
                           - arm64
-                          - ppc64le
-                          - s390x
                       - key: kubernetes.io/os
                         operator: In
                         values:

diff --git a/kubernetes/teyvat/apps/network/echo-server/app/helmrelease.yaml b/kubernetes/teyvat/apps/network/echo-server/app/helmrelease.yaml
@@ -101,10 +101,3 @@ spec:
         tls:
           - hosts:
               - *host
-    affinity:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-            - matchExpressions:
-                - key: node-role.kubernetes.io/control-plane
-                  operator: Exists
diff --git a/kubernetes/teyvat/apps/observability/exporters/blackbox-exporter/app/helmrelease.yaml b/kubernetes/teyvat/apps/observability/exporters/blackbox-exporter/app/helmrelease.yaml
@@ -121,10 +121,4 @@ spec:
           for: 5m
           labels:
             severity: warning
-    affinity:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-            - matchExpressions:
-                - key: node-role.kubernetes.io/control-plane
-                  operator: Exists
+
diff --git a/kubernetes/teyvat/apps/observability/exporters/nut-exporter/app/helmrelease.yaml b/kubernetes/teyvat/apps/observability/exporters/nut-exporter/app/helmrelease.yaml
@@ -44,14 +44,6 @@ spec:
               limits:
                 cpu: 100m
                 memory: 100Mi
-        pod:
-          affinity:
-            nodeAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-                nodeSelectorTerms:
-                  - matchExpressions:
-                      - key: node-role.kubernetes.io/control-plane
-                        operator: Exists
     service:
       main:
         ports:

diff --git a/kubernetes/teyvat/apps/observability/exporters/speedtest-exporter/app/helmrelease.yaml b/kubernetes/teyvat/apps/observability/exporters/speedtest-exporter/app/helmrelease.yaml
@@ -43,14 +43,6 @@ spec:
                 memory: 50Mi
               limits:
                 memory: 100Mi
-        pod:
-          affinity:
-            nodeAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-                nodeSelectorTerms:
-                  - matchExpressions:
-                      - key: node-role.kubernetes.io/control-plane
-                        operator: Exists
     service:
       main:
         enabled: false

diff --git a/kubernetes/teyvat/apps/observability/gatus/app/helmrelease.yaml b/kubernetes/teyvat/apps/observability/gatus/app/helmrelease.yaml
@@ -85,13 +85,6 @@ spec:
             runAsGroup: 568
             fsGroup: 568
             fsGroupChangePolicy: OnRootMismatch
-          affinity:
-            nodeAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-                nodeSelectorTerms:
-                  - matchExpressions:
-                      - key: node-role.kubernetes.io/control-plane
-                        operator: Exists
           topologySpreadConstraints:
             - maxSkew: 1
               topologyKey: kubernetes.io/hostname

diff --git a/kubernetes/teyvat/apps/observability/grafana/app/helmrelease.yaml b/kubernetes/teyvat/apps/observability/grafana/app/helmrelease.yaml
@@ -415,10 +415,3 @@ spec:
         labelSelector:
           matchLabels:
             app.kubernetes.io/name: *app
-    affinity:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-            - matchExpressions:
-                - key: node-role.kubernetes.io/control-plane
-                  operator: Exists
diff --git a/kubernetes/teyvat/apps/observability/karma/app/helmrelease.yaml b/kubernetes/teyvat/apps/observability/karma/app/helmrelease.yaml
@@ -48,13 +48,6 @@ spec:
               limits:
                 memory: 500Mi
         pod:
-          affinity:
-            nodeAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-                nodeSelectorTerms:
-                  - matchExpressions:
-                      - key: node-role.kubernetes.io/control-plane
-                        operator: Exists
           topologySpreadConstraints:
             - maxSkew: 1
               topologyKey: kubernetes.io/hostname

diff --git a/kubernetes/teyvat/apps/observability/kromgo/app/helmrelease.yaml b/kubernetes/teyvat/apps/observability/kromgo/app/helmrelease.yaml
@@ -60,13 +60,6 @@ spec:
               labelSelector:
                 matchLabels:
                   app.kubernetes.io/name: *app
-          affinity:
-            nodeAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-                nodeSelectorTerms:
-                  - matchExpressions:
-                      - key: node-role.kubernetes.io/control-plane
-                        operator: Exists
     service:
       main:
         ports:

diff --git a/kubernetes/teyvat/apps/observability/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/teyvat/apps/observability/kube-prometheus-stack/app/helmrelease.yaml
@@ -52,13 +52,6 @@ spec:
               resources:
                 requests:
                   storage: 1Gi
-      affinity: &affinity
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-              - matchExpressions:
-                  - key: node-role.kubernetes.io/control-plane
-                    operator: Exists
     grafana:
       enabled: false
       forceDeployDashboards: true
@@ -149,8 +142,6 @@ spec:
               sourceLabels:
                 - __meta_kubernetes_pod_node_name
               targetLabel: kubernetes_node
-    prometheusOperator:
-      affinity: *affinity
     prometheus:
       thanosService:
         enabled: true
@@ -190,7 +181,6 @@ spec:
         retention: 2d
         retentionSize: 15GB
         replicas: 2
-        affinity: *affinity
         storageSpec:
           volumeClaimTemplate:
             spec:

diff --git a/kubernetes/teyvat/apps/observability/thanos/app/helmrelease.yaml b/kubernetes/teyvat/apps/observability/thanos/app/helmrelease.yaml
@@ -71,13 +71,6 @@ spec:
         extraTls:
           - hosts:
               - *host
-      affinity: &affinity
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-              - matchExpressions:
-                  - key: node-role.kubernetes.io/control-plane
-                    operator: Exists
     query:
       enabled: true
       replicaCount: 2
@@ -86,11 +79,9 @@ spec:
         sidecarsService: kube-prometheus-stack-thanos-discovery
         sidecarsNamespace: observability
       stores: ["thanos-svc.${PI_DOMAIN}:10901"] #["${SVC_PI_THANOS_ADDR}:10901"]
-      affinity: *affinity
     bucketweb:
       enabled: true
       replicaCount: 2
-      affinity: *affinity
     compactor:
       enabled: true
       extraFlags:
@@ -103,15 +94,13 @@ spec:
         enabled: true
         storageClass: local-hostpath
         size: 10Gi
-      affinity: *affinity
     storegateway:
       enabled: true
       replicaCount: 2
       persistence:
         enabled: true
         storageClass: local-hostpath
         size: 10Gi
-      affinity: *affinity
     ruler:
       enabled: true
       replicaCount: 2
@@ -133,7 +122,6 @@ spec:
         enabled: true
         storageClass: local-hostpath
         size: 10Gi
-      affinity: *affinity
     metrics:
       enabled: true
       serviceMonitor:

diff --git a/kubernetes/teyvat/apps/observability/unifi-poller/app/helmrelease.yaml b/kubernetes/teyvat/apps/observability/unifi-poller/app/helmrelease.yaml
@@ -40,14 +40,6 @@ spec:
             envFrom:
               - secretRef:
                   name: unifi-poller-secret
-        pod:
-          affinity:
-            nodeAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-                nodeSelectorTerms:
-                  - matchExpressions:
-                      - key: node-role.kubernetes.io/control-plane
-                        operator: Exists
     service:
       main:
         ports:

diff --git a/kubernetes/teyvat/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml b/kubernetes/teyvat/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml
@@ -108,15 +108,6 @@ spec:
           - name: yelan
             devices:
               - name: /dev/disk/by-id/nvme-WD_BLACK_SN770_1TB_23063G803424
-      placement:
-        mgr: &placement
-          nodeAffinity:
-            requiredDuringSchedulingIgnoredDuringExecution:
-              nodeSelectorTerms:
-                - matchExpressions:
-                    - key: node-role.kubernetes.io/worker
-                      operator: Exists
-        mon: *placement
     cephBlockPools:
       - name: ceph-blockpool
         spec:
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,8 +109,6 @@ spec: @@
                             values:
                               - amd64
                               - arm64
-                              - ppc64le
-                              - s390x
                           - key: kubernetes.io/os
                             operator: In
                             values:
@@ Expand Down @@