renovate: Add the configuration for spire images

Signed-off-by: Tam Mach <tam.mach@cilium.io>
aanm · Jun 14, 2024 · 8868b39 · 8868b39
1 parent 8482b03
commit 8868b39
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -14,10 +14,6 @@
   // config, for example the regex. See:
   // https://docs.renovatebot.com/self-hosted-configuration/#requireconfig
   "requireConfig": "ignored",
-  "allowedPostUpgradeCommands": [
-    "^make -C install/kubernetes$",
-    "^go mod vendor$",
-  ],
   // This ensures that the gitAuthor and gitSignOff fields match
   "gitAuthor": "cilium-renovate[bot] <134692979+cilium-renovate[bot]@users.noreply.github.com>",
   "includePaths": [
@@ -81,6 +77,21 @@
     "release-note/misc"
   ],
   "stopUpdatingLabel": "renovate/stop-updating",
+  "allowedPostUpgradeCommands": [
+    "^make -C install/kubernetes$",
+    "^make -C Documentation update-helm-values$",
+  ],
+  "postUpgradeTasks": {
+    "commands": [
+      "make -C install/kubernetes",
+      "make -C Documentation update-helm-values"
+    ],
+    "fileFilters": [
+      "VERSION",
+      "install/kubernetes/**"
+    ],
+    "executionMode": "update"
+  },
   "packageRules": [
     {
       // Try to group all updates for all dependencies in a single PR. More
@@ -221,12 +232,6 @@
         "main"
       ],
       "allowedVersions": ">1.6",
-      // generate files for helm chart
-      "postUpgradeTasks": {
-        "commands": ["make -C install/kubernetes"],
-        "fileFilters": ["**/**"],
-        "executionMode": "branch"
-      }
     },
     {
       "groupName": "spire-images",
@@ -241,12 +246,6 @@
         "v1.14"
       ],
       "allowedVersions": "<1.7",
-      // generate files for helm chart
-      "postUpgradeTasks": {
-        "commands": ["make -C install/kubernetes"],
-        "fileFilters": ["**/**"],
-        "executionMode": "branch"
-      }
     },
     {
       "matchPackageNames": [

diff --git a/install/kubernetes/Makefile.values b/install/kubernetes/Makefile.values
@@ -50,8 +50,10 @@ export SPIRE_INIT_REPO:=docker.io/library/busybox
 export SPIRE_INIT_VERSION:=1.36.1
 export SPIRE_INIT_DIGEST:=sha256:223ae047b1065bd069aac01ae3ac8088b3ca4a527827e283b85112f29385fb1b
 export SPIRE_SERVER_REPO:=ghcr.io/spiffe/spire-server
+# renovate: datasource=docker depName=ghcr.io/spiffe/spire-server
 export SPIRE_SERVER_VERSION:=1.8.5
 export SPIRE_SERVER_DIGEST:=sha256:28269265882048dcf0fed32fe47663cd98613727210b8d1a55618826f9bf5428
 export SPIRE_AGENT_REPO:=ghcr.io/spiffe/spire-agent
+# renovate: datasource=docker depName=ghcr.io/spiffe/spire-agent
 export SPIRE_AGENT_VERSION:=1.8.5
 export SPIRE_AGENT_DIGEST:=sha256:99405637647968245ff9fe215f8bd2bd0ea9807be9725f8bf19fe1b21471e52b