From 9451437aa9b6fd64d815136d2c80b7cb1184e705 Mon Sep 17 00:00:00 2001 From: Kyle Squizzato Date: Mon, 30 Sep 2024 23:48:42 -0700 Subject: [PATCH] Ensure config.credential exists across test templates Signed-off-by: Kyle Squizzato --- test/e2e/managedcluster/resources/aws-hosted-cp.yaml.tpl | 1 + test/e2e/managedcluster/resources/aws-standalone-cp.yaml.tpl | 1 + test/e2e/managedcluster/resources/azure-hosted-cp.yaml.tpl | 1 + test/e2e/managedcluster/resources/azure-standalone-cp.yaml.tpl | 2 ++ test/e2e/managedcluster/resources/vsphere-hosted-cp.yaml.tpl | 1 + .../e2e/managedcluster/resources/vsphere-standalone-cp.yaml.tpl | 1 + 6 files changed, 7 insertions(+) diff --git a/test/e2e/managedcluster/resources/aws-hosted-cp.yaml.tpl b/test/e2e/managedcluster/resources/aws-hosted-cp.yaml.tpl index eaecec8d6..16cfee930 100644 --- a/test/e2e/managedcluster/resources/aws-hosted-cp.yaml.tpl +++ b/test/e2e/managedcluster/resources/aws-hosted-cp.yaml.tpl @@ -5,6 +5,7 @@ metadata: namespace: ${NAMESPACE} spec: template: aws-hosted-cp + credential: ${AWS_CLUSTER_IDENTITY}-cred config: clusterIdentity: name: ${AWS_CLUSTER_IDENTITY} diff --git a/test/e2e/managedcluster/resources/aws-standalone-cp.yaml.tpl b/test/e2e/managedcluster/resources/aws-standalone-cp.yaml.tpl index abad8c4b1..491207118 100644 --- a/test/e2e/managedcluster/resources/aws-standalone-cp.yaml.tpl +++ b/test/e2e/managedcluster/resources/aws-standalone-cp.yaml.tpl @@ -5,6 +5,7 @@ metadata: namespace: ${NAMESPACE} spec: template: aws-standalone-cp + credential: ${AWS_CLUSTER_IDENTITY}-cred config: clusterIdentity: name: ${AWS_CLUSTER_IDENTITY} diff --git a/test/e2e/managedcluster/resources/azure-hosted-cp.yaml.tpl b/test/e2e/managedcluster/resources/azure-hosted-cp.yaml.tpl index db6f1787f..22d4bffea 100644 --- a/test/e2e/managedcluster/resources/azure-hosted-cp.yaml.tpl +++ b/test/e2e/managedcluster/resources/azure-hosted-cp.yaml.tpl @@ -5,6 +5,7 @@ metadata: namespace: ${NAMESPACE} spec: template: azure-hosted-cp + credential: ${AZURE_CLUSTER_IDENTITY}-cred config: location: "westus" subscriptionID: "${AZURE_SUBSCRIPTION_ID}" diff --git a/test/e2e/managedcluster/resources/azure-standalone-cp.yaml.tpl b/test/e2e/managedcluster/resources/azure-standalone-cp.yaml.tpl index 6516ccf77..5b8c2472f 100644 --- a/test/e2e/managedcluster/resources/azure-standalone-cp.yaml.tpl +++ b/test/e2e/managedcluster/resources/azure-standalone-cp.yaml.tpl @@ -5,6 +5,7 @@ metadata: namespace: ${NAMESPACE} spec: template: azure-standalone-cp + credential: ${AZURE_CLUSTER_IDENTITY}-cred config: controlPlaneNumber: 1 workersNumber: 1 @@ -14,6 +15,7 @@ spec: vmSize: Standard_A4_v2 worker: vmSize: Standard_A4_v2 + credential: ${AZURE_CLUSTER_IDENTITY}-cred clusterIdentity: name: ${AZURE_CLUSTER_IDENTITY} namespace: ${NAMESPACE} diff --git a/test/e2e/managedcluster/resources/vsphere-hosted-cp.yaml.tpl b/test/e2e/managedcluster/resources/vsphere-hosted-cp.yaml.tpl index a4c328b77..b49485a0c 100644 --- a/test/e2e/managedcluster/resources/vsphere-hosted-cp.yaml.tpl +++ b/test/e2e/managedcluster/resources/vsphere-hosted-cp.yaml.tpl @@ -4,6 +4,7 @@ metadata: name: ${MANAGED_CLUSTER_NAME}-vsphere spec: template: vsphere-hosted-cp + credential: ${VSPHERE_CLUSTER_IDENTITY}-cred config: controlPlaneNumber: ${CONTROL_PLANE_NUMBER:=1} workersNumber: ${WORKERS_NUMBER:=1} diff --git a/test/e2e/managedcluster/resources/vsphere-standalone-cp.yaml.tpl b/test/e2e/managedcluster/resources/vsphere-standalone-cp.yaml.tpl index 81eb8edf3..0ba05c39a 100644 --- a/test/e2e/managedcluster/resources/vsphere-standalone-cp.yaml.tpl +++ b/test/e2e/managedcluster/resources/vsphere-standalone-cp.yaml.tpl @@ -4,6 +4,7 @@ metadata: name: ${MANAGED_CLUSTER_NAME}-vsphere spec: template: vsphere-standalone-cp + credential: ${VSPHERE_CLUSTER_IDENTITY}-cred config: controlPlaneNumber: ${CONTROL_PLANE_NUMBER:=1} workersNumber: ${WORKERS_NUMBER:=1}