File tree Expand file tree Collapse file tree 4 files changed +4
-6
lines changed Expand file tree Collapse file tree 4 files changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -331,7 +331,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create
331331 timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/v0.2.5/addon-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"
332332
333333 # Deploy CAPZ
334- $(KIND) load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=$(KIND_CLUSTER_NAME) ; \
334+ $(KIND) load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=$(KIND_CLUSTER_NAME)
335335 timeout --foreground 300 bash -c "until $(KUSTOMIZE) build config/default | $(ENVSUBST) | $(KUBECTL) apply -f - --server-side=true; do sleep 5; done"
336336
337337 # Wait for CAPI deployments
@@ -380,8 +380,6 @@ create-workload-cluster: $(ENVSUBST) $(KUBECTL) ## Create a workload cluster.
380380 $(KUBECTL) get secret/$(CLUSTER_NAME)-kubeconfig -n default -o json | jq -r .data.value | base64 --decode > ./kubeconfig
381381 $(KUBECTL) -n default wait --for=condition=Ready --timeout=10m cluster "$(CLUSTER_NAME)"
382382
383- ./scripts/peer-vnets.sh
384-
385383 @echo 'run "$(KUBECTL) --kubeconfig=./kubeconfig ..." to work with the new target cluster'
386384
387385.PHONY : create-cluster
Original file line number Diff line number Diff line change @@ -64,7 +64,7 @@ export ASO_CREDENTIAL_SECRET_NAME=${ASO_CREDENTIAL_SECRET_NAME:="aso-credentials
6464capz::util::generate_ssh_key
6565
6666echo " ================ DOCKER BUILD ==============="
67- PULL_POLICY=IfNotPresent make modules docker-build docker-push
67+ PULL_POLICY=IfNotPresent make modules docker-build
6868
6969setup () {
7070 echo " ================ MAKE CLEAN ==============="
Original file line number Diff line number Diff line change @@ -70,7 +70,7 @@ main() {
7070 echo " Creating ${AZURE_BLOB_CONTAINER_NAME} storage container"
7171 az storage container create --name " ${AZURE_BLOB_CONTAINER_NAME} " --auth-mode login > /dev/null
7272 # if the storage account has public access disabled at the account level this will return 404
73- # AZURE_STORAGE_AUTH_MODE=login az storage container set-permission --name "${AZURE_BLOB_CONTAINER_NAME}" --public-access container > /dev/null
73+ AZURE_STORAGE_AUTH_MODE=login az storage container set-permission --name " ${AZURE_BLOB_CONTAINER_NAME} " --public-access container > /dev/null
7474 fi
7575
7676 az storage blob upload --overwrite --container-name " ${AZURE_BLOB_CONTAINER_NAME} " --file " ${AZURE_CLOUD_PROVIDER_ROOT} /bin/azure-acr-credential-provider" --name " ${IMAGE_TAG_ACR_CREDENTIAL_PROVIDER} /azure-acr-credential-provider" --auth-mode login
Original file line number Diff line number Diff line change @@ -80,7 +80,7 @@ main() {
8080 if [[ " $( az storage container exists --name " ${AZURE_BLOB_CONTAINER_NAME} " --query exists --output tsv --auth-mode login) " == " false" ]]; then
8181 echo " Creating ${AZURE_BLOB_CONTAINER_NAME} storage container"
8282 az storage container create --name " ${AZURE_BLOB_CONTAINER_NAME} " --auth-mode login > /dev/null
83- # az storage container set-permission --name "${AZURE_BLOB_CONTAINER_NAME}" --auth-mode login --public-access container > /dev/null
83+ az storage container set-permission --name " ${AZURE_BLOB_CONTAINER_NAME} " --auth-mode login --public-access container > /dev/null
8484 fi
8585
8686 if [[ " ${KUBE_BUILD_CONFORMANCE:- } " =~ [yY] ]]; then
You can’t perform that action at this time.
0 commit comments