Merge pull request cert-manager#8873 from cert-manager/self-upgrade-master

[CI] Merge self-upgrade-master into master

Author: cert-manager-prow[bot]

.github/chainguard/make-self-upgrade.sts.yaml

@@ -10,46 +10,46 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 4f49b7302d97e29e21025ab05bb9cab95058b93d
+      repo_hash: c342f2a9e10ae77e0b97273e1ab9fc449a09ec38
       repo_path: modules/boilerplate
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 4f49b7302d97e29e21025ab05bb9cab95058b93d
+      repo_hash: c342f2a9e10ae77e0b97273e1ab9fc449a09ec38
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 4f49b7302d97e29e21025ab05bb9cab95058b93d
+      repo_hash: c342f2a9e10ae77e0b97273e1ab9fc449a09ec38
       repo_path: modules/go
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 4f49b7302d97e29e21025ab05bb9cab95058b93d
+      repo_hash: c342f2a9e10ae77e0b97273e1ab9fc449a09ec38
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 4f49b7302d97e29e21025ab05bb9cab95058b93d
+      repo_hash: c342f2a9e10ae77e0b97273e1ab9fc449a09ec38
       repo_path: modules/klone
     - folder_name: licenses
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 4f49b7302d97e29e21025ab05bb9cab95058b93d
+      repo_hash: c342f2a9e10ae77e0b97273e1ab9fc449a09ec38
       repo_path: modules/licenses
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 4f49b7302d97e29e21025ab05bb9cab95058b93d
+      repo_hash: c342f2a9e10ae77e0b97273e1ab9fc449a09ec38
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 4f49b7302d97e29e21025ab05bb9cab95058b93d
+      repo_hash: c342f2a9e10ae77e0b97273e1ab9fc449a09ec38
       repo_path: modules/tools
   make/_shared_new:
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 4f49b7302d97e29e21025ab05bb9cab95058b93d
+      repo_hash: c342f2a9e10ae77e0b97273e1ab9fc449a09ec38
       repo_path: modules/helm

.github/workflows/make-self-upgrade.yaml

@@ -24,13 +24,11 @@ repository_base_dir := $(_repository_base_module_dir)base/
 ## @category [shared] Generate/ Verify
 generate-base:
 	cp -r $(repository_base_dir)/. ./
-	cd $(repository_base_dir) && \
-		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
+	# TODO: Remove when all downstream repos are updated
+	rm -f ./.github/chainguard/make-self-upgrade.sts.yaml ./.github/workflows/make-self-upgrade.yaml
 
 shared_generate_targets += generate-base