From cd193dfa0a4e59114cde04b0893f580d784e7d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Martins?= <andre@cilium.io>
Date: Sun, 16 Jun 2024 16:50:48 +0200
Subject: [PATCH] test auto-merge
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: André Martins <andre@cilium.io>
---
 .github/renovate.json5 | 31 +++++++++++++++++++++++++++++++
 Makefile               |  5 ++---
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 8eb1c2bd177564..635c4cd7358a61 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -84,6 +84,37 @@
     "^make manifests$"
   ],
   "packageRules": [
+    {
+      "matchPackageNames": [
+        "go", // golang version directive upgrade in go.mod
+      ],
+      "matchPackagePrefixes": [
+        "docker.io/library/", // official Docker images
+        "github.com/golang/", // Golang official org
+        "golang.org/x/", // Golang official experimental org
+        "google.golang.org/", // Google official repo for api/genproto/grpc/protobuf
+        "github.com/google/", // Google official github org
+        "k8s.io/", // Kubernetes official repo
+        "sigs.k8s.io/", // Kubernetes official SIG repo
+        "quay.io/lvh-images/", // LVH images
+        "quay.io/cilium/", // LVH images
+        "github.com/cilium/", // Any Cilium dependency
+        "renovatebot/renovate", // Renovate bot
+      ],
+      "matchUpdateTypes": [
+        "patch",
+        "pin",
+        "pinDigest",
+        "digest",
+        "lockFileMaintenance",
+        "rollback",
+        "bump",
+        "replacement"
+      ],
+      "automerge": true,
+      "automergeType": "pr-comment",
+      "automergeComment": "/test"
+    },
     {
       // Try to group all updates for all dependencies in a single PR. More
       // specific packageRules are followed by this one.
diff --git a/Makefile b/Makefile
index c73b9e9af86c6a..60da493dce754e 100644
--- a/Makefile
+++ b/Makefile
@@ -263,10 +263,9 @@ manifests: ## Generate K8s manifests e.g. CRD, RBAC etc.
 	$(eval TMPDIR := $(shell mktemp -d -t cilium.tmpXXXXXXXX))
 	$(QUIET)$(GO) run sigs.k8s.io/controller-tools/cmd/controller-gen $(CRD_OPTIONS) paths=$(CRD_PATHS) output:crd:artifacts:config="$(TMPDIR)"
 	$(QUIET)$(GO) run ./tools/crdcheck "$(TMPDIR)"
-
-	# Clean up old CRD state and start with a blank state.
+	@
 	for path in $(CRDS_CILIUM_PATHS); do rm -rf $${path} && mkdir $${path}; done
-
+	@
 	for file in $(CRDS_CILIUM_V2); do mv ${TMPDIR}/cilium.io_$${file}.yaml ./pkg/k8s/apis/cilium.io/client/crds/v2/$${file}.yaml; done
 	for file in $(CRDS_CILIUM_V2ALPHA1); do mv ${TMPDIR}/cilium.io_$${file}.yaml ./pkg/k8s/apis/cilium.io/client/crds/v2alpha1/$${file}.yaml; done
 	rm -rf $(TMPDIR)