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

[CI] Self-upgrade merging self-upgrade-main into main
cert-manager · Dec 18, 2024 · 64b34a5 · 64b34a5
2 parents 0034b35 + 1008b67
commit 64b34a5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/.github/workflows/make-self-upgrade.yaml b/.github/workflows/make-self-upgrade.yaml
@@ -33,6 +33,10 @@ jobs:
           exit 1
 
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        # Adding `fetch-depth: 0` makes sure tags are also fetched. We need
+        # the tags so `git describe` returns a valid version.
+        # see https://github.com/actions/checkout/issues/701 for extra info about this option
+        with: { fetch-depth: 0 }
 
       - id: go-version
         run: |

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: 124f5ace44727ff538132ca3be21259e1d48c3c3
+      repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
+      repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
+      repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
+      repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
+      repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: fbd26411777b12c2574d05f146cee617c6c50b63
+      repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
+      repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: ff78fe10f134a8aeca523a63e8ee51018b7ee248
+      repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
+      repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
+      repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
+      repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
+      repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: ff78fe10f134a8aeca523a63e8ee51018b7ee248
+      repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
       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:6dd468efaceafb7d2b5ba437bb81500636237bac747fd751b75b0cb375600fae
+base_image_static := quay.io/jetstack/base-static@sha256:feae5ef1171e639476e4134057228e0355837642993adfcb2b5c77fdc9c51d7d
 
 # 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:b88c19bfe28a83799e08817ffb7205a3aac1b99ad07739a5433a7fb554b4d223
+base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:9e92ef3912568138f865b2268d3f13285736fb55856342cd32456ae2e284658b
 
 # Utility functions
 fatal_if_undefined = $(if $(findstring undefined,$(origin $1)),$(error $1 is not set))

diff --git a/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml b/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml
@@ -33,6 +33,10 @@ jobs:
           exit 1
 
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        # Adding `fetch-depth: 0` makes sure tags are also fetched. We need
+        # the tags so `git describe` returns a valid version.
+        # see https://github.com/actions/checkout/issues/701 for extra info about this option
+        with: { fetch-depth: 0 }
 
       - id: go-version
         run: |