Merge pull request #9477 from killianmuldoon/pr-drop-dualstack-machin…

…epools 🐛 Drop MachinePools from Dualstack tests
kubernetes-sigs · Sep 21, 2023 · 338fe5b · 338fe5b
2 parents b3b9928 + c710e18
commit 338fe5b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/...cture-docker/main/cluster-template-topology-dualstack-ipv4-primary/drop-machinepools.yaml b/...cture-docker/main/cluster-template-topology-dualstack-ipv4-primary/drop-machinepools.yaml
@@ -0,0 +1,2 @@
+- op: remove
+  path: /spec/topology/workers/machinePools
diff --git a/...structure-docker/main/cluster-template-topology-dualstack-ipv4-primary/kustomization.yaml b/...structure-docker/main/cluster-template-topology-dualstack-ipv4-primary/kustomization.yaml
@@ -2,5 +2,11 @@ bases:
   - ../bases/cluster-with-topology.yaml
   - ../bases/crs.yaml
 
+patchesStrategicMerge:
+  -  cluster.yaml
 patches:
-  - cluster.yaml
+  - path: ./drop-machinepools.yaml
+    target:
+      group: cluster.x-k8s.io
+      version: v1beta1
+      kind: Cluster
diff --git a/...cture-docker/main/cluster-template-topology-dualstack-ipv6-primary/drop-machinepools.yaml b/...cture-docker/main/cluster-template-topology-dualstack-ipv6-primary/drop-machinepools.yaml
@@ -0,0 +1,2 @@
+- op: remove
+  path: /spec/topology/workers/machinePools
diff --git a/...structure-docker/main/cluster-template-topology-dualstack-ipv6-primary/kustomization.yaml b/...structure-docker/main/cluster-template-topology-dualstack-ipv6-primary/kustomization.yaml
@@ -2,5 +2,11 @@ bases:
   - ../bases/cluster-with-topology.yaml
   - ../bases/crs.yaml
 
+patchesStrategicMerge:
+  -  cluster.yaml
 patches:
-  - cluster.yaml
+  - path: ./drop-machinepools.yaml
+    target:
+      group: cluster.x-k8s.io
+      version: v1beta1
+      kind: Cluster