From bbb8642f26ffc7212cf9c4aabe34667a150acd61 Mon Sep 17 00:00:00 2001
From: JJGadgets <git@jjgadgets.tech>
Date: Sun, 28 Jan 2024 09:13:11 +0800
Subject: [PATCH] fix(renovate): rework automerge, tmp rm OSV, rm k8s job

---
 .renovate/groups.json5                        | 19 ++++++++++++++++++-
 .renovate/security.json5                      |  2 +-
 .../kube}/deploy/apps/renovate/app/hr.yaml    |  0
 .../deploy/apps/renovate/app/secrets.yaml     |  0
 .../kube}/deploy/apps/renovate/ks.yaml        |  0
 .../deploy/apps/renovate/kustomization.yaml   |  0
 .../kube}/deploy/apps/renovate/ns.yaml        |  0
 7 files changed, 19 insertions(+), 2 deletions(-)
 rename {kube => archive/kube}/deploy/apps/renovate/app/hr.yaml (100%)
 rename {kube => archive/kube}/deploy/apps/renovate/app/secrets.yaml (100%)
 rename {kube => archive/kube}/deploy/apps/renovate/ks.yaml (100%)
 rename {kube => archive/kube}/deploy/apps/renovate/kustomization.yaml (100%)
 rename {kube => archive/kube}/deploy/apps/renovate/ns.yaml (100%)

diff --git a/.renovate/groups.json5 b/.renovate/groups.json5
index 1ac4a66a..3d3c0be0 100644
--- a/.renovate/groups.json5
+++ b/.renovate/groups.json5
@@ -45,7 +45,7 @@
       "description": "Auto merge Github Actions",
       "matchManagers": ["github-actions"],
       "automerge": true,
-      "automergeType": "branch",
+      "automergeType": "pr",
       "ignoreTests": true,
       "matchUpdateTypes": ["minor", "patch", "digest"]
     },
@@ -57,6 +57,23 @@
       "separateMinorPatch": true,
       "labels": ["kube-deploy-core"]
     },
+    {
+      "description": "Auto merge all Renovate versions",
+      "matchPackagePatterns": ["renovate"],
+      "matchUpdateTypes": ["major", "minor", "patch", "digest"],
+      "automerge": true,
+      "automergeType": "branch",
+      "ignoreTests": true,
+      "labels": ["renovate-itself"]
+    },
+    {
+      "description": "Auto merge my own images with release dates as versions, these are images I couldn't think of a better way to do versioning because of too many moving parts",
+      "matchPackagePatterns": ["jjgadgets/k8s-crd-extractor"],
+      "matchUpdateTypes": ["major", "minor", "patch", "digest"],
+      "automerge": true,
+      "automergeType": "branch",
+      "labels": ["app-template"]
+    },
     {
       "description": "Auto merge apps in path ./kube/deploy/apps (these apps don't affect the entire Kubernetes cluster)",
       // "matchDatasources": ["docker"],
diff --git a/.renovate/security.json5 b/.renovate/security.json5
index 8ac08541..a49cbcc6 100644
--- a/.renovate/security.json5
+++ b/.renovate/security.json5
@@ -7,6 +7,6 @@
     "schedule": ["at any time"],
     "assigneesFromCodeOwners": true
   },
-  "osvVulnerabilityAlerts": true,
+  #"osvVulnerabilityAlerts": true,
   "dependencyDashboardOSVVulnerabilitySummary": "all"
 }
diff --git a/kube/deploy/apps/renovate/app/hr.yaml b/archive/kube/deploy/apps/renovate/app/hr.yaml
similarity index 100%
rename from kube/deploy/apps/renovate/app/hr.yaml
rename to archive/kube/deploy/apps/renovate/app/hr.yaml
diff --git a/kube/deploy/apps/renovate/app/secrets.yaml b/archive/kube/deploy/apps/renovate/app/secrets.yaml
similarity index 100%
rename from kube/deploy/apps/renovate/app/secrets.yaml
rename to archive/kube/deploy/apps/renovate/app/secrets.yaml
diff --git a/kube/deploy/apps/renovate/ks.yaml b/archive/kube/deploy/apps/renovate/ks.yaml
similarity index 100%
rename from kube/deploy/apps/renovate/ks.yaml
rename to archive/kube/deploy/apps/renovate/ks.yaml
diff --git a/kube/deploy/apps/renovate/kustomization.yaml b/archive/kube/deploy/apps/renovate/kustomization.yaml
similarity index 100%
rename from kube/deploy/apps/renovate/kustomization.yaml
rename to archive/kube/deploy/apps/renovate/kustomization.yaml
diff --git a/kube/deploy/apps/renovate/ns.yaml b/archive/kube/deploy/apps/renovate/ns.yaml
similarity index 100%
rename from kube/deploy/apps/renovate/ns.yaml
rename to archive/kube/deploy/apps/renovate/ns.yaml