Merge pull request #1932 from shiftstack/externalnet

🐛 CI: Specify external network by name

Author: k8s-ci-robot

test/e2e/data/e2e_conf.yaml

@@ -203,7 +203,8 @@ variables:
   OPENSTACK_IMAGE_NAME_UPGRADE_FROM: "ubuntu-2204-kube-v1.27.2"
   OPENSTACK_NODE_MACHINE_FLAVOR: "m1.small"
   OPENSTACK_SSH_KEY_NAME: "cluster-api-provider-openstack-sigs-k8s-io"
-  OPENSTACK_EXTERNAL_NETWORK_ID: ""
+  # The default external network created by devstack
+  OPENSTACK_EXTERNAL_NETWORK_NAME: "public"
   OPENSTACK_VOLUME_TYPE_ALT: "test-volume-type"
   CONFORMANCE_WORKER_MACHINE_COUNT: "5"
   CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"

test/e2e/data/kustomize/common-patches/externalNetworkByName/kustomization.yaml

@@ -0,0 +1,14 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+- patch: |-
+    - op: "remove"
+      path: "/spec/externalNetwork"
+    - op: "add"
+      path: "/spec/externalNetwork"
+      value:
+        name: "${OPENSTACK_EXTERNAL_NETWORK_NAME}"
+  target:
+    kind: OpenStackCluster

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

@@ -6,3 +6,4 @@ components:
 - ../common-patches/cni
 - ../upgrade-patches
 - ../common-patches/ccm
+- ../common-patches/externalNetworkByName

test/e2e/data/kustomize/flatcar-sysext/kustomization.yaml

@@ -5,3 +5,4 @@ resources:
 components:
 - ../common-patches/cni
 - ../common-patches/ccm
+- ../common-patches/externalNetworkByName

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

@@ -6,3 +6,4 @@ resources:
 components:
 - ../common-patches/cni
 - ../common-patches/ccm
+- ../common-patches/externalNetworkByName

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

@@ -24,3 +24,8 @@ patches:
   target:
     kind: OpenStackCluster
     name: \${CLUSTER_NAME}
+- patch: |-
+    - op: "remove"
+      path: "/spec/externalNetworkId"
+  target:
+    kind: OpenStackCluster

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

@@ -24,3 +24,8 @@ patches:
   target:
     kind: OpenStackCluster
     name: \${CLUSTER_NAME}
+- patch: |-
+    - op: "remove"
+      path: "/spec/externalNetworkId"
+  target:
+    kind: OpenStackCluster

test/e2e/data/kustomize/without-lb/kustomization.yaml

@@ -6,3 +6,4 @@ resources:
 components:
 - ../common-patches/cni
 - ../common-patches/ccm
+- ../common-patches/externalNetworkByName