Skip to content

Update Renovate configuration #8381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 9, 2025
Merged

Update Renovate configuration #8381

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4391f76
Use renovate to monitor dependencies on release branch
pdabelf5 Oct 6, 2025
2259cc3
remove update docker sha schedule
pdabelf5 Oct 7, 2025
6070cec
add renovate for helm schema
pdabelf5 Oct 7, 2025
bcea851
commit it
pdabelf5 Oct 7, 2025
09ec990
Remove no longer required workflow
pdabelf5 Oct 8, 2025
3279847
use renovate to manage NGINX OSS version
pdabelf5 Oct 8, 2025
dbfd105
Pass OSS variable to the debian docker target
pdabelf5 Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/scripts/exclude_ci_files.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/cherry-pick.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/update-docker-sha.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ on:
dry_run:
type: boolean
default: false
schedule:
- cron: "0 1 * * 1-5" # 01:00 UTC Mon-Fri

defaults:
run:
Expand Down
55 changes: 0 additions & 55 deletions .github/workflows/update-kubernetes-version.yml
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -595,7 +596,7 @@
# 101 is nginx
USER 101

LABEL org.opencontainers.image.version="${IC_VERSION}" \

Check warning on line 599 in build/Dockerfile

View workflow job for this annotation

GitHub Actions / Build Artifacts / Build Docker OSS (ubi, linux/arm64, linux/amd64) / OSS ubi linux/arm64, linux/amd64

Variables should be defined before their use 

UndefinedVar: Usage of undefined variable '$NGINX_VERSION'
More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/
org.opencontainers.image.documentation=https://docs.nginx.com/nginx-ingress-controller \
org.opencontainers.image.vendor="NGINX Inc <[email protected]>" \
org.nginx.kic.image.build.target="${TARGETPLATFORM}" \
Expand Down
16 changes: 16 additions & 0 deletions renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Loading