Merge pull request #4231 from k8s-infra-cherrypick-robot/cherry-pick-4230-to-release-1.11

[release-1.11] Revert "workaround cloud provider chart federated token bug"

Author: k8s-ci-robot

scripts/ci-entrypoint.sh

@@ -226,7 +226,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
 }
 

test/e2e/cloud-provider-azure.go

@@ -48,10 +48,7 @@ func InstallCalicoAndCloudProviderAzureHelmChart(ctx context.Context, input clus
 			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 {