use a boolean flag to swap calico/base for the pinned version of ubi-…

…minimal
projectcalico · Jan 14, 2025 · b1bbb26 · b1bbb26
1 parent f5fab9b
commit b1bbb26
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.semaphore/semaphore.yml.d/blocks/20-typha.yml b/.semaphore/semaphore.yml.d/blocks/20-typha.yml
@@ -15,8 +15,8 @@
         commands:
           - ../.semaphore/run-and-monitor make-fv-ubi.log make clean image fv
         env_vars:
-          - name: CALICO_BASE
-            value: registry.access.redhat.com/ubi8/ubi-minimal
+          - name: USE_UBI_AS_CALICO_BASE
+            value: 1
     epilogue:
       always:
         commands:

diff --git a/lib.Makefile b/lib.Makefile
@@ -262,7 +262,11 @@ REPO_ROOT := $(shell git rev-parse --show-toplevel)
 CERTS_PATH := $(REPO_ROOT)/hack/test/certs
 
 # The image to use for building calico/base-dependent modules (e.g. apiserver, typha).
+ifdef USE_UBI_AS_CALICO_BASE
+CALICO_BASE ?= $(UBI_IMAGE)
+else
 CALICO_BASE ?= calico/base
+endif
 
 QEMU_IMAGE ?= calico/qemu-user-static:latest