Update Renovate configuration (#8381)

Author: pdabelf5

.github/scripts/exclude_ci_files.txt

@@ -49,7 +49,6 @@
 .github/workflows/stale.yml
 .github/workflows/update-docker-images.yml
 .github/workflows/update-docker-sha.yml
-.github/workflows/update-kubernetes-version.yml
 .github/workflows/update-release-draft.yml
 .github/workflows/updates-notification.yml
 .github/workflows/version-bump.yml

.github/workflows/cherry-pick.yml

@@ -15,7 +15,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-24.04
     name: Cherry pick into release branch
-    if: ${{ (contains(github.event.pull_request.labels.*.name, 'dependencies') || contains(github.event.pull_request.labels.*.name, 'needs cherry pick')) && github.event.pull_request.merged == true }}
+    if: ${{ contains(github.event.pull_request.labels.*.name, 'needs cherry pick') && github.event.pull_request.merged == true }}
     steps:
       - name: Checkout
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

.github/workflows/update-docker-sha.yml

@@ -16,8 +16,6 @@ on:
       dry_run:
         type: boolean
         default: false
-  schedule:
-    - cron: "0 1 * * 1-5" # 01:00 UTC Mon-Fri
 
 defaults:
   run:

.github/workflows/update-kubernetes-version.yml

@@ -2,7 +2,8 @@
 VER = $(shell grep IC_VERSION .github/data/version.txt | cut -d '=' -f 2)
 GIT_TAG = $(shell git describe --exact-match --tags || echo untagged)
 VERSION = $(VER)-SNAPSHOT
-NGINX_OSS_VERSION             ?= 1.29
+# renovate: datasource=docker depName=nginx/nginx
+NGINX_OSS_VERSION             ?= 1.29.1
 NGINX_PLUS_VERSION            ?= R35
 NAP_WAF_VERSION               ?= 35+5.527
 NAP_WAF_COMMON_VERSION        ?= 11.559

Makefile

@@ -1,6 +1,7 @@
 # syntax=docker/dockerfile:1.19
 ARG BUILD_OS=debian
-ARG NGINX_OSS_VERSION=1.29
+# renovate: datasource=docker depName=nginx/nginx
+ARG NGINX_OSS_VERSION=1.29.1
 ARG NGINX_PLUS_VERSION=R35
 ARG NAP_WAF_VERSION=35+5.527
 ARG NAP_WAF_COMMON_VERSION=11.559
@@ -106,6 +107,7 @@ RUN --mount=type=bind,from=nginx-files,src=nginx_signing.rsa.pub,target=/etc/apk
 
 ############################################# Base image for Debian #############################################
 FROM nginx:1.29.1@sha256:8adbdcb969e2676478ee2c7ad333956f0c8e0e4c5a7463f4611d7a2e7a7ff5dc AS debian
+ARG NGINX_OSS_VERSION
 ARG NGINX_AGENT_VERSION
 
 RUN --mount=type=bind,from=nginx-files,src=nginx_signing.key,target=/tmp/nginx_signing.key \
@@ -121,7 +123,9 @@ RUN --mount=type=bind,from=nginx-files,src=nginx_signing.key,target=/tmp/nginx_s
     http://packages.nginx.org/nginx-agent/debian `lsb_release -cs` agent" >> /etc/apt/sources.list.d/nginx.list \
 	&& printf "%s" "Package: *\nPin: origin nginx.org\nPin: release o=nginx\nPin-Priority: 900\n" > /etc/apt/preferences.d/99nginx \
 	&& apt-get update \
-	&& apt-get install --no-install-recommends --no-install-suggests -y nginx-agent=${NGINX_AGENT_VERSION}* nginx-module-otel=${NGINX_OSS_VERSION}* \
+	&& apt-get install --no-install-recommends --no-install-suggests -y \
+	nginx-agent=${NGINX_AGENT_VERSION}* \
+	nginx-module-otel=${NGINX_OSS_VERSION}* \
 	&& apt-get purge --auto-remove -y gpg \
 	&& rm -rf /var/lib/apt/lists/* /etc/apt/preferences.d/99nginx /etc/apt/sources.list.d/nginx.list \
 	&& agent.sh

build/Dockerfile

@@ -174,11 +174,27 @@
         "source[\\s]+=[\\s]+\"github.com/(?<depName>\\S*)\"[\\s]+version[\\s]+=[\\s]+\"(?<currentValue>\\S*)\"",
         "version[\\s]+=[\\s]+\"(?<currentValue>\\S*)[\\s]+source[\\s]+=[\\s]+\"github.com/(?<depName>\\S*)\""
       ]
+    },
+    {
+      "customType": "regex",
+      "datasourceTemplate": "docker",
+      "depNameTemplate": "kindest/node",
+      "description": "Kubernetes version in helm schema file",
+      "managerFilePatterns": [
+        "/values\\.schema\\.json$/"
+      ],
+      "matchStrings": [
+        "master\\/(?<currentValue>v\\d+\\.\\d+\\.\\d+)\\/_definitions\\.json"
+      ]
     }
   ],
   "timezone": "Europe/Dublin",
   "automerge": true,
   "automergeStrategy": "squash",
+  "baseBranchPatterns": [
+    "main",
+    "release-5.2"
+  ],
   "commitBodyTable": true,
   "configMigration": true,
   "customDatasources": {