diff --git a/.zuul.yaml b/.zuul.yaml index c6e8374..f1021f9 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -13,6 +13,8 @@ - project: vars: docker_registry: quay.io + gcp_sdk: gcr.io/google.com/cloudsdktool/cloud-sdk:308.0.0 + az_sdk: mcr.microsoft.com/azure-cli:2.8.0 proxy: enabled: false http: "" diff --git a/bootstrap_capg/Makefile b/bootstrap_capg/Makefile index da3f620..b073421 100644 --- a/bootstrap_capg/Makefile +++ b/bootstrap_capg/Makefile @@ -19,6 +19,7 @@ DOCKER_TARGET_STAGE ?= release PROXY ?= http://proxy.foo.com:8000 NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local USE_PROXY ?= false +GCP_SDK ?= gcr.io/google.com/cloudsdktool/cloud-sdk:308.0.0 PATH += :/usr/local/go/bin HELP_FILE ?= /tmp/help.txt @@ -37,6 +38,7 @@ images: Dockerfile \ ifeq ($(USE_PROXY), true) @docker build . --network=host \ --build-arg MAKE_TARGET=$(DOCKER_MAKE_TARGET) \ + --build-arg GCP_SDK=$(GCP_SDK) \ --tag $(DOCKER_IMAGE) \ --build-arg http_proxy=$(PROXY) \ --build-arg https_proxy=$(PROXY) \ @@ -48,6 +50,7 @@ ifeq ($(USE_PROXY), true) else @docker build . --network=host \ --build-arg MAKE_TARGET=$(DOCKER_MAKE_TARGET) \ + --build-arg GCP_SDK=$(GCP_SDK) \ --tag $(DOCKER_IMAGE) \ --force-rm=$(DOCKER_FORCE_CLEAN) endif diff --git a/bootstrap_capz/Makefile b/bootstrap_capz/Makefile index b0dcf07..c0dac88 100644 --- a/bootstrap_capz/Makefile +++ b/bootstrap_capz/Makefile @@ -19,6 +19,7 @@ DOCKER_TARGET_STAGE ?= release PROXY ?= http://proxy.foo.com:8000 NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local USE_PROXY ?= false +AZ_SDK ?= mcr.microsoft.com/azure-cli:2.8.0 PATH += :/usr/local/go/bin HELP_FILE ?= /tmp/help.txt @@ -37,6 +38,7 @@ images: Dockerfile \ ifeq ($(USE_PROXY), true) @docker build . --network=host \ --build-arg MAKE_TARGET=$(DOCKER_MAKE_TARGET) \ + --build-arg AZ_SDK=$(AZ_SDK) \ --tag $(DOCKER_IMAGE) \ --build-arg http_proxy=$(PROXY) \ --build-arg https_proxy=$(PROXY) \ @@ -48,6 +50,7 @@ ifeq ($(USE_PROXY), true) else @docker build . --network=host \ --build-arg MAKE_TARGET=$(DOCKER_MAKE_TARGET) \ + --build-arg AZ_SDK=$(AZ_SDK) \ --tag $(DOCKER_IMAGE) \ --force-rm=$(DOCKER_FORCE_CLEAN) endif diff --git a/playbooks/airship-images-publish.yaml b/playbooks/airship-images-publish.yaml index 491e4d3..5a30a0f 100644 --- a/playbooks/airship-images-publish.yaml +++ b/playbooks/airship-images-publish.yaml @@ -41,4 +41,6 @@ NO_PROXY: "{{ proxy.noproxy }}" USE_PROXY: "{{ proxy.enabled | lower }}" DOCKER_REGISTRY: "{{ docker_registry }}" + GCP_SDK: "{{ gcp_sdk }}" + AZ_SDK: "{{ az_sdk }}" become: True