Fix kustomize patch for HardwareAffinity:

The patch for HardwareAffinity was being overridden by the patch for the templateOverride. This caused no HardwareAffinity to be in place and all node being used for any role. Signed-off-by: Jacob Weinstock <[email protected]>
tinkerbell · Jun 27, 2024 · 37171b9 · 37171b9
1 parent 5ea86d1
commit 37171b9
Showing 1 changed file with 5 additions and 23 deletions.
diff --git a/capt/templates/kustomization.tmpl b/capt/templates/kustomization.tmpl
@@ -18,29 +18,6 @@ patches:
             - labelSelector:
                 matchLabels:
                   tinkerbell.org/role: control-plane
-  - target:
-      group: infrastructure.cluster.x-k8s.io
-      kind: TinkerbellMachineTemplate
-      name: ".*worker.*"
-      version: v1beta1
-    patch: |- 
-      - op: add
-        path: /spec/template/spec
-        value:
-          hardwareAffinity:
-            required:
-            - labelSelector:
-                matchLabels:
-                  tinkerbell.org/role: worker
-  - target:
-      group: infrastructure.cluster.x-k8s.io
-      kind: TinkerbellMachineTemplate
-      name: ".*control-plane.*"
-      version: v1beta1
-    patch: |- 
-      - op: add
-        path: /spec/template/spec
-        value:
           templateOverride: |
             version: "0.1"
             name: playground-template
@@ -118,6 +95,11 @@ patches:
       - op: add
         path: /spec/template/spec
         value:
+          hardwareAffinity:
+            required:
+            - labelSelector:
+                matchLabels:
+                  tinkerbell.org/role: worker
           templateOverride: |
             version: "0.1"
             name: playground-template