From a69b46448f52b4b350107ef0482f31941ac9599d Mon Sep 17 00:00:00 2001 From: Tanvir Tatla Date: Wed, 6 Sep 2023 14:18:14 -0700 Subject: [PATCH] use go 1.20 when creating capi manifests --- projects/kubernetes-sigs/cluster-api/Makefile | 2 +- projects/kubernetes-sigs/cluster-api/build/create_manifests.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/kubernetes-sigs/cluster-api/Makefile b/projects/kubernetes-sigs/cluster-api/Makefile index 5b28efb923..3d63a1e667 100644 --- a/projects/kubernetes-sigs/cluster-api/Makefile +++ b/projects/kubernetes-sigs/cluster-api/Makefile @@ -44,7 +44,7 @@ cluster-api-docker-controller/images/%: BASE_IMAGE_NAME=eks-distro-minimal-base .PHONY: create-manifests create-manifests: tarballs - build/create_manifests.sh $(REPO) $(OUTPUT_DIR) $(ARTIFACTS_PATH) $(GIT_TAG) $(IMAGE_REPO) $(IMAGE_TAG) + build/create_manifests.sh $(REPO) $(OUTPUT_DIR) $(ARTIFACTS_PATH) $(GIT_TAG) $(IMAGE_REPO) $(IMAGE_TAG) $(GOLANG_VERSION) $(FIX_LICENSES_GO_JSON_TARGET): | $(GO_MOD_DOWNLOAD_TARGETS) # The ajeddeloh/go-json dependency github repo does not have a license, however it redirects to coreos/go-json repo diff --git a/projects/kubernetes-sigs/cluster-api/build/create_manifests.sh b/projects/kubernetes-sigs/cluster-api/build/create_manifests.sh index db653fa818..0c1f890712 100755 --- a/projects/kubernetes-sigs/cluster-api/build/create_manifests.sh +++ b/projects/kubernetes-sigs/cluster-api/build/create_manifests.sh @@ -23,10 +23,13 @@ ARTIFACTS_PATH="$3" TAG="$4" IMAGE_REPO="$5" IMAGE_TAG="$6" +GOLANG_VERSION="$6" MAKE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)" source "${MAKE_ROOT}/../../../build/lib/common.sh" +build::common::use_go_version ${GOLANG_VERSION} + cd $REPO CAPI_REGISTRY_PREFIX="${IMAGE_REPO}/kubernetes-sigs/cluster-api"