From 72146dc38b5756f3a391f0e30c5f1a98844de218 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emacchi@redhat.com>
Date: Thu, 11 Jan 2024 08:37:53 -0500
Subject: [PATCH] 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
---
 .../data/kustomize/common-patches/cni/patch-cluster.yaml | 9 ---------
 test/e2e/data/kustomize/v1alpha5/bastion.yaml            | 9 ---------
 test/e2e/data/kustomize/v1alpha5/kustomization.yaml      | 6 ------
 test/e2e/data/kustomize/v1alpha6/bastion.yaml            | 9 ---------
 test/e2e/data/kustomize/v1alpha6/kustomization.yaml      | 4 ----
 test/e2e/data/kustomize/v1alpha7/bastion.yaml            | 9 ---------
 test/e2e/data/kustomize/v1alpha7/kustomization.yaml      | 4 ----
 7 files changed, 50 deletions(-)
 delete mode 100644 test/e2e/data/kustomize/v1alpha5/bastion.yaml
 delete mode 100644 test/e2e/data/kustomize/v1alpha6/bastion.yaml
 delete mode 100644 test/e2e/data/kustomize/v1alpha7/bastion.yaml

diff --git a/test/e2e/data/kustomize/common-patches/cni/patch-cluster.yaml b/test/e2e/data/kustomize/common-patches/cni/patch-cluster.yaml
index 26f94a6d4a..46595e7935 100644
--- 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
deleted file mode 100644
index 45c9e0f508..0000000000
--- a/test/e2e/data/kustomize/v1alpha5/bastion.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- op: add
-  path: /spec/bastion
-  value:
-    enabled: true
-    instance:
-      flavor: ${OPENSTACK_BASTION_MACHINE_FLAVOR}
-      image: ${OPENSTACK_BASTION_IMAGE_NAME}
-      sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
diff --git a/test/e2e/data/kustomize/v1alpha5/kustomization.yaml b/test/e2e/data/kustomize/v1alpha5/kustomization.yaml
index ae29db64d9..d11eead116 100644
--- 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
deleted file mode 100644
index 45c9e0f508..0000000000
--- a/test/e2e/data/kustomize/v1alpha6/bastion.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- op: add
-  path: /spec/bastion
-  value:
-    enabled: true
-    instance:
-      flavor: ${OPENSTACK_BASTION_MACHINE_FLAVOR}
-      image: ${OPENSTACK_BASTION_IMAGE_NAME}
-      sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
diff --git a/test/e2e/data/kustomize/v1alpha6/kustomization.yaml b/test/e2e/data/kustomize/v1alpha6/kustomization.yaml
index aa3e9c0e5c..f455c1d60c 100644
--- 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
deleted file mode 100644
index 45c9e0f508..0000000000
--- a/test/e2e/data/kustomize/v1alpha7/bastion.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- op: add
-  path: /spec/bastion
-  value:
-    enabled: true
-    instance:
-      flavor: ${OPENSTACK_BASTION_MACHINE_FLAVOR}
-      image: ${OPENSTACK_BASTION_IMAGE_NAME}
-      sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
diff --git a/test/e2e/data/kustomize/v1alpha7/kustomization.yaml b/test/e2e/data/kustomize/v1alpha7/kustomization.yaml
index fe53c35f3f..3ad33a43b0 100644
--- 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}