Skip to content

Commit

Permalink
HACK: update dev cloud-provider containers to azurecr.io
Browse files Browse the repository at this point in the history
  • Loading branch information
mboersma committed Nov 30, 2022
1 parent dbd19f7 commit 7c21d95
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,8 @@ def deploy_worker_templates(template, substitutions):
flavor_cmd += "; " + helm_cmd + " repo add projectcalico https://projectcalico.docs.tigera.io/charts; " + helm_cmd + " --kubeconfig ./${CLUSTER_NAME}.kubeconfig install calico projectcalico/tigera-operator -f " + calico_values + " --namespace tigera-operator --create-namespace; kubectl --kubeconfig ./${CLUSTER_NAME}.kubeconfig apply -f ./templates/addons/calico/felix-override.yaml"
if "external-cloud-provider" in flavor_name or "flex" in flavor_name:
flavor_cmd += "; " + helm_cmd + " --kubeconfig ./${CLUSTER_NAME}.kubeconfig install --repo https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo cloud-provider-azure --generate-name --set infra.clusterName=${CLUSTER_NAME}" + \
" --set cloudControllerManager.imageRepository=mbdevregistry.azurecr.io --set cloudControllerManager.imageName=azure-cloud-controller-manager --set cloudControllerManager.imageTag=latest" + \
" --set cloudNodeManager.imageRepository=mbdevregistry.azurecr.io --set cloudNodeManager.imageName=azure-cloud-node-manager --set cloudNodeManager.imageTag=latest"
" --set cloudControllerManager.imageRepository=selfhostedk8s.azurecr.io --set cloudControllerManager.imageTag=d8d65f1" + \
" --set cloudNodeManager.imageRepository=selfhostedk8s.azurecr.io --set cloudNodeManager.imageTag=d8d65f1"
local_resource(
name = flavor_name,
cmd = flavor_cmd,
Expand Down
10 changes: 4 additions & 6 deletions test/e2e/cloud-provider-azure.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,10 @@ func InstallCalicoAndCloudProviderAzureHelmChart(ctx context.Context, input clus
Values: []string{
fmt.Sprintf("infra.clusterName=%s", input.ConfigCluster.ClusterName),
// HACK: use dev build of cloud-provider-azure for VMSS Flex support
"cloudControllerManager.imageRepository=mbdevregistry.azurecr.io",
"cloudControllerManager.imageName=azure-cloud-controller-manager",
"cloudControllerManager.imageTag=latest",
"cloudNodeManager.imageRepository=mbdevregistry.azurecr.io",
"cloudNodeManager.imageName=azure-cloud-node-manager",
"cloudNodeManager.imageTag=latest",
"cloudControllerManager.imageRepository=selfhostedk8s.azurecr.io",
"cloudControllerManager.imageTag=d8d65f1",
"cloudNodeManager.imageRepository=selfhostedk8s.azurecr.io",
"cloudNodeManager.imageTag=d8d65f1",
},
}
InstallHelmChart(ctx, input, defaultNamespace, cloudProviderAzureHelmRepoURL, cloudProviderAzureChartName, cloudProviderAzureHelmReleaseName, options)
Expand Down

0 comments on commit 7c21d95

Please sign in to comment.