Merge pull request #2222 from ConnorJC3/update-anti-affinity

Update anti-affinity
kubernetes-sigs · Nov 11, 2024 · 3886a4b · 3886a4b
2 parents ef505ff + 802e662
commit 3886a4b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/charts/aws-ebs-csi-driver/templates/node.yaml b/charts/aws-ebs-csi-driver/templates/node.yaml
@@ -27,7 +27,7 @@
                 (dict
                   "key" "eks.amazonaws.com/compute-type"
                   "operator" "NotIn"
-                  "values" (list "fargate")
+                  "values" (list "fargate" "auto" "hybrid")
                 )
                 (dict
                   "key" "node.kubernetes.io/instance-type"

diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml
@@ -196,6 +196,8 @@ controller:
                 operator: NotIn
                 values:
                   - fargate
+                  - auto
+                  - hybrid
     podAntiAffinity:
       preferredDuringSchedulingIgnoredDuringExecution:
         - podAffinityTerm:
@@ -356,6 +358,8 @@ node:
                 operator: NotIn
                 values:
                   - fargate
+                  - auto
+                  - hybrid
               - key: node.kubernetes.io/instance-type
                 operator: NotIn
                 values:

diff --git a/deploy/kubernetes/base/controller.yaml b/deploy/kubernetes/base/controller.yaml
@@ -37,6 +37,8 @@ spec:
                 operator: NotIn
                 values:
                 - fargate
+                - auto
+                - hybrid
             weight: 1
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:

diff --git a/deploy/kubernetes/base/node.yaml b/deploy/kubernetes/base/node.yaml
@@ -31,6 +31,8 @@ spec:
                 operator: NotIn
                 values:
                 - fargate
+                - auto
+                - hybrid
               - key: node.kubernetes.io/instance-type
                 operator: NotIn
                 values:
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,6 +31,8 @@ spec: @@
                     operator: NotIn
                     values:
                     - fargate
+                    - auto
+                    - hybrid
                   - key: node.kubernetes.io/instance-type
                     operator: NotIn
                     values:
@@ Expand Down @@