From c710e180b09fb4a45cde9bd91abdc207fc0271eb Mon Sep 17 00:00:00 2001 From: killianmuldoon Date: Thu, 21 Sep 2023 10:58:00 +0100 Subject: [PATCH] Drop MachinePools from Dualstack tests Signed-off-by: killianmuldoon --- .../drop-machinepools.yaml | 2 ++ .../kustomization.yaml | 8 +++++++- .../drop-machinepools.yaml | 2 ++ .../kustomization.yaml | 8 +++++++- 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 test/e2e/data/infrastructure-docker/main/cluster-template-topology-dualstack-ipv4-primary/drop-machinepools.yaml create mode 100644 test/e2e/data/infrastructure-docker/main/cluster-template-topology-dualstack-ipv6-primary/drop-machinepools.yaml 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 new file mode 100644 index 000000000000..c60319a9eb9e --- /dev/null +++ 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 \ No newline at end of file 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 index dad6c1626b3d..5b33b1949e69 100644 --- 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 new file mode 100644 index 000000000000..c60319a9eb9e --- /dev/null +++ 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 \ No newline at end of file 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 index dad6c1626b3d..5b33b1949e69 100644 --- 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