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

[CI] Merge self-upgrade-main into main

Author: cert-manager-prow[bot]

.github/workflows/renovate.yaml

@@ -27,7 +27,7 @@ jobs:
           exit 1
 
       - name: Octo STS Token Exchange
-        uses: octo-sts/action@e480437973a6f6ac2e9caa40ecabedc870d76395 # main
+        uses: octo-sts/action@e480437973a6f6ac2e9caa40ecabedc870d76395 # v1.0.1
         id: octo-sts
         with:
           scope: 'cert-manager/csi-driver-spiffe'

klone.yaml

@@ -10,70 +10,70 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 19c94b4b2606b35e5eee494d2baad09b0725334e
+      repo_hash: a6ac1de6fe76226124ca2e108bff907b91fbfc1e
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 19c94b4b2606b35e5eee494d2baad09b0725334e
+      repo_hash: a6ac1de6fe76226124ca2e108bff907b91fbfc1e
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 19c94b4b2606b35e5eee494d2baad09b0725334e
+      repo_hash: a6ac1de6fe76226124ca2e108bff907b91fbfc1e
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 19c94b4b2606b35e5eee494d2baad09b0725334e
+      repo_hash: a6ac1de6fe76226124ca2e108bff907b91fbfc1e
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 19c94b4b2606b35e5eee494d2baad09b0725334e
+      repo_hash: a6ac1de6fe76226124ca2e108bff907b91fbfc1e
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 19c94b4b2606b35e5eee494d2baad09b0725334e
+      repo_hash: a6ac1de6fe76226124ca2e108bff907b91fbfc1e
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 19c94b4b2606b35e5eee494d2baad09b0725334e
+      repo_hash: a6ac1de6fe76226124ca2e108bff907b91fbfc1e
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 19c94b4b2606b35e5eee494d2baad09b0725334e
+      repo_hash: a6ac1de6fe76226124ca2e108bff907b91fbfc1e
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 19c94b4b2606b35e5eee494d2baad09b0725334e
+      repo_hash: a6ac1de6fe76226124ca2e108bff907b91fbfc1e
       repo_path: modules/klone
     - folder_name: licenses
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 19c94b4b2606b35e5eee494d2baad09b0725334e
+      repo_hash: a6ac1de6fe76226124ca2e108bff907b91fbfc1e
       repo_path: modules/licenses
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 19c94b4b2606b35e5eee494d2baad09b0725334e
+      repo_hash: a6ac1de6fe76226124ca2e108bff907b91fbfc1e
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 19c94b4b2606b35e5eee494d2baad09b0725334e
+      repo_hash: a6ac1de6fe76226124ca2e108bff907b91fbfc1e
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 19c94b4b2606b35e5eee494d2baad09b0725334e
+      repo_hash: a6ac1de6fe76226124ca2e108bff907b91fbfc1e
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 19c94b4b2606b35e5eee494d2baad09b0725334e
+      repo_hash: a6ac1de6fe76226124ca2e108bff907b91fbfc1e
       repo_path: modules/tools

make/_shared/repository-base/01_mod.mk

@@ -16,7 +16,8 @@ ifndef repo_name
 $(error repo_name is not set)
 endif
 
-repository_base_dir := $(dir $(lastword $(MAKEFILE_LIST)))/base/
+_repository_base_module_dir := $(dir $(lastword $(MAKEFILE_LIST)))
+repository_base_dir := $(_repository_base_module_dir)base/
 
 .PHONY: generate-base
 ## Generate base files in the repository
@@ -27,5 +28,9 @@ generate-base:
 		find . -type f | while read file; do \
 			sed "s|{{REPLACE:GH-REPOSITORY}}|$(repo_name:github.com/%=%)|g" "$$file" > "$(CURDIR)/$$file"; \
 		done
+	if [ ! -e ./.github/renovate.json5 ]; then \
+		mkdir -p ./.github; \
+		cp $(_repository_base_module_dir)/renovate-bootstrap-config.json5 ./.github/renovate.json5; \
+	fi
 
 shared_generate_targets += generate-base

make/_shared/repository-base/base/.github/renovate.json5

@@ -27,7 +27,7 @@ jobs:
           exit 1
 
       - name: Octo STS Token Exchange
-        uses: octo-sts/action@e480437973a6f6ac2e9caa40ecabedc870d76395 # main
+        uses: octo-sts/action@e480437973a6f6ac2e9caa40ecabedc870d76395 # v1.0.1
         id: octo-sts
         with:
           scope: '{{REPLACE:GH-REPOSITORY}}'

make/_shared/repository-base/base/.github/workflows/renovate.yaml

@@ -0,0 +1,6 @@
+{
+  $schema: 'https://docs.renovatebot.com/renovate-schema.json',
+  extends: [
+    'github>cert-manager/renovate-config:default.json5',
+  ],
+}