Variable removed (#658)

vmware-tanzu · Jul 25, 2022 · ce6dfe8 · ce6dfe8
1 parent 2441028
commit ce6dfe8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/metadata.yaml b/metadata.yaml
@@ -3,4 +3,8 @@ kind: Metadata
 releaseSeries:
   - major: 0
     minor: 1
-    contract: v1beta1
+    contract: v1beta1
+  - major: 0
+    minor: 2
+    contract: v1beta1
+
diff --git a/test/e2e/config/provider.yaml b/test/e2e/config/provider.yaml
@@ -63,7 +63,7 @@ providers:
   - name: byoh
     type: InfrastructureProvider
     versions:
-      - name: v0.1.0
+      - name: v0.2.0
         # Use manifest from source files
         value: ../../../config/default
         type: kustomize

diff --git a/...e2e/data/infrastructure-provider-byoh/v1beta1/templates/vm/cluster-template-topology.yaml b/...e2e/data/infrastructure-provider-byoh/v1beta1/templates/vm/cluster-template-topology.yaml
@@ -17,7 +17,7 @@ spec:
       - "192.168.0.0/16"
     serviceDomain: "cluster.local"
   topology:
-    class: ${CLUSTER_CLASS_NAME}
+    class: quickstart
     version: ${KUBERNETES_VERSION}
     controlPlane:
       metadata: {}
@@ -26,7 +26,7 @@ spec:
       - name: bundleLookupBaseRegistry
         value: "projects.registry.vmware.com/cluster_api_provider_bringyourownhost"
       - name: controlPlaneIpAddr
-        value: ${CONTROL_PLANE_ENDPOINT}
+        value: ${CONTROL_PLANE_ENDPOINT_IP}
       - name: kubeVipPodManifest
         value: |
           apiVersion: v1
@@ -47,7 +47,7 @@ spec:
               - name: vip_leaderelection
                 value: "true"
               - name: vip_address
-                value: ${CONTROL_PLANE_ENDPOINT}
+                value: ${CONTROL_PLANE_ENDPOINT_IP}
               - name: vip_interface
                 value: "{{ .DefaultNetworkInterfaceName }}"
               - name: vip_leaseduration
@@ -81,7 +81,7 @@ spec:
           status: {}
     workers:
       machineDeployments:
-        - class: ${CLUSTER_CLASS_NAME}-worker
+        - class: quickstart-worker
           metadata: { }
           name: md-0
           replicas: ${WORKER_MACHINE_COUNT}

diff --git a/test/e2e/data/infrastructure-provider-byoh/v1beta1/templates/vm/clusterclass-quickstart.yaml b/test/e2e/data/infrastructure-provider-byoh/v1beta1/templates/vm/clusterclass-quickstart.yaml
@@ -104,7 +104,7 @@ spec:
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: ByoMachineTemplate
 metadata:
-  name: ${CLUSTER_NAME}-control-plane
+  name: quickstart-control-plane-machine
 spec:
   template:
     spec:
@@ -117,7 +117,7 @@ spec:
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: ByoMachineTemplate
 metadata:
-  name: ${CLUSTER_NAME}-md-0
+  name: quickstart-worker-machinetemplate
 spec:
   template:
     spec: