From fa9851127c63511ec4bb9f5a1a94d449d32b8b8b Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Sat, 11 Jun 2022 17:25:47 -0400
Subject: [PATCH] fix: update renovate crd regexManager for more coverage

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/renovate.json5                        | 53 +++++++------------
 cluster/crds/cert-manager/kustomization.yaml  |  5 +-
 .../kustomization.yaml                        |  2 +-
 .../flux/flux-system/flux-installation.yaml   |  2 +-
 4 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 95626733..ca6113fa 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -5,21 +5,15 @@
   "dependencyDashboardTitle": "Renovate Dashboard",
   "suppressNotifications": ["prIgnoreNotification"],
   "rebaseWhen": "conflicted",
-  "schedule": [
-    "every weekend"
-  ],
+  "schedule": ["every weekend"],
   "pre-commit": {
     "enabled": true
   },
   "flux": {
-    "fileMatch": [
-      "cluster/.+\\.ya?ml$"
-    ]
+    "fileMatch": ["cluster/.+\\.ya?ml$"]
   },
   "helm-values": {
-    "fileMatch": [
-      "cluster/.+\\.ya?ml$"
-    ]
+    "fileMatch": ["cluster/.+\\.ya?ml$"]
   },
   "kubernetes": {
     "fileMatch": [
@@ -28,39 +22,28 @@
     ]
   },
   "regexManagers": [
-    // Read and process GitHub Releases
     {
+      "description": "Process CRD dependencies",
+      "fileMatch": ["cluster/crds/.+\\.ya?ml$"],
+      "matchStrings": [
+        // GitRepository and Flux Kustomization 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": "{{#if datasource}}{{{datasource}}}{{else}}helm{{/if}}"
+    },
+    {
+      "description": "Process various other dependencies",
       "fileMatch": [
-        "cluster/.+\\.ya?ml$",
-        "provision/ansible/.+\\.ya?ml$"
+        "provision/ansible/.+\\.ya?ml$",
+        "cluster/.+\\.ya?ml$"
       ],
       "matchStrings": [
-        "datasource=(?<datasource>.*?)( versioning=(?<versioning>.*?))?\n *url: https:\/\/github\\.com\/(?<depName>.*?)\\.git\n *ref:\n *tag: (?<currentValue>.*)\n",
-        "datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\n.*?_version: \"(?<currentValue>.*)\"\n",
-        "datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\n.*?_VERSION=\"(?<currentValue>.*)\"\n"
+        "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( versioning=(?<versioning>\\S+))?\n.*?\"(?<currentValue>.*)\"\n"
       ],
       "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}github-releases{{/if}}",
       "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
-    },
-    // regexManager to read and process cert-manager CRD's
-    {
-      "fileMatch": [
-        "cluster/crds/cert-manager/.+\\.ya?ml$"
-      ],
-      "matchStrings": [
-        "registryUrl=(?<registryUrl>.*?) chart=(?<depName>.*?)\n.*\\/(?<currentValue>.*?)\\/"
-      ],
-      "datasourceTemplate": "helm"
-    },
-    // regexManager to read and process Traefik CRD's
-    {
-      "fileMatch": [
-        "cluster/crds/traefik/.+\\.ya?ml$"
-      ],
-      "matchStrings": [
-        "registryUrl=(?<registryUrl>.*?) chart=(?<depName>.*?)\n *tag: v(?<currentValue>.*)\n"
-      ],
-      "datasourceTemplate": "helm"
     }
   ],
   "packageRules": [
diff --git a/cluster/crds/cert-manager/kustomization.yaml b/cluster/crds/cert-manager/kustomization.yaml
index 05405e0e..35fb481b 100644
--- a/cluster/crds/cert-manager/kustomization.yaml
+++ b/cluster/crds/cert-manager/kustomization.yaml
@@ -1,5 +1,6 @@
+---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  # renovate: registryUrl=https://charts.jetstack.io chart=cert-manager
-  - https://github.com/jetstack/cert-manager/releases/download/v1.8.0/cert-manager.crds.yaml
+  # renovate: datasource=docker image=quay.io/jetstack/cert-manager-controller
+  - https://github.com/cert-manager/cert-manager/releases/download/v1.8.0/cert-manager.crds.yaml
diff --git a/cluster/crds/system-upgrade-controller/kustomization.yaml b/cluster/crds/system-upgrade-controller/kustomization.yaml
index e5b64dda..f93e9e65 100644
--- a/cluster/crds/system-upgrade-controller/kustomization.yaml
+++ b/cluster/crds/system-upgrade-controller/kustomization.yaml
@@ -2,5 +2,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  # renovate: registryUrl=https://github.com/rancher/system-upgrade-controller
+  # renovate: datasource=docker image=rancher/system-upgrade-controller
   - https://github.com/rancher/system-upgrade-controller/releases/download/v0.9.1/crd.yaml
diff --git a/cluster/flux/flux-system/flux-installation.yaml b/cluster/flux/flux-system/flux-installation.yaml
index bb7f8f7c..83fd3934 100644
--- a/cluster/flux/flux-system/flux-installation.yaml
+++ b/cluster/flux/flux-system/flux-installation.yaml
@@ -8,7 +8,7 @@ spec:
   interval: 10m
   ref:
     # renovate: datasource=github-releases depName=fluxcd/flux2
-    tag: v0.30.2
+    tag: "v0.30.2"
   url: https://github.com/fluxcd/flux2
   ignore: |
     # exclude all