From f037aa4a55853c502e4fad6f399746abd6c67055 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Thu, 27 Jul 2023 07:55:27 -0400
Subject: [PATCH] chore: renovate helm.cattle.io/v1 HelmCharts

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/renovate.json5                        | 20 +++++++++++--------
 .../custom-cilium-helmchart.yaml.j2.j2        |  4 ++--
 .../custom-coredns-helmchart.yaml.j2.j2       |  4 ++--
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 071d828f..ab75f80c 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -22,21 +22,23 @@
   "schedule": ["on saturday"],
   "flux": {
     "fileMatch": [
-      "(^|/)kubernetes/.+\\.ya?ml(\\.j2)?$",
-      "(^|/)addons/.+\\.ya?ml(\\.j2)?$"
+      "(^|/)ansible/.+\\.ya?ml(\\.j2)?$",
+      "(^|/)kubernetes/.+\\.ya?ml$",
+      "(^|/)bootstrap/.+\\.ya?ml(\\.j2)?$"
     ]
   },
   "helm-values": {
     "fileMatch": [
-      "(^|/)kubernetes/.+\\.ya?ml(\\.j2)?$",
-      "(^|/)addons/.+\\.ya?ml(\\.j2)?$"
+      "(^|/)ansible/.+\\.ya?ml(\\.j2)?$",
+      "(^|/)kubernetes/.+\\.ya?ml$",
+      "(^|/)bootstrap/.+\\.ya?ml(\\.j2)?$"
     ]
   },
   "kubernetes": {
     "fileMatch": [
       "(^|/)ansible/.+\\.ya?ml(\\.j2)?$",
-      "(^|/)kubernetes/.+\\.ya?ml(\\.j2)?$",
-      "(^|/)addons/.+\\.ya?ml(\\.j2)?$"
+      "(^|/)kubernetes/.+\\.ya?ml$",
+      "(^|/)bootstrap/.+\\.ya?ml(\\.j2)?$"
     ]
   },
   "kustomize": {
@@ -50,13 +52,15 @@
       "fileMatch": [
         "(^|/)ansible/.+\\.ya?ml(\\.j2)?$",
         "(^|/)kubernetes/.+\\.ya?ml(\\.j2)?$",
-        "(^|/)addons/.+\\.ya?ml(\\.j2)?$"
+        "(^|/)bootstrap/.+\\.ya?ml(\\.j2)?(\\.j2)?$"
       ],
       "matchStrings": [
         // Example: `k3s_release_version: "v1.27.3+k3s1"`
         "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( versioning=(?<versioning>\\S+))?\n.*?\"(?<currentValue>.*)\"\n",
         // Example: `- https://github.com/rancher/system-upgrade-controller/releases/download/v0.11.0/crd.yaml`
-        "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( versioning=(?<versioning>\\S+))?\n.*?-\\s(.*?)\/(?<currentValue>[^/]+)\/[^/]+\n"
+        "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( versioning=(?<versioning>\\S+))?\n.*?-\\s(.*?)\/(?<currentValue>[^/]+)\/[^/]+\n",
+        // Example: apiVersion=helm.cattle.io/v1 kind=HelmChart
+        "datasource=(?<datasource>\\S+)\n.*?repo: (?<registryUrl>\\S+)\n.*?chart: (?<depName>\\S+)\n.*?version: (?<currentValue>\\S+)\n"
       ],
       "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}github-releases{{/if}}",
       "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
diff --git a/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2.j2 b/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2.j2
index 3ed9a16b..1b3cb167 100644
--- a/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2.j2
+++ b/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2.j2
@@ -7,10 +7,10 @@ metadata:
   name: cilium
   namespace: kube-system
 spec:
+  # renovate: datasource=helm
   repo: https://helm.cilium.io/
   chart: cilium
-  # renovate: datasource=helm depName=cilium registryUrl=https://helm.cilium.io
-  version: "1.14.0-rc.1"
+  version: 1.14.0-rc.1
   targetNamespace: kube-system
   bootstrap: true
   valuesContent: |-
diff --git a/bootstrap/templates/ansible/playbooks/templates/custom-coredns-helmchart.yaml.j2.j2 b/bootstrap/templates/ansible/playbooks/templates/custom-coredns-helmchart.yaml.j2.j2
index 7b00db44..2c6ac08a 100644
--- a/bootstrap/templates/ansible/playbooks/templates/custom-coredns-helmchart.yaml.j2.j2
+++ b/bootstrap/templates/ansible/playbooks/templates/custom-coredns-helmchart.yaml.j2.j2
@@ -7,10 +7,10 @@ metadata:
   name: coredns
   namespace: kube-system
 spec:
+  # renovate: datasource=helm
   repo: https://coredns.github.io/helm
   chart: coredns
-  # renovate: datasource=helm depName=coredns registryUrl=https://coredns.github.io/helm
-  version: "1.24.1"
+  version: 1.24.1
   targetNamespace: kube-system
   bootstrap: true
   valuesContent: |-