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

This involve not collecting machine logs if there is no bastion in the
cluster.

Author: EmilienM

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:

test/e2e/data/kustomize/v1alpha5/bastion.yaml

@@ -6,9 +6,3 @@ resources:
 components:
 - ../common-patches/cni
 - ../common-patches/ccm
-
-patches:
-- path: bastion.yaml
-  target:
-    kind: OpenStackCluster
-    name: \${CLUSTER_NAME}

test/e2e/data/kustomize/v1alpha5/kustomization.yaml

@@ -20,7 +20,3 @@ patches:
           - {}
   target:
     kind: OpenStackMachineTemplate
-- path: bastion.yaml
-  target:
-    kind: OpenStackCluster
-    name: \${CLUSTER_NAME}

test/e2e/data/kustomize/v1alpha6/bastion.yaml

@@ -20,7 +20,3 @@ patches:
           - {}
   target:
     kind: OpenStackMachineTemplate
-- path: bastion.yaml
-  target:
-    kind: OpenStackCluster
-    name: \${CLUSTER_NAME}

test/e2e/data/kustomize/v1alpha6/kustomization.yaml

@@ -214,51 +214,54 @@ func (o OpenStackLogCollector) CollectMachineLog(ctx context.Context, management
 		return fmt.Errorf("error writing server JSON %s: %s", serverJSON, err)
 	}
 
-	srvUser := o.E2EContext.E2EConfig.GetVariable(SSHUserMachine)
-	executeCommands(
-		ctx,
-		o.E2EContext.Settings.ArtifactFolder,
-		o.E2EContext.Settings.Debug,
-		outputPath,
-		ip,
-		openStackCluster.Status.Bastion.FloatingIP,
-		srvUser,
-		[]command{
-			// don't do this for now, it just takes to long
-			// {
-			//	title: "systemd",
-			//	cmd:   "journalctl --no-pager --output=short-precise | grep -v  'audit:\\|audit\\['",
-			// },
-			{
-				title: "kern",
-				cmd:   "journalctl --no-pager --output=short-precise -k",
+	// If the machine has a bastion, collect logs from there.
+	if openStackCluster.Status.Bastion != nil {
+		srvUser := o.E2EContext.E2EConfig.GetVariable(SSHUserMachine)
+		executeCommands(
+			ctx,
+			o.E2EContext.Settings.ArtifactFolder,
+			o.E2EContext.Settings.Debug,
+			outputPath,
+			ip,
+			openStackCluster.Status.Bastion.FloatingIP,
+			srvUser,
+			[]command{
+				// don't do this for now, it just takes to long
+				// {
+				//	title: "systemd",
+				//	cmd:   "journalctl --no-pager --output=short-precise | grep -v  'audit:\\|audit\\['",
+				// },
+				{
+					title: "kern",
+					cmd:   "journalctl --no-pager --output=short-precise -k",
+				},
+				{
+					title: "containerd-info",
+					cmd:   "crictl --runtime-endpoint unix:///run/containerd/containerd.sock info",
+				},
+				{
+					title: "containerd-containers",
+					cmd:   "crictl --runtime-endpoint unix:///run/containerd/containerd.sock ps",
+				},
+				{
+					title: "containerd-pods",
+					cmd:   "crictl --runtime-endpoint unix:///run/containerd/containerd.sock pods",
+				},
+				{
+					title: "cloud-final",
+					cmd:   "journalctl --no-pager -u cloud-final",
+				},
+				{
+					title: "kubelet",
+					cmd:   "journalctl --no-pager -u kubelet.service",
+				},
+				{
+					title: "containerd",
+					cmd:   "journalctl --no-pager -u containerd.service",
+				},
 			},
-			{
-				title: "containerd-info",
-				cmd:   "crictl --runtime-endpoint unix:///run/containerd/containerd.sock info",
-			},
-			{
-				title: "containerd-containers",
-				cmd:   "crictl --runtime-endpoint unix:///run/containerd/containerd.sock ps",
-			},
-			{
-				title: "containerd-pods",
-				cmd:   "crictl --runtime-endpoint unix:///run/containerd/containerd.sock pods",
-			},
-			{
-				title: "cloud-final",
-				cmd:   "journalctl --no-pager -u cloud-final",
-			},
-			{
-				title: "kubelet",
-				cmd:   "journalctl --no-pager -u kubelet.service",
-			},
-			{
-				title: "containerd",
-				cmd:   "journalctl --no-pager -u containerd.service",
-			},
-		},
-	)
+		)
+	}
 	return nil
 }
 

test/e2e/data/kustomize/v1alpha7/bastion.yaml

@@ -152,7 +152,7 @@ var _ = Describe("e2e tests [PR-Blocking]", func() {
 
 			securityGroupsList, err := shared.DumpOpenStackSecurityGroups(e2eCtx, groups.ListOpts{Tags: clusterName})
 			Expect(err).NotTo(HaveOccurred())
-			Expect(securityGroupsList).To(HaveLen(3))
+			Expect(securityGroupsList).To(HaveLen(2))
 		})
 	})