Merge pull request kubernetes-sigs#9477 from killianmuldoon/pr-drop-dualstack-machinepools

k8s-ci-robot · web-flow · commit 338fe5b864f9 · 2023-09-21T07:26:45.000-07:00
🐛 Drop MachinePools from Dualstack tests
diff --git a/test/e2e/data/infrastructure-docker/main/cluster-template-topology-dualstack-ipv4-primary/drop-machinepools.yaml b/test/e2e/data/infrastructure-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/test/e2e/data/infrastructure-docker/main/cluster-template-topology-dualstack-ipv4-primary/kustomization.yaml b/test/e2e/data/infrastructure-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/test/e2e/data/infrastructure-docker/main/cluster-template-topology-dualstack-ipv6-primary/drop-machinepools.yaml b/test/e2e/data/infrastructure-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/test/e2e/data/infrastructure-docker/main/cluster-template-topology-dualstack-ipv6-primary/kustomization.yaml b/test/e2e/data/infrastructure-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

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+- op: remove`
	`2`	`+ path: /spec/topology/workers/machinePools`