Skip to content

Commit

Permalink
workaround cloud provider chart federated token bug
Browse files Browse the repository at this point in the history
  • Loading branch information
nojnhuh committed Nov 2, 2023
1 parent 9d2157f commit d6420d0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions scripts/ci-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ 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
}

Expand Down
5 changes: 4 additions & 1 deletion test/e2e/cloud-provider-azure.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ 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, `\,`))},
StringValues: []string{
fmt.Sprintf("cloudControllerManager.clusterCIDR=%s", strings.Join(cidrBlocks, `\,`)),
"cloudControllerManager.federatedTokenPath=",
},
}
// If testing a CI version of Kubernetes, use CCM and CNM images built from source.
if useCIArtifacts || usePRArtifacts {
Expand Down

0 comments on commit d6420d0

Please sign in to comment.