Use 1.20 in CAPI create manifests

aws · Sep 6, 2023 · 911c767 · 911c767
1 parent 2d6a095
commit 911c767
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -23,10 +23,13 @@ ARTIFACTS_PATH="$3"
 TAG="$4"
 IMAGE_REPO="$5"
 IMAGE_TAG="$6"
+GOLANG_VERSION="$7"
 
 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"