Merge pull request #438 from cert-manager/self-upgrade-main

[CI] Merge self-upgrade-main into main
cert-manager · Nov 11, 2024 · de7560e · de7560e
2 parents eaa9a37 + 3cb5717
commit de7560e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/klone.yaml b/klone.yaml
@@ -10,65 +10,65 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
+      repo_hash: 425f6ff774986b635abc91450c85e14946b2ac8a
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
+      repo_hash: 425f6ff774986b635abc91450c85e14946b2ac8a
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
+      repo_hash: 425f6ff774986b635abc91450c85e14946b2ac8a
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
+      repo_hash: 425f6ff774986b635abc91450c85e14946b2ac8a
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
+      repo_hash: 425f6ff774986b635abc91450c85e14946b2ac8a
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
+      repo_hash: 425f6ff774986b635abc91450c85e14946b2ac8a
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
+      repo_hash: 425f6ff774986b635abc91450c85e14946b2ac8a
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
+      repo_hash: 425f6ff774986b635abc91450c85e14946b2ac8a
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
+      repo_hash: 425f6ff774986b635abc91450c85e14946b2ac8a
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
+      repo_hash: 425f6ff774986b635abc91450c85e14946b2ac8a
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
+      repo_hash: 425f6ff774986b635abc91450c85e14946b2ac8a
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
+      repo_hash: 425f6ff774986b635abc91450c85e14946b2ac8a
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
+      repo_hash: 425f6ff774986b635abc91450c85e14946b2ac8a
       repo_path: modules/tools
diff --git a/make/_shared/oci-build/00_mod.mk b/make/_shared/oci-build/00_mod.mk
@@ -16,11 +16,11 @@ oci_platforms ?= linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le
 
 # Use distroless as minimal base image to package the manager binary
 # To get latest SHA run "crane digest quay.io/jetstack/base-static:latest"
-base_image_static := quay.io/jetstack/base-static@sha256:fdf3bc64e067a3b62d4face7b1fd9e07a3ffad57a8974047cbc48acd4af8e611
+base_image_static := quay.io/jetstack/base-static@sha256:6dd468efaceafb7d2b5ba437bb81500636237bac747fd751b75b0cb375600fae
 
 # 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:9d633cc6f466f75a07bd9d376064bc80ea911553e16158fae7934e5731561231
+base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:b88c19bfe28a83799e08817ffb7205a3aac1b99ad07739a5433a7fb554b4d223
 
 # Utility functions
 fatal_if_undefined = $(if $(findstring undefined,$(origin $1)),$(error $1 is not set))