Merge pull request #1484 from 24sama/cluster-api-provider

cleanup: modify e2e config template
kubesphere · Aug 31, 2022 · eb46080 · eb46080
2 parents 59297e6 + 9a61d47
commit eb46080
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/exp/cluster-api-provider-kubekey/test/e2e/config/e2e_conf.yaml b/exp/cluster-api-provider-kubekey/test/e2e/config/e2e_conf.yaml
@@ -103,10 +103,8 @@ variables:
   KKZONE: "cn"
   USER_NAME: "ubuntu"
   PASSWORD: "Qcloud@123"
-  INSTANCE01_IP: 172.31.50.190
-  INSTANCE02_IP: 172.31.50.197
-  INSTANCE03_IP: 172.31.50.196
-  CONTROL_PLANE_ENDPOINT_IP: 172.31.50.252
+  INSTANCES: "[{address: 172.31.50.190}, {address: 172.31.50.197}]"
+  CONTROL_PLANE_ENDPOINT_IP: "172.31.50.252"
 
 intervals:
   default/wait-controllers: [ "5m", "10s" ]

diff --git a/...provider-kubekey/test/e2e/data/infrastructure-kubekey/v1beta1/bases/cluster-with-kcp.yaml b/...provider-kubekey/test/e2e/data/infrastructure-kubekey/v1beta1/bases/cluster-with-kcp.yaml
@@ -11,13 +11,7 @@ spec:
     auth:
       user: '${USER_NAME}'
       password: '${PASSWORD}'
-    instances:
-      - name: '${CLUSTER_NAME}-test1'
-        address: '${INSTANCE01_IP}'
-      - name: '${CLUSTER_NAME}-test2'
-        address: '${INSTANCE02_IP}'
-      - name: '${CLUSTER_NAME}-test3'
-        address: '${INSTANCE03_IP}'
+    instances: '${INSTANCES}'
   controlPlaneLoadBalancer:
     host: '${CONTROL_PLANE_ENDPOINT_IP}'
 ---

diff --git a/exp/cluster-api-provider-kubekey/test/e2e/quick_start_test.go b/exp/cluster-api-provider-kubekey/test/e2e/quick_start_test.go
@@ -35,7 +35,6 @@ var _ = Describe("Cluster Creation using Cluster API quick-start test [PR-Blocki
 			BootstrapClusterProxy: bootstrapClusterProxy,
 			ArtifactFolder:        artifactFolder,
 			SkipCleanup:           skipCleanup,
-			//Flavor:                pointer.String("internal"),
 		}
 	})
 })