From 5923677a7971c0cc473d2ad6a210581e9ef71388 Mon Sep 17 00:00:00 2001 From: Jackson West Date: Tue, 10 Oct 2023 23:08:33 -0400 Subject: [PATCH] fixes cilium and image-builder builds (#2533) --- projects/cilium/cilium/build/create_manifests.sh | 6 +++++- projects/kubernetes-sigs/image-builder/Makefile | 4 ++++ projects/kubernetes-sigs/image-builder/ansible.cfg | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 projects/kubernetes-sigs/image-builder/ansible.cfg diff --git a/projects/cilium/cilium/build/create_manifests.sh b/projects/cilium/cilium/build/create_manifests.sh index b95bfc7aaa..a916ed7005 100755 --- 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 index 58bcc909be..3c63bb347e 100644 --- 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 new file mode 100644 index 0000000000..45aa543911 --- /dev/null +++ b/projects/kubernetes-sigs/image-builder/ansible.cfg @@ -0,0 +1,2 @@ +[galaxy] +server = https://old-galaxy.ansible.com/