Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-0.17] fixes cilium and image-builder builds #2534

Merged
merged 1 commit into from
Oct 11, 2023
Merged

[release-0.17] fixes cilium and image-builder builds #2534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion projects/cilium/cilium/build/create_manifests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions projects/kubernetes-sigs/image-builder/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,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
Expand Down
2 changes: 2 additions & 0 deletions projects/kubernetes-sigs/image-builder/ansible.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[galaxy]
server = https://old-galaxy.ansible.com/