add some prefixes to branches

.github/renovate/kinds/astro.json5

@@ -5,6 +5,7 @@
       "(^|/)website/.+/astro\\.config\\.(mjs|js|ts)$", // Matches Astro config files in /website and any subdirectory
       "(^|/)website/.+/package\\.json$" // Matches package.json files in /website and any subdirectory
     ],
+    "branchPrefix": "astro-",
     "enabled": true, // Enable updates for website dependencies
     "updateTypes": ["major", "minor", "patch"], // Allow updates for all version types
     "ignore": [

.github/renovate/kinds/docker.json5

@@ -12,6 +12,7 @@
       "(^|/)repositories/.+\\.ya?ml(?:\\.j2)?$",
       "(^|/)clustertool/embeded/.+\\.ya?ml(?:\\.j2)?$"
     ],
+    "branchPrefix": "docker-",
     "enabled": true, // Enable Docker image updates
     "updateTypes": ["major", "minor", "patch", "digest"], // Allow updates for all version types
     "semanticCommitScope": "container",

.github/renovate/kinds/flux.json5

@@ -11,7 +11,7 @@
     "updateTypes": ["major", "minor", "patch"], // Allow updates for all version types
     "semanticCommitScope": "Flux Objects"
   },
-  
+  "branchPrefix": "flux-",
   "ignore": [
     // Add any global ignores here
   ],

.github/renovate/kinds/githubactions.json5

@@ -13,6 +13,7 @@
       // Specify any actions or workflows to ignore
     ]
   },
+  "branchPrefix": "githubactions-",
   "ignoreDeps": [
     // List any dependencies to ignore globally if needed
   ],

.github/renovate/kinds/go.json5

@@ -13,6 +13,7 @@
     ],
     "semanticCommitScope": "go"
   },
+  "branchPrefix": "go-",
   "ignoreDeps": [
     // List any dependencies to ignore globally if needed
   ],

.github/renovate/kinds/helm-values.json5

@@ -12,6 +12,7 @@
     "updateTypes": ["major", "minor", "patch", "digest"], // Allow updates for all version types
     "semanticCommitScope": "container"
   },
+  "branchPrefix": "helm-values-",
   "ignore": [
     // Add any global ignores here if needed
   ],

.github/renovate/kinds/helm.json5

@@ -12,5 +12,6 @@
   "ignore": [
     // Add any global ignores here if needed
   ],
+  "branchPrefix": "helm-",
   "requiredStatusChecks": null
 }

.github/renovate/special/automerge.json5

@@ -8,6 +8,16 @@
       "automergeType": "pr",
       "matchUpdateTypes": ["digest", "patch", "minor"],
       "matchPackagePatterns": ["ghcr.io/bjw-s", "ghcr.io/onedr0p", "tccr.io/tccr/.*", "tccr.io/tccrbase/.*" ],
+      "branchPrefix": "docker-automerge-"
+    },
+    {
+      "description": ["Auto-merge helm-values digests, patch and minor updates for trusted containers"],
+      "matchDatasources": ["helm-values"],
+      "automerge": true,
+      "automergeType": "pr",
+      "matchUpdateTypes": ["digest", "patch", "minor"],
+      "matchPackagePatterns": ["ghcr.io/bjw-s", "ghcr.io/onedr0p", "tccr.io/tccr/.*", "tccr.io/tccrbase/.*" ],
+      "branchPrefix": "helm-values-automerge-"
     },
 {
   "description": ["Auto-merge chart updates, patch, and minor updates for OCI Helm charts from tccr.io/truecharts"],
@@ -15,7 +25,8 @@
   "automerge": true,
   "automergeType": "pr",
   "matchUpdateTypes": ["digest", "patch", "minor"], // Specify the types of updates to automate
-  "matchPackagePatterns": ["tccr.io/truecharts/.*"] // Matches all OCI Helm charts under tccr.io/truecharts
+  "matchPackagePatterns": ["tccr.io/truecharts/.*"], // Matches all OCI Helm charts under tccr.io/truecharts
+  "branchPrefix": "helm-automerge-"
 },
     {
       "description": ["Auto-merge GitHub Actions for minor and patch"],
@@ -23,7 +34,8 @@
       "matchDatasources": ["github-tags"],
       "automerge": true,
       "automergeType": "pr",
-      "matchUpdateTypes": ["minor", "patch"]
+      "matchUpdateTypes": ["minor", "patch"],
+      "branchPrefix": "github-automerge-"
     }
   ]
 }

.github/renovate/special/customClusterManagers.json5

@@ -9,7 +9,8 @@
         "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( repository=(?<registryUrl>\\S+))?\\n.+: (&\\S+\\s)?(?<currentValue>\\S+)",
         "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)\\n.+/(?<currentValue>(v|\\d)[^/]+)"
       ],
-      "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}github-releases{{/if}}"
+      "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}github-releases{{/if}}",
+      "branchPrefix": "regex-"
     },
     {
       "customType": "regex",
@@ -17,7 +18,8 @@
       "fileMatch": ["(^|/)clusters/.+\\.ya?ml(?:\\.j2)?$"],
       "matchStrings": ["imageName: (?<depName>\\S+):(?<currentValue>.*\\-.*)"],
       "datasourceTemplate": "docker",
-      "versioningTemplate": "redhat"
+      "versioningTemplate": "redhat",
+      "branchPrefix": "regex-"
     }
   ]
 }