fixes cilium and image-builder builds (#2533)

aws · Oct 11, 2023 · 5923677 · 5923677
1 parent a8d8e87
commit 5923677
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/projects/cilium/cilium/build/create_manifests.sh b/projects/cilium/cilium/build/create_manifests.sh
@@ -40,7 +40,11 @@ function build::cilium::manifests(){
     --set operator.image.tag=$TAG --set image.tag=$TAG --set image.repository="$REGISTRY/cilium" --set operator.image.repository="$REGISTRY/operator" > _output/manifests/cilium/${TAG}/cilium.yaml
 }
 
-build::install::helm
+# Temp: workaround issue in helm latest which breaks pulling from public ecr
+if ! command -v helm &> /dev/null; then
+  build::install::helm
+fi
+
 build::cilium::manifests
 
 cp -rf _output/manifests $ARTIFACTS_PATH
diff --git a/projects/kubernetes-sigs/image-builder/Makefile b/projects/kubernetes-sigs/image-builder/Makefile
@@ -206,6 +206,10 @@ SKIP_ON_RELEASE_BRANCH=$(if $(filter bottlerocket,$(IMAGE_OS)),false,true)
 
 include $(BASE_DIRECTORY)/Common.mk
 
+# TEMP: work around for using older ansible verison in builder-base
+ifeq ($(IS_ON_BUILDER_BASE),true)
+export ANSIBLE_CONFIG=$(MAKE_ROOT)/ansible.cfg
+endif
 
 export PATH:=$(MAKE_ROOT)/$(IMAGE_BUILDER_DIR)/.local/bin:$(PATH)
 export GOVC_INSECURE?=true

diff --git a/projects/kubernetes-sigs/image-builder/ansible.cfg b/projects/kubernetes-sigs/image-builder/ansible.cfg
@@ -0,0 +1,2 @@
+[galaxy]
+server = https://old-galaxy.ansible.com/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[galaxy]
		server = https://old-galaxy.ansible.com/