Tweaking cnpg renovate

szinn · Mar 27, 2024 · 685ca8d · 685ca8d
1 parent df3fa0b
commit 685ca8d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/.github/renovate/customManagers.json5 b/.github/renovate/customManagers.json5
@@ -18,22 +18,11 @@
         "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( repository=(?<registryUrl>\\S+))?\\n.+: (&\\S+\\s)?(?<currentValue>\\S+)",
         // # renovate: datasource=github-releases depName=rancher/system-upgrade-controller versioning=redhat
         // https://github.com/rancher/system-upgrade-controller/releases/download/v0.13.2/crd.yaml
-        "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( versioning=(?<versioning>\\S+))?\\n.+/(?<currentValue>(v|\\d)[^/]+)"
+        "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( versioning=(?<versioning>\\S+))?( extractVersion=(?<extractVersion>\\S+))?\n[^:\"]*?:[ \"]*(?:[^:\r\n]*:|)(?<currentValue>[^\"\r\n]+)\"*\n"
       ],
       "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}github-releases{{/if}}",
-      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
-    },
-    {
-      "customType": "regex",
-      "description": ["Process CloudnativePG Postgresql version"],
-      "fileMatch": [
-        "(^|/)kubernetes/.+\\.ya?ml(?:\\.j2)?$"
-      ],
-      "matchStrings": [
-        "imageName: (?<depName>\\S+):(?<currentValue>.*\\-.*)"
-      ],
-      "datasourceTemplate": "docker",
-      "versioningTemplate": "redhat"
+      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}",
+      "extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{/if}}"
     },
     {
       "customType": "regex",

diff --git a/.github/renovate/packageRules.json5 b/.github/renovate/packageRules.json5
@@ -36,7 +36,11 @@
         "Don't pin digests for packages that don't have a digest"
       ],
       "matchDatasources": ["docker"],
-      "matchPackageNames": ["ghcr.io/bjw-s/helm/app-template"],
+      "matchPackageNames": [
+        "ghcr.io/bjw-s/helm/app-template",
+        "ghcr.io/cloudnative-pg/postgresql",
+        "ghcr.io/siderolabs/installer"
+      ],
       "pinDigests": false
     },
     {

diff --git a/kubernetes/main/apps/dbms/cloudnative-pg/cluster/cluster.yaml b/kubernetes/main/apps/dbms/cloudnative-pg/cluster/cluster.yaml
@@ -10,6 +10,7 @@ metadata:
   labels:
     app.kubernetes.io/name: postgres-db
 spec:
+  # renovate: datasource=docker depName=ghcr.io/cloudnative-pg/postgresql versioning=redhat
   imageName: ghcr.io/cloudnative-pg/postgresql:16.2-10
   instances: 3
   primaryUpdateStrategy: unsupervised

diff --git a/kubernetes/staging/apps/dbms/cloudnative-pg/cluster/cluster.yaml b/kubernetes/staging/apps/dbms/cloudnative-pg/cluster/cluster.yaml
@@ -10,6 +10,7 @@ metadata:
   labels:
     app.kubernetes.io/name: postgres-db
 spec:
+  # renovate: datasource=docker depName=ghcr.io/cloudnative-pg/postgresql versioning=redhat
   imageName: ghcr.io/cloudnative-pg/postgresql:16.2-10
   instances: 3
   primaryUpdateStrategy: unsupervised