Merge pull request #338 from cert-manager/self-upgrade

[CI] Merge self-upgrade into main
cert-manager · Jan 11, 2024 · f1bf843 · f1bf843
2 parents 3781027 + 01219c0
commit f1bf843
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/klone.yaml b/klone.yaml
@@ -10,60 +10,60 @@ targets:
     - folder_name: api-docs
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6dd5775328055379827511b82508ee6847db60e0
+      repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
       repo_path: modules/api-docs
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6dd5775328055379827511b82508ee6847db60e0
+      repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6dd5775328055379827511b82508ee6847db60e0
+      repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6dd5775328055379827511b82508ee6847db60e0
+      repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6dd5775328055379827511b82508ee6847db60e0
+      repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
       repo_path: modules/generate-verify
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6dd5775328055379827511b82508ee6847db60e0
+      repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6dd5775328055379827511b82508ee6847db60e0
+      repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6dd5775328055379827511b82508ee6847db60e0
+      repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6dd5775328055379827511b82508ee6847db60e0
+      repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
       repo_path: modules/klone
     - folder_name: oci-image
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6dd5775328055379827511b82508ee6847db60e0
+      repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
       repo_path: modules/oci-image
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6dd5775328055379827511b82508ee6847db60e0
+      repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6dd5775328055379827511b82508ee6847db60e0
+      repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
       repo_path: modules/tools
diff --git a/make/_shared/oci-image/01_mod.mk b/make/_shared/oci-image/01_mod.mk
@@ -19,6 +19,10 @@ oci_platforms := all
 # To get latest SHA run crane digest gcr.io/distroless/static-debian12:nonroot
 base_image_static := gcr.io/distroless/static-debian12@sha256:39ae7f0201fee13b777a3e4a5a9326a8889269172c8b4f4289d9f19c831f45f4
 
+# Use custom apko-built image as minimal base image to package the manager binary
+# To get latest SHA run crane digest quay.io/jetstack/base-static-csi:latest
+base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:f8463a8a6d2265a15a982cf3d6cb08b685ab7220828885fbbb528135baa0a951
+
 ifndef bin_dir
 $(error bin_dir is not set)
 endif
@@ -38,6 +42,8 @@ $(call fatal_if_undefined,oci_$1_image_name_development)
 
 ifeq ($(oci_$1_base_image_flavor),static)
     oci_$1_base_image := $(base_image_static)
+else ifeq ($(oci_$1_base_image_flavor),csi-static)
+    oci_$1_base_image := $(base_image_csi-static)
 else
     $$(error oci_$1_base_image_flavor has unknown value "$(oci_$1_base_image_flavor)")
 endif