From b3992dc9c0576f84ca6d929c20d967370fea63c6 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten <info@kjeldschouten.nl>
Date: Thu, 17 Oct 2024 12:39:28 +0200
Subject: [PATCH] more renovate polish

---
 .github/renovate/kinds/astro.json5         |  5 +++--
 .github/renovate/kinds/docker.json5        |  6 +++---
 .github/renovate/kinds/flux.json5          |  5 +++--
 .github/renovate/kinds/githubactions.json5 |  5 +++--
 .github/renovate/kinds/go.json5            |  5 +++--
 .github/renovate/kinds/helm-values.json5   | 23 +++++++++++-----------
 .github/renovate/main.json5                |  3 ++-
 7 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/.github/renovate/kinds/astro.json5 b/.github/renovate/kinds/astro.json5
index 59c2b43388d..6a963e4f8b4 100644
--- a/.github/renovate/kinds/astro.json5
+++ b/.github/renovate/kinds/astro.json5
@@ -11,10 +11,11 @@
     "ignore": [
       // Specify any dependencies or versions to ignore
     ],
-    "semanticCommitScope": "website"
-  },
+    "semanticCommitScope": "website",
   "ignoreDeps": [
     // List any dependencies to ignore globally if needed
   ],
   "requiredStatusChecks": null
+  },
+
 }
diff --git a/.github/renovate/kinds/docker.json5 b/.github/renovate/kinds/docker.json5
index ecab69864ff..55399cdd5f4 100644
--- a/.github/renovate/kinds/docker.json5
+++ b/.github/renovate/kinds/docker.json5
@@ -8,9 +8,9 @@
       "docker-compose\\.ya?ml\\.j2$", // Matches Jinja2 templated docker-compose files
       "\\.github/workflows/.*\\.ya?ml$", // Matches all workflow YAML files
       "\\.github/workflows/.*\\.ya?ml\\.j2$", // Matches Jinja2 templated workflow files
-      "(^|/)clusters/.+\\.ya?ml(?:\\.j2)?$",
-      "(^|/)repositories/.+\\.ya?ml(?:\\.j2)?$",
-      "(^|/)clustertool/embeded/.+\\.ya?ml(?:\\.j2)?$"
+      // "(^|/)clusters/.+\\.ya?ml(?:\\.j2)?$",
+      // "(^|/)repositories/.+\\.ya?ml(?:\\.j2)?$",
+      // "(^|/)clustertool/embeded/.+\\.ya?ml(?:\\.j2)?$"
     ],
     "branchPrefix": "docker-",
     "enabled": true, // Enable Docker image updates
diff --git a/.github/renovate/kinds/flux.json5 b/.github/renovate/kinds/flux.json5
index bbfe76210cb..8ddfc175946 100644
--- a/.github/renovate/kinds/flux.json5
+++ b/.github/renovate/kinds/flux.json5
@@ -10,11 +10,12 @@
     "enabled": true, // Enable Flux updates
     "updateTypes": ["major", "minor", "patch"], // Allow updates for all version types
     "semanticCommitScope": "Flux Objects",
-    "pinDigests": false // Set to false to not pin digest references
-  },
+    "pinDigests": false, // Set to false to not pin digest references
   "branchPrefix": "flux-",
   "ignore": [
     // Add any global ignores here
   ],
   "requiredStatusChecks": null,
+  },
+
 }
diff --git a/.github/renovate/kinds/githubactions.json5 b/.github/renovate/kinds/githubactions.json5
index 6514ebf29db..a2ee3c3f111 100644
--- a/.github/renovate/kinds/githubactions.json5
+++ b/.github/renovate/kinds/githubactions.json5
@@ -11,11 +11,12 @@
     "semanticCommitScope": "github-action",
     "ignore": [
       // Specify any actions or workflows to ignore
-    ]
-  },
+    ],
   "branchPrefix": "githubactions-",
   "ignoreDeps": [
     // List any dependencies to ignore globally if needed
   ],
   "requiredStatusChecks": null,
+  },
+
 }
diff --git a/.github/renovate/kinds/go.json5 b/.github/renovate/kinds/go.json5
index bb74faea7cf..047d026d205 100644
--- a/.github/renovate/kinds/go.json5
+++ b/.github/renovate/kinds/go.json5
@@ -11,8 +11,7 @@
     "ignore": [
       // Specify any modules or versions to ignore
     ],
-    "semanticCommitScope": "go"
-  },
+    "semanticCommitScope": "go",
   "branchPrefix": "go-",
   "ignoreDeps": [
     // List any dependencies to ignore globally if needed
@@ -25,4 +24,6 @@
     }
   ],
   "requiredStatusChecks": null,
+  },
+
 }
diff --git a/.github/renovate/kinds/helm-values.json5 b/.github/renovate/kinds/helm-values.json5
index 7d0dcef0392..d2e5f18de55 100644
--- a/.github/renovate/kinds/helm-values.json5
+++ b/.github/renovate/kinds/helm-values.json5
@@ -1,21 +1,20 @@
 {
-      "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
 
   "helm-values": {
     "fileMatch": [
-      "(^|/)clusters/.+\\.ya?ml(?:\\.j2)?$",
-      "(^|/)kubernetes/.+\\.ya?ml(?:\\.j2)?$",
-      "(^|/)repositories/.+\\.ya?ml(?:\\.j2)?$",
-      "(^|/)charts/.+\\.ya?ml(?:\\.j2)?$",
+      "(^|/)clusters/.+\\-values\\.ya?ml(?:\\.j2)?$",      // Match *-values.yaml, *-values.yml, or *-values.yaml.j2 in clusters
+      "(^|/)kubernetes/.+\\-values\\.ya?ml(?:\\.j2)?$",    // Match *-values.yaml, *-values.yml, or *-values.yaml.j2 in kubernetes
+      "(^|/)repositories/.+\\-values\\.ya?ml(?:\\.j2)?$",  // Match *-values.yaml, *-values.yml, or *-values.yaml.j2 in repositories
+      "(^|/)charts/.+\\-values\\.ya?ml(?:\\.j2)?$"         // Match *-values.yaml, *-values.yml, or *-values.yaml.j2 in charts
     ],
     "enabled": true, // Enable image reference updates in values.yaml
     "updateTypes": ["major", "minor", "patch", "digest", "pin"], // Allow updates for all version types
     "semanticCommitScope": "container",
-    "bumpVersion": true
-  },
-  "branchPrefix": "helm-values-",
-  "ignore": [
-    // Add any global ignores here if needed
-  ],
-  "requiredStatusChecks": null,
+    "bumpVersion": true,
+    "branchPrefix": "helm-values-",      // Moved to helm-values scope
+    "ignore": [
+    ],
+    "requiredStatusChecks": null        // Moved to helm-values scope
+  }
 }
diff --git a/.github/renovate/main.json5 b/.github/renovate/main.json5
index a7b49a4b10b..26759518e54 100644
--- a/.github/renovate/main.json5
+++ b/.github/renovate/main.json5
@@ -50,6 +50,7 @@
     "**/misc/**",
     "**/archive/**",
     "**/resources/**",
-    "**common/test-chart/tests/**"
+    "**common/test-chart/tests/**",
+    "charts/library/common/test-chart/tests/**"
     ],
 }