Skip to content

Commit 7f077a4

Browse files
nojnhuhk8s-infra-cherrypick-robot
authored andcommitted
workaround cloud provider chart federated token bug
1 parent 1a7c4e6 commit 7f077a4

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

scripts/ci-entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ install_cloud_provider_azure() {
226226
--set cloudControllerManager.cloudConfig="${CLOUD_CONFIG}" \
227227
--set cloudControllerManager.cloudConfigSecretName="${CONFIG_SECRET_NAME}" \
228228
--set cloudControllerManager.logVerbosity="${CCM_LOG_VERBOSITY}" \
229+
--set-string cloudControllerManager.federatedTokenPath= \
229230
--set-string cloudControllerManager.clusterCIDR="${CCM_CLUSTER_CIDR}" "${CCM_IMG_ARGS[@]}" || return 1
230231
}
231232

test/e2e/cloud-provider-azure.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ func InstallCalicoAndCloudProviderAzureHelmChart(ctx context.Context, input clus
4848
fmt.Sprintf("infra.clusterName=%s", input.ClusterName),
4949
"cloudControllerManager.logVerbosity=4",
5050
},
51-
StringValues: []string{fmt.Sprintf("cloudControllerManager.clusterCIDR=%s", strings.Join(cidrBlocks, `\,`))},
51+
StringValues: []string{
52+
fmt.Sprintf("cloudControllerManager.clusterCIDR=%s", strings.Join(cidrBlocks, `\,`)),
53+
"cloudControllerManager.federatedTokenPath=",
54+
},
5255
}
5356
// If testing a CI version of Kubernetes, use CCM and CNM images built from source.
5457
if useCIArtifacts || usePRArtifacts {

0 commit comments

Comments
 (0)