Update test templates

Signed-off-by: Kyle Squizzato <[email protected]>
Mirantis · Oct 31, 2024 · de0bea6 · de0bea6
1 parent f6659b5
commit de0bea6
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 30 deletions.
diff --git a/test/e2e/managedcluster/resources/aws-hosted-cp.yaml.tpl b/test/e2e/managedcluster/resources/aws-hosted-cp.yaml.tpl
@@ -6,9 +6,6 @@ spec:
   template: aws-hosted-cp-0-0-2
   credential: ${AWS_CLUSTER_IDENTITY}-cred
   config:
-    clusterIdentity:
-      name: ${AWS_CLUSTER_IDENTITY}
-      namespace: ${NAMESPACE}
     vpcID: ${AWS_VPC_ID}
     region: ${AWS_REGION}
     subnets:

diff --git a/test/e2e/managedcluster/resources/aws-standalone-cp.yaml.tpl b/test/e2e/managedcluster/resources/aws-standalone-cp.yaml.tpl
@@ -2,13 +2,11 @@ apiVersion: hmc.mirantis.com/v1alpha1
 kind: ManagedCluster
 metadata:
   name: ${MANAGED_CLUSTER_NAME}
+  namespace: ${NAMESPACE}
 spec:
   template: aws-standalone-cp-0-0-2
   credential: ${AWS_CLUSTER_IDENTITY}-cred
   config:
-    clusterIdentity:
-      name:  ${AWS_CLUSTER_IDENTITY}
-      namespace: ${NAMESPACE}
     region: ${AWS_REGION}
     publicIP: ${AWS_PUBLIC_IP:=true}
     controlPlaneNumber: ${CONTROL_PLANE_NUMBER:=1}

diff --git a/test/e2e/managedcluster/resources/azure-hosted-cp.yaml.tpl b/test/e2e/managedcluster/resources/azure-hosted-cp.yaml.tpl
@@ -4,15 +4,12 @@ metadata:
   name: ${MANAGED_CLUSTER_NAME}
   namespace: ${NAMESPACE}
 spec:
-  template: azure-hosted-cp-0-0-2
+  template: azure-hosted-cp-0-0-3
   credential: ${AZURE_CLUSTER_IDENTITY}-cred
   config:
     location: "${AZURE_REGION}"
     subscriptionID: "${AZURE_SUBSCRIPTION_ID}"
     vmSize: Standard_A4_v2
-    clusterIdentity:
-      name: ${AZURE_CLUSTER_IDENTITY}
-      namespace: hmc-system
     resourceGroup: "${AZURE_RESOURCE_GROUP}"
     network:
       vnetName: "${AZURE_VM_NET_NAME}"

diff --git a/test/e2e/managedcluster/resources/azure-standalone-cp.yaml.tpl b/test/e2e/managedcluster/resources/azure-standalone-cp.yaml.tpl
@@ -4,7 +4,7 @@ metadata:
   name: ${MANAGED_CLUSTER_NAME}
   namespace: ${NAMESPACE}
 spec:
-  template: azure-standalone-cp-0-0-2
+  template: azure-standalone-cp-0-0-3
   credential: ${AZURE_CLUSTER_IDENTITY}-cred
   config:
     controlPlaneNumber: 1
@@ -15,10 +15,6 @@ spec:
       vmSize: Standard_A4_v2
     worker:
       vmSize: Standard_A4_v2
-    credential: ${AZURE_CLUSTER_IDENTITY}-cred
-    clusterIdentity:
-      name: ${AZURE_CLUSTER_IDENTITY}
-      namespace: ${NAMESPACE}
     tenantID: "${AZURE_TENANT_ID}"
     clientID: "${AZURE_CLIENT_ID}"
     clientSecret: "${AZURE_CLIENT_SECRET}"
diff --git a/test/e2e/managedcluster/resources/vsphere-hosted-cp.yaml.tpl b/test/e2e/managedcluster/resources/vsphere-hosted-cp.yaml.tpl
@@ -2,14 +2,13 @@ apiVersion: hmc.mirantis.com/v1alpha1
 kind: ManagedCluster
 metadata:
   name: ${MANAGED_CLUSTER_NAME}
+  namespace: ${NAMESPACE}
 spec:
   template: vsphere-hosted-cp-0-0-2
   credential: ${VSPHERE_CLUSTER_IDENTITY}-cred
   config:
     controlPlaneNumber: ${CONTROL_PLANE_NUMBER:=1}
     workersNumber: ${WORKERS_NUMBER:=1}
-    clusterIdentity:
-      name: "${VSPHERE_CLUSTER_IDENTITY}"
     vsphere:
       server: "${VSPHERE_SERVER}"
       thumbprint: "${VSPHERE_THUMBPRINT} "
@@ -20,15 +19,24 @@ spec:
       username: "${VSPHERE_USER}"
       password: "${VSPHERE_PASSWORD}"
     controlPlaneEndpointIP: "${VSPHERE_CONTROL_PLANE_ENDPOINT}"
-
-    ssh:
-      user: ubuntu
-      publicKey: "${VSPHERE_SSH_KEY}"
-    rootVolumeSize: 50
-    cpus: 4
-    memory: 4096
-    vmTemplate: "${VSPHERE_VM_TEMPLATE}"
-    network: "${VSPHERE_NETWORK}"
+    controlPlane:
+      ssh:
+        user: ubuntu
+        publicKey: "${VSPHERE_SSH_KEY}"
+      rootVolumeSize: 50
+      cpus: 4
+      memory: 4096
+      vmTemplate: "${VSPHERE_VM_TEMPLATE}"
+      network: "${VSPHERE_NETWORK}"
+    worker:
+      ssh:
+        user: ubuntu
+        publicKey: "${VSPHERE_SSH_KEY}"
+      rootVolumeSize: 50
+      cpus: 4
+      memory: 4096
+      vmTemplate: ${VSPHERE_VM_TEMPLATE}
+      network: ${VSPHERE_NETWORK}
 
     k0smotron:
       service:

diff --git a/test/e2e/managedcluster/resources/vsphere-standalone-cp.yaml.tpl b/test/e2e/managedcluster/resources/vsphere-standalone-cp.yaml.tpl
@@ -8,8 +8,6 @@ spec:
   config:
     controlPlaneNumber: ${CONTROL_PLANE_NUMBER:=1}
     workersNumber: ${WORKERS_NUMBER:=1}
-    clusterIdentity:
-      name: "${VSPHERE_CLUSTER_IDENTITY}"
     vsphere:
       server: "${VSPHERE_SERVER}"
       thumbprint: "${VSPHERE_THUMBPRINT} "
@@ -20,7 +18,6 @@ spec:
       username: "${VSPHERE_USER}"
       password: "${VSPHERE_PASSWORD}"
     controlPlaneEndpointIP: "${VSPHERE_CONTROL_PLANE_ENDPOINT}"
-
     controlPlane:
       ssh:
         user: ubuntu
@@ -30,7 +27,6 @@ spec:
       memory: 4096
       vmTemplate: "${VSPHERE_VM_TEMPLATE}"
       network: "${VSPHERE_NETWORK}"
-
     worker:
       ssh:
         user: ubuntu