Revert "workaround cloud provider chart federated token bug"

This reverts commit d6420d0.
kubernetes-sigs · Nov 3, 2023 · 1867a47 · 1867a47
1 parent 18531b1
commit 1867a47
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/scripts/ci-entrypoint.sh b/scripts/ci-entrypoint.sh
@@ -209,7 +209,6 @@ install_cloud_provider_azure() {
         --set cloudControllerManager.cloudConfig="${CLOUD_CONFIG}" \
         --set cloudControllerManager.cloudConfigSecretName="${CONFIG_SECRET_NAME}" \
         --set cloudControllerManager.logVerbosity="${CCM_LOG_VERBOSITY}" \
-        --set-string cloudControllerManager.federatedTokenPath= \
         --set-string cloudControllerManager.clusterCIDR="${CCM_CLUSTER_CIDR}" "${CCM_IMG_ARGS[@]}" || return 1
 }
 

diff --git a/test/e2e/cloud-provider-azure.go b/test/e2e/cloud-provider-azure.go
@@ -48,10 +48,7 @@ func InstallCNIAndCloudProviderAzureHelmChart(ctx context.Context, input cluster
 			fmt.Sprintf("infra.clusterName=%s", input.ClusterName),
 			"cloudControllerManager.logVerbosity=4",
 		},
-		StringValues: []string{
-			fmt.Sprintf("cloudControllerManager.clusterCIDR=%s", strings.Join(cidrBlocks, `\,`)),
-			"cloudControllerManager.federatedTokenPath=",
-		},
+		StringValues: []string{fmt.Sprintf("cloudControllerManager.clusterCIDR=%s", strings.Join(cidrBlocks, `\,`))},
 	}
 	// If testing a CI version of Kubernetes, use CCM and CNM images built from source.
 	if useCIArtifacts || usePRArtifacts {