From 21b2cf0bdfa105be5790228b6836b5a9d39ce43a Mon Sep 17 00:00:00 2001 From: Jimmi Dyson Date: Thu, 27 Jun 2024 14:52:56 +0100 Subject: [PATCH] test(e2e): Correct default helm release names for AWS CCM and EBS CSI This was missed in previous PR, but discovered by manually running AWS e2e test suite. --- test/e2e/ccm_helpers.go | 8 ++------ test/e2e/csi_helpers.go | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/test/e2e/ccm_helpers.go b/test/e2e/ccm_helpers.go index 30a35ebaa..e02dd2cd1 100644 --- a/test/e2e/ccm_helpers.go +++ b/test/e2e/ccm_helpers.go @@ -62,10 +62,6 @@ func WaitForCCMToBeReadyInWorkloadCluster( } } -const ( - awsCCMPrefix = "aws-ccm-" -) - func WaitForAWSCCMToBeReadyInWorkloadCluster( ctx context.Context, workloadClusterClient client.Client, @@ -77,7 +73,7 @@ func WaitForAWSCCMToBeReadyInWorkloadCluster( Expect(input.ClusterProxy.GetClient().Get( ctx, types.NamespacedName{ - Name: awsCCMPrefix + input.WorkloadCluster.Name, + Name: "aws-ccm-" + input.WorkloadCluster.Name, Namespace: input.WorkloadCluster.Namespace, }, crs, @@ -98,7 +94,7 @@ func WaitForAWSCCMToBeReadyInWorkloadCluster( WaitForHelmReleaseProxyReadyForClusterInput{ GetLister: input.ClusterProxy.GetClient(), Cluster: input.WorkloadCluster, - HelmChartProxyName: awsCCMPrefix + input.WorkloadCluster.Name, + HelmChartProxyName: "aws-cloud-controller-manager-" + input.WorkloadCluster.Name, }, input.HelmReleaseIntervals..., ) diff --git a/test/e2e/csi_helpers.go b/test/e2e/csi_helpers.go index 1b7974497..b66ed5f9f 100644 --- a/test/e2e/csi_helpers.go +++ b/test/e2e/csi_helpers.go @@ -238,7 +238,7 @@ func waitForAWSEBSCSIToBeReadyInWorkloadCluster( WaitForHelmReleaseProxyReadyForClusterInput{ GetLister: input.clusterProxy.GetClient(), Cluster: input.workloadCluster, - HelmChartProxyName: "aws-ebs-csi-" + input.workloadCluster.Name, + HelmChartProxyName: "aws-ebs-csi-driver-" + input.workloadCluster.Name, }, input.helmReleaseIntervals..., )