From 11ce045d31f8d40c977f622977dea72ba34fa4cb Mon Sep 17 00:00:00 2001
From: Tim Ramlot <42113979+inteon@users.noreply.github.com>
Date: Mon, 22 Apr 2024 16:52:50 +0200
Subject: [PATCH] upgrade repository-base Makefile module and disable
 dependabot

Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
---
 .github/workflows/make-self-upgrade.yaml      |  2 +-
 klone.yaml                                    |  2 +-
 make/00_mod.mk                                |  2 ++
 make/_shared/repository-base/01_mod.mk        | 10 ++++++++++
 .../base-dependabot/.github}/dependabot.yaml  |  0
 .../base/.github/dependabot.yaml              | 20 -------------------
 .../.github/workflows/make-self-upgrade.yaml  |  2 +-
 7 files changed, 15 insertions(+), 23 deletions(-)
 rename {.github => make/_shared/repository-base/base-dependabot/.github}/dependabot.yaml (100%)
 delete mode 100644 make/_shared/repository-base/base/.github/dependabot.yaml

diff --git a/.github/workflows/make-self-upgrade.yaml b/.github/workflows/make-self-upgrade.yaml
index fb7fe5bc3..93beedff0 100644
--- a/.github/workflows/make-self-upgrade.yaml
+++ b/.github/workflows/make-self-upgrade.yaml
@@ -9,7 +9,7 @@ on:
     - cron: '0 0 * * *'
 
 jobs:
-  build_images:
+  self_upgrade:
     runs-on: ubuntu-latest
 
     permissions:
diff --git a/klone.yaml b/klone.yaml
index badaa9de9..b10b0b22e 100644
--- a/klone.yaml
+++ b/klone.yaml
@@ -35,7 +35,7 @@ targets:
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 04f424fa90aa8ca570278cf0c07b18dea607b542
+      repo_hash: e9363accaaee20a995bbf8f1c9cba2ea77da8935
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
diff --git a/make/00_mod.mk b/make/00_mod.mk
index b5f380ef7..e9e382aae 100644
--- a/make/00_mod.mk
+++ b/make/00_mod.mk
@@ -56,3 +56,5 @@ GOLDFLAGS := -w -s \
     -X github.com/cert-manager/cert-manager/pkg/util.AppGitCommit=$(GITCOMMIT)
 
 golangci_lint_config := .golangci.yaml
+
+repository_base_no_dependabot := 1
diff --git a/make/_shared/repository-base/01_mod.mk b/make/_shared/repository-base/01_mod.mk
index 251ac88e5..aa6b7ee2e 100644
--- a/make/_shared/repository-base/01_mod.mk
+++ b/make/_shared/repository-base/01_mod.mk
@@ -13,11 +13,21 @@
 # limitations under the License.
 
 base_dir := $(dir $(lastword $(MAKEFILE_LIST)))/base/
+base_dependabot_dir := $(dir $(lastword $(MAKEFILE_LIST)))/base-dependabot/
 
+ifdef repository_base_no_dependabot
 .PHONY: generate-base
 ## Generate base files in the repository
 ## @category [shared] Generate/ Verify
 generate-base:
 	cp -r $(base_dir)/. ./
+else
+.PHONY: generate-base
+## Generate base files in the repository
+## @category [shared] Generate/ Verify
+generate-base:
+	cp -r $(base_dir)/. ./
+	cp -r $(base_dependabot_dir)/. ./
+endif
 
 shared_generate_targets += generate-base
diff --git a/.github/dependabot.yaml b/make/_shared/repository-base/base-dependabot/.github/dependabot.yaml
similarity index 100%
rename from .github/dependabot.yaml
rename to make/_shared/repository-base/base-dependabot/.github/dependabot.yaml
diff --git a/make/_shared/repository-base/base/.github/dependabot.yaml b/make/_shared/repository-base/base/.github/dependabot.yaml
deleted file mode 100644
index 81b929734..000000000
--- a/make/_shared/repository-base/base/.github/dependabot.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
-# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/dependabot.yaml instead.
-
-# Update Go dependencies and GitHub Actions dependencies daily.
-version: 2
-updates:
-- package-ecosystem: gomod
-  directory: /
-  schedule:
-    interval: daily
-  groups:
-    all:
-      patterns: ["*"]
-- package-ecosystem: github-actions
-  directory: /
-  schedule:
-    interval: daily
-  groups:
-    all:
-      patterns: ["*"]
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
index fb7fe5bc3..93beedff0 100644
--- a/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml
+++ b/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml
@@ -9,7 +9,7 @@ on:
     - cron: '0 0 * * *'
 
 jobs:
-  build_images:
+  self_upgrade:
     runs-on: ubuntu-latest
 
     permissions: