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

[CI] Merge self-upgrade-main into main

Author: cert-manager-prow[bot]

.github/dependabot.yaml

@@ -15,3 +15,8 @@ updates:
   groups:
     all-gh-actions:
       patterns: ["*"]
+  labels:
+    - dependencies
+    - kind/cleanup
+    - release-note-none
+    - ok-to-test

klone.yaml

@@ -9,35 +9,35 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cd6cfc077a1d1655dff64675ae7e0d209c8ba901
+      repo_hash: 228dee9049e9b52dac451c913164892f575e0b07
       repo_path: modules/boilerplate
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cd6cfc077a1d1655dff64675ae7e0d209c8ba901
+      repo_hash: 228dee9049e9b52dac451c913164892f575e0b07
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cd6cfc077a1d1655dff64675ae7e0d209c8ba901
+      repo_hash: 228dee9049e9b52dac451c913164892f575e0b07
       repo_path: modules/go
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cd6cfc077a1d1655dff64675ae7e0d209c8ba901
+      repo_hash: 228dee9049e9b52dac451c913164892f575e0b07
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cd6cfc077a1d1655dff64675ae7e0d209c8ba901
+      repo_hash: 228dee9049e9b52dac451c913164892f575e0b07
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cd6cfc077a1d1655dff64675ae7e0d209c8ba901
+      repo_hash: 228dee9049e9b52dac451c913164892f575e0b07
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cd6cfc077a1d1655dff64675ae7e0d209c8ba901
+      repo_hash: 228dee9049e9b52dac451c913164892f575e0b07
       repo_path: modules/tools

make/_shared/go/01_mod.mk

@@ -55,6 +55,7 @@ generate-go-mod-tidy: | $(NEEDS_GO)
 				echo "Running 'go mod tidy' in directory '$${target}'"; \
 				pushd "$${target}" >/dev/null; \
 				$(GO) mod tidy || exit; \
+				$(GO) get toolchain@none || exit; \
 				popd >/dev/null; \
 				echo ""; \
 			done

make/_shared/repository-base/base-dependabot/.github/dependabot.yaml

@@ -15,3 +15,8 @@ updates:
   groups:
     all-gh-actions:
       patterns: ["*"]
+  labels:
+    - dependencies
+    - kind/cleanup
+    - release-note-none
+    - ok-to-test