e2e: remove bastion from common-patches/cni

The bastion isn't used anywhere in e2e and we'll write proper tests for it, see #1821
kubernetes-sigs · Jan 11, 2024 · 72146dc · 72146dc
1 parent 5fca0e5
commit 72146dc
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 50 deletions.
diff --git a/test/e2e/data/kustomize/common-patches/cni/patch-cluster.yaml b/test/e2e/data/kustomize/common-patches/cni/patch-cluster.yaml
@@ -1,13 +1,4 @@
 ---
-- op: add
-  path: /spec/bastion
-  value:
-    enabled: true
-    instance:
-      flavor: ${OPENSTACK_BASTION_MACHINE_FLAVOR}
-      image:
-        name: ${OPENSTACK_BASTION_IMAGE_NAME}
-      sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
 - op: add
   path: /spec/controlPlaneAvailabilityZones
   value:

diff --git a/test/e2e/data/kustomize/v1alpha5/bastion.yaml b/test/e2e/data/kustomize/v1alpha5/bastion.yaml
diff --git a/test/e2e/data/kustomize/v1alpha5/kustomization.yaml b/test/e2e/data/kustomize/v1alpha5/kustomization.yaml
@@ -6,9 +6,3 @@ resources:
 components:
 - ../common-patches/cni
 - ../common-patches/ccm
-
-patches:
-- path: bastion.yaml
-  target:
-    kind: OpenStackCluster
-    name: \${CLUSTER_NAME}
diff --git a/test/e2e/data/kustomize/v1alpha6/bastion.yaml b/test/e2e/data/kustomize/v1alpha6/bastion.yaml
diff --git a/test/e2e/data/kustomize/v1alpha6/kustomization.yaml b/test/e2e/data/kustomize/v1alpha6/kustomization.yaml
@@ -20,7 +20,3 @@ patches:
           - {}
   target:
     kind: OpenStackMachineTemplate
-- path: bastion.yaml
-  target:
-    kind: OpenStackCluster
-    name: \${CLUSTER_NAME}
diff --git a/test/e2e/data/kustomize/v1alpha7/bastion.yaml b/test/e2e/data/kustomize/v1alpha7/bastion.yaml
diff --git a/test/e2e/data/kustomize/v1alpha7/kustomization.yaml b/test/e2e/data/kustomize/v1alpha7/kustomization.yaml
@@ -20,7 +20,3 @@ patches:
           - {}
   target:
     kind: OpenStackMachineTemplate
-- path: bastion.yaml
-  target:
-    kind: OpenStackCluster
-    name: \${CLUSTER_NAME}