test: adjust templates for v1.9 to allow setting controlPlane port

kubernetes-sigs · Jul 19, 2024 · a37eea9 · a37eea9
1 parent 021f855
commit a37eea9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/clusterclass/clusterclass-quick-start.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/clusterclass/clusterclass-quick-start.yaml
@@ -100,7 +100,7 @@ spec:
         valueFrom:
           template: |
             host: '{{ .controlPlaneIpAddr }}'
-            port: 6443
+            port: {{ .controlPlanePort }}
       - op: add
         path: /spec/template/spec/identityRef
         valueFrom:
@@ -223,6 +223,13 @@ spec:
       openAPIV3Schema:
         description: Floating VIP for the control plane.
         type: string
+  - metadata: {}
+    name: controlPlanePort
+    required: true
+    schema:
+      openAPIV3Schema:
+        description: Port for the control plane endpoint.
+        type: integer
   - name: credsSecretName
     required: true
     schema:

diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/topology/kustomization.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/topology/kustomization.yaml
@@ -6,4 +6,8 @@ resources:
 patchesStrategicMerge:
   - ../commons/cluster-resource-set-label.yaml
   - ../commons/cluster-network-CIDR.yaml
-  - ../commons/cluster-resource-set-csi-insecure.yaml
+  - ../commons/cluster-resource-set-csi-insecure.yaml
+patches:
+  - target:
+      kind: Cluster
+    path: workload-control-plane-port.yaml
diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/topology/workload-control-plane-port.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/topology/workload-control-plane-port.yaml
@@ -0,0 +1,5 @@
+- op: add
+  path: /spec/topology/variables/-
+  value:
+    name: controlPlanePort
+    value: ${CONTROL_PLANE_ENDPOINT_PORT:=6443}