feat: update renovate configuration

.github/renovate.json5

@@ -58,45 +58,37 @@
     ]
   },
   "regexManagers": [
-    // regexManager to read and process cert-manager CRD's
     {
-      "fileMatch": [
+      "description": "Process CRD dependencies",
-        "cluster/base-custom/crds/cert-manager/.+\\.yaml$"
+      "fileMatch": ["cluster/base-custom/crds/.+\\.ya?ml$"],
-      ],
       "matchStrings": [
-        "registryUrl=(?<registryUrl>.*?) chart=(?<depName>.*?)\n.*\\/(?<currentValue>.*?)\\/",
+        // GitRepository where 'Git release/tag' matches 'Helm' version
+        "registryUrl=(?<registryUrl>\\S+) chart=(?<depName>\\S+)\n.*?(?<currentValue>[^-\\s]*)\n",
+        // Kustomization where 'GitHub release artifact URL' matches 'Docker image' version
+        "datasource=(?<datasource>\\S+) image=(?<depName>\\S+)\n.*?-\\s(.*?)\/(?<currentValue>[^/]+)\/[^/]+\n"
       ],
-      "datasourceTemplate": "helm"
+      "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}helm{{/if}}"
     },
-    // regexManager to read and process External Snapshotter CRDs
     {
+      "description": "Process various dependencies",
       "fileMatch": [
-        "cluster/crds/external-snapshotter/.+\\.yaml$",
+        "ansible/.+\\.ya?ml$",
+        "cluster/.+\\.ya?ml$"
       ],
       "matchStrings": [
-        "datasource=(?<datasource>.*?)\n *url: https:\/\/github\\.com\/(?<depName>.*?)\\.git\n *ref:\n *tag: (?<currentValue>.*)\n"
+        "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( versioning=(?<versioning>\\S+))?\n.*?\"(?<currentValue>.*)\"\n"
       ],
-      "datasourceTemplate": "github-releases"
+      "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}github-releases{{/if}}",
+      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
     },
-    // regexManager to read and process kube-prometheus-stack CRDs
     {
-      "fileMatch": [
+      "description": "Process raw GitHub URLs",
-        "cluster/base-custom/crds/kube-prometheus-stack/.+\\.yaml$"
+      "fileMatch": ["cluster/.+\\.ya?ml$"],
-      ],
       "matchStrings": [
-        "registryUrl=(?<registryUrl>.*?)\n *tag: (?<depName>[a-zA-Z-]+)-(?<currentValue>.*)\n"
+        "https:\\/\\/raw.githubusercontent.com\\/(?<depName>[\\w\\d\\-_]+\\/[\\w\\d\\-_]+)\\/(?<currentValue>[\\w\\d\\.\\-_]+)\\/.*"
       ],
-      "datasourceTemplate": "helm"
+      "datasourceTemplate": "github-releases",
-    },
+      "versioningTemplate": "semver"
-    // regexManager to read and process Rook-Ceph CRD's
-    {
-      "fileMatch": [
-        "cluster/base-custom/crds/rook-ceph/.+\\.yaml$"
-      ],
-      "matchStrings": [
-        "registryUrl=(?<registryUrl>.*?) chart=(?<depName>.*?)\n *tag: (?<currentValue>.*)\n",
-      ],
-      "datasourceTemplate": "helm",
     }
   ],
   "packageRules": [
@@ -158,31 +150,6 @@
       ],
       "versioning": "regex:^version-(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)$",
       "matchPackageNames": ["ghcr.io/linuxserver/resilio-sync"]
-    },
-    // group packages
-    {
-      "matchDatasources": [
-        "helm",
-        "docker"
-      ],
-      "matchPackagePatterns": [
-        "^rook.ceph"
-      ],
-      "groupName": "rook-ceph-suite",
-      "additionalBranchPrefix": "",
-      "separateMinorPatch": true
-    },
-    {
-      "matchDatasources": [
-        "github-tags",
-        "docker"
-      ],
-      "matchPackagePatterns": [
-        "rancher/system-upgrade-controller"
-      ],
-      "groupName": "system-upgrade-controller-suite",
-      "additionalBranchPrefix": "",
-      "separateMinorPatch": true
     }
   ]
 }

.github/renovate/groups.json

@@ -0,0 +1,54 @@
+{
+    "packageRules": [
+      {
+        "description": "Cert-Manager image (for CRDs) and chart",
+        "groupName": "Cert-Manager",
+        "matchPackagePatterns": ["cert-manager"],
+        "matchDatasources": ["docker", "helm"],
+        "group": { "commitMessageTopic": "{{{groupName}}} group" },
+        "separateMinorPatch": true
+      },
+      {
+        "description": "External Snapshotter kustomization (for CRDs) and chart",
+        "groupName": "External Snapshotter",
+        "matchPackagePatterns": ["external-snapshotter", "snapshot-controller"],
+        "matchDatasources": ["docker", "github-tags"],
+        "group": { "commitMessageTopic": "{{{groupName}}} group" },
+        "separateMinorPatch": true
+      },
+      {
+        "description": "Node Feature Discovery kustomization (for CRDs) and chart",
+        "groupName": "Node Feature Discovery",
+        "matchPackagePatterns": ["node-feature-discovery"],
+        "matchDatasources": ["helm", "github-tags"],
+        "group": { "commitMessageTopic": "{{{groupName}}} group" },
+        "separateMinorPatch": true
+      },
+      {
+        "description": "Rook-Ceph image and chart",
+        "groupName": "Rook-Ceph",
+        "matchPackagePatterns": ["rook.ceph"],
+        "matchDatasources": ["docker", "helm"],
+        "group": { "commitMessageTopic": "{{{groupName}}} group" },
+        "separateMinorPatch": true
+      },
+      {
+        "description": "Thanos image and chart - mismatched versions",
+        "groupName": "Thanos",
+        "matchPackagePatterns": ["thanos"],
+        "matchDatasources": ["docker", "github-releases", "helm"],
+        "matchUpdateTypes": ["minor", "patch"],
+        "group": { "commitMessageTopic": "{{{groupName}}} group" },
+        "separateMinorPatch": false
+      },
+      {
+        "description": "Vector image and chart - mismatched versions",
+        "groupName": "Vector",
+        "matchPackagePatterns": ["vector"],
+        "matchDatasources": ["docker", "github-releases", "helm"],
+        "matchUpdateTypes": ["minor", "patch"],
+        "group": { "commitMessageTopic": "{{{groupName}}} group" },
+        "separateMinorPatch": false
+      }
+    ]
+  }

.github/renovate/semanticCommits.json

@@ -13,7 +13,7 @@
     },
     {
       "matchDatasources": ["docker"],
-        "matchUpdateTypes": ["patch"],
+      "matchUpdateTypes": ["digest", "patch"],
       "semanticCommitType": "fix",
       "semanticCommitScope": "container"
     },
@@ -70,9 +70,56 @@
       "semanticCommitType": "fix",
       "semanticCommitScope": "terraform"
     },
+    {
+      "matchDatasources": ["github-releases", "github-tags"],
+      "matchUpdateTypes": ["major"],
+      "commitMessagePrefix": "feat(github-release)!: "
+    },
+    {
+      "matchDatasources": ["github-releases", "github-tags"],
+      "matchUpdateTypes": ["minor"],
+      "semanticCommitType": "feat",
+      "semanticCommitScope": "github-release"
+    },
+    {
+      "matchDatasources": ["github-releases", "github-tags"],
+      "matchUpdateTypes": ["patch"],
+      "semanticCommitType": "fix",
+      "semanticCommitScope": "github-release"
+    },
     {
       "matchManagers": ["github-actions"],
-        "semanticCommitType": "ci"
+      "matchUpdateTypes": ["major"],
+      "commitMessagePrefix": "feat(github-action)!: "
+    },
+    {
+      "matchManagers": ["github-actions"],
+      "matchUpdateTypes": ["minor"],
+      "semanticCommitType": "feat",
+      "semanticCommitScope": "github-action"
+    },
+    {
+      "matchManagers": ["github-actions"],
+      "matchUpdateTypes": ["patch"],
+      "semanticCommitType": "fix",
+      "semanticCommitScope": "github-action"
+    },
+    {
+      "matchDatasources": ["pypi"],
+      "matchUpdateTypes": ["major"],
+      "commitMessagePrefix": "feat(pip)!: "
+    },
+    {
+      "matchDatasources": ["pypi"],
+      "matchUpdateTypes": ["minor"],
+      "semanticCommitType": "feat",
+      "semanticCommitScope": "pip"
+    },
+    {
+      "matchDatasources": ["pypi"],
+      "matchUpdateTypes": ["patch"],
+      "semanticCommitType": "fix",
+      "semanticCommitScope": "pip"
     }
   ]
 }

server/ansible/inventory/group_vars/all/k3s-settings.yml

@@ -5,6 +5,7 @@
 #
 
 # Use a specific version of k3s
+# renovate: datasource=github-releases depName=k3s-io/k3s
 k3s_release_version: "v1.21.3+k3s1"
 
 # Install using hard links rather than symbolic links.