chore: rekres to simplify .kres.yaml defaults

rekres to simplify `.kres.yaml` defaults. Signed-off-by: Noel Georgi <[email protected]>
siderolabs · Dec 18, 2024 · 01771bc · 01771bc
1 parent cc467e8
commit 01771bc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 50 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -9,24 +9,14 @@
         "schedule:earlyMondays"
     ],
     "customManagers": [
-        {
-            "customType": "regex",
-            "versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}",
-            "fileMatch": [
-                "vars.yaml"
-            ],
-            "matchStrings": [
-                "# renovate: datasource=(?<datasource>.*?)(?:\\s+extractVersion=(?<extractVersion>.+?))?(?:\\s+versioning=(?<versioning>.+?))?\\s+depName=(?<depName>.+?)?\\s(?:.*_(?:version|VERSION):\\s+(?<currentValue>.*))?(?:(\\s)?.*_(?:ref|REF):\\s+(?<currentDigest>.*))?"
-            ]
-        },
         {
             "customType": "regex",
             "versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}",
             "fileMatch": [
                 "Pkgfile"
             ],
             "matchStrings": [
-                "# renovate: datasource=(?<datasource>.*?)(?:\\s+extractVersion=(?<extractVersion>.+?))?(?:\\s+versioning=(?<versioning>.+?))?\\s+depName=(?<depName>.+?)?\\s(?:\\s+.*_(?:version|VERSION):\\s+(?<currentValue>.*))?(?:\\s.*_(?:ref|REF):\\s+(?<currentDigest>.*))?"
+                "# renovate: datasource=(?<datasource>.*?)(?:\\s+extractVersion=(?<extractVersion>.+?))?(?:\\s+versioning=(?<versioning>.+?))?\\s+depName=(?<depName>.+?)?\\s(?:.*_(?:version|VERSION):\\s+(?<currentValue>.*))?(?:(\\s)?.*_(?:ref|REF):\\s+(?<currentDigest>.*))?"
             ]
         },
         {
@@ -43,14 +33,12 @@
         },
         {
             "customType": "regex",
-            "datasourceTemplate": "github-tags",
-            "depNameTemplate": "siderolabs/bldr",
-            "versioningTemplate": "semver",
+            "versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}",
             "fileMatch": [
-                "Makefile"
+                "vars.yaml"
             ],
             "matchStrings": [
-                "BLDR_RELEASE\\s+\\?=\\s+(?<currentValue>.*)\\n"
+                "# renovate: datasource=(?<datasource>.*?)(?:\\s+extractVersion=(?<extractVersion>.+?))?(?:\\s+versioning=(?<versioning>.+?))?\\s+depName=(?<depName>.+?)?\\s(?:.*_(?:version|VERSION):\\s+(?<currentValue>.*))?(?:(\\s)?.*_(?:ref|REF):\\s+(?<currentDigest>.*))?"
             ]
         }
     ],

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2024-12-11T15:43:22Z by kres 8183c20.
+# Generated on 2024-12-18T18:42:14Z by kres fcff05e.
 
 name: default
 concurrency:
@@ -33,7 +33,7 @@ jobs:
       labels: ${{ steps.retrieve-pr-labels.outputs.result }}
     services:
       buildkitd:
-        image: moby/buildkit:v0.18.1
+        image: moby/buildkit:v0.18.2
         options: --privileged
         ports:
           - 1234:1234
@@ -143,7 +143,7 @@ jobs:
       - default
     services:
       buildkitd:
-        image: moby/buildkit:v0.18.1
+        image: moby/buildkit:v0.18.2
         options: --privileged
         ports:
           - 1234:1234

diff --git a/.github/workflows/weekly.yaml b/.github/workflows/weekly.yaml
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2024-12-11T15:43:22Z by kres 8183c20.
+# Generated on 2024-12-18T18:42:14Z by kres fcff05e.
 
 name: weekly
 concurrency:
@@ -16,7 +16,7 @@ jobs:
       - pkgs
     services:
       buildkitd:
-        image: moby/buildkit:v0.18.1
+        image: moby/buildkit:v0.18.2
         options: --privileged
         ports:
           - 1234:1234

diff --git a/.kres.yaml b/.kres.yaml
@@ -170,35 +170,6 @@ spec:
 ---
 kind: common.Renovate
 spec:
-  customManagers:
-    - customType: regex
-      fileMatch:
-        - vars.yaml
-      matchStrings:
-        - '# renovate: datasource=(?<datasource>.*?)(?:\s+extractVersion=(?<extractVersion>.+?))?(?:\s+versioning=(?<versioning>.+?))?\s+depName=(?<depName>.+?)?\s(?:.*_(?:version|VERSION):\s+(?<currentValue>.*))?(?:(\s)?.*_(?:ref|REF):\s+(?<currentDigest>.*))?'
-      versioningTemplate: "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}"
-    - customType: regex
-      fileMatch:
-        - Pkgfile
-      matchStrings:
-        - '# renovate: datasource=(?<datasource>.*?)(?:\s+extractVersion=(?<extractVersion>.+?))?(?:\s+versioning=(?<versioning>.+?))?\s+depName=(?<depName>.+?)?\s(?:\s+.*_(?:version|VERSION):\s+(?<currentValue>.*))?(?:\s.*_(?:ref|REF):\s+(?<currentDigest>.*))?'
-      versioningTemplate: "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}"
-    - customType: regex
-      fileMatch:
-        - Pkgfile
-      matchStrings:
-        - ghcr.io\/siderolabs\/bldr:(?<currentValue>v.*)
-      depNameTemplate: siderolabs/bldr
-      datasourceTemplate: github-tags
-      versioningTemplate: semver
-    - customType: regex
-      fileMatch:
-        - Makefile
-      matchStrings:
-        - BLDR_RELEASE\s+\?=\s+(?<currentValue>.*)\n
-      depNameTemplate: siderolabs/bldr
-      datasourceTemplate: github-tags
-      versioningTemplate: semver
   packageRules:
     - matchPackageNames:
         - nvidia/open-gpu-kernel-modules