Change the manifest files to be compliant with the multizone update

Author: wongni

Makefile

@@ -94,7 +94,7 @@ run: generate-deepcopy ## Run a controller from your host.
 # Using a flag file here as docker build doesn't produce a target file.
 DOCKER_BUILD_INPUTS=$(MANAGER_BIN_INPUTS) Dockerfile
 .PHONY: docker-build
-docker-build: build-for-docker .dockerflag.mk ## Build docker image containing the controller manager.
+docker-build: generate-deepcopy build-for-docker .dockerflag.mk ## Build docker image containing the controller manager.
 .dockerflag.mk: $(DOCKER_BUILD_INPUTS)
 	docker build -t ${IMG} .
 	@touch .dockerflag.mk

test/e2e/data/infrastructure-cloudstack/v1beta1/bases/cluster-with-kcp.yaml

@@ -23,8 +23,10 @@ kind: CloudStackCluster
 metadata:
   name: ${CLUSTER_NAME}
 spec:
-  zone: ${CLOUDSTACK_ZONE_NAME}
-  network: ${CLOUDSTACK_NETWORK_NAME}
+  zones:
+  - name : ${CLOUDSTACK_ZONE_NAME}
+    network: 
+      name: ${CLOUDSTACK_NETWORK_NAME}
   controlPlaneEndpoint:
     host: ${CLUSTER_ENDPOINT_IP}
     port: ${CLUSTER_ENDPOINT_PORT}

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-invalid-account/cloudstack-cluster.yaml

@@ -3,8 +3,10 @@ kind: CloudStackCluster
 metadata:
   name: ${CLUSTER_NAME}
 spec:
-  zone: ${CLOUDSTACK_ZONE_NAME}
-  network: ${CLOUDSTACK_NETWORK_NAME}
+  zones:
+  - name : ${CLOUDSTACK_ZONE_NAME}
+    network: 
+      name: ${CLOUDSTACK_NETWORK_NAME}
   account: ${CLOUDSTACK_INVALID_ACCOUNT_NAME}
   domain: ${CLOUDSTACK_DOMAIN_NAME}
   controlPlaneEndpoint:

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-invalid-domain/cloudstack-cluster.yaml

@@ -3,8 +3,10 @@ kind: CloudStackCluster
 metadata:
   name: ${CLUSTER_NAME}
 spec:
-  zone: ${CLOUDSTACK_ZONE_NAME}
-  network: ${CLOUDSTACK_NETWORK_NAME}
+  zones:
+  - name : ${CLOUDSTACK_ZONE_NAME}
+    network: 
+      name: ${CLOUDSTACK_NETWORK_NAME}
   account: ${CLOUDSTACK_ACCOUNT_NAME}
   domain: ${CLOUDSTACK_INVALID_DOMAIN_NAME}
   controlPlaneEndpoint:

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-invalid-zone/cloudstack-cluster.yaml

@@ -3,8 +3,10 @@ kind: CloudStackCluster
 metadata:
   name: ${CLUSTER_NAME}
 spec:
-  zone: ${CLOUDSTACK_INVALID_ZONE_NAME}
-  network: ${CLOUDSTACK_NETWORK_NAME}
+  zones:
+  - name : ${CLOUDSTACK_INVALID_ZONE_NAME}
+    network: 
+      name: ${CLOUDSTACK_NETWORK_NAME}
   controlPlaneEndpoint:
     host: ${CLUSTER_ENDPOINT_IP}
     port: ${CLUSTER_ENDPOINT_PORT}

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-resource-cleanup/cloudstack-cluster.yaml

@@ -3,8 +3,10 @@ kind: CloudStackCluster
 metadata:
   name: ${CLUSTER_NAME}
 spec:
-  zone: ${CLOUDSTACK_ZONE_NAME}
-  network: ${CLOUDSTACK_NEW_NETWORK_NAME}
+  zones:
+  - name : ${CLOUDSTACK_ZONE_NAME}
+    network: 
+      name: ${CLOUDSTACK_NEW_NETWORK_NAME}
   controlPlaneEndpoint:
     host: ${CLUSTER_ENDPOINT_NEW_IP}
     port: ${CLUSTER_ENDPOINT_PORT}