diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 2b145640..9cdf4a0b 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -21,7 +21,13 @@ ], matchStrings: [ 'defaultFluxVersion = "(?v[0-9.]+)"', + // this matches any comment block that has 'renovate:flux-version', then + // any number of empty or comment lines, and then a substring that + // matches e.g. "Defaults to "v1.0.0". 'renovate:flux-version\\n(?:\\s*(?:\\/\\/).*\n)*.*Defaults to "(?v[0-9.]+)"', + // this matches any comment block that has 'renovate:flux-version', then + // any number of empty or comment lines, and then a substring that + // matches e.g. "version: v1.0.0". 'renovate:flux-version\\n(?:\\s*(?:#).*\n)*.*version: (?v[0-9.]+)\\s', ], depNameTemplate: 'github.com/fluxcd/flux2/v2', @@ -53,12 +59,14 @@ automerge: true, }, { + // bump k8s, controller-runtime, and gardener go dependencies together groupName: 'k8s and gardener packages', groupSlug: 'k8s-gardener-go', matchDatasources: [ 'go', ], matchPackageNames: [ + // from "group:kubernetes" 'k8s.io/api{/,}**', 'k8s.io/apiextensions-apiserver{/,}**', 'k8s.io/apimachinery{/,}**', @@ -85,11 +93,14 @@ 'k8s.io/sample-apiserver{/,}**', 'k8s.io/sample-cli-plugin{/,}**', 'k8s.io/sample-controller{/,}**', + // added packages 'github.com/gardener/gardener{/,}**', 'sigs.k8s.io/controller-runtime{/,}**', ], }, { + // we need to bump k8s and controller-runtime minor versions together with gardener + // disable minor version bumps for k8s and controller-runtime matchDatasources: [ 'go', ], @@ -98,6 +109,7 @@ ], enabled: false, matchPackageNames: [ + // from "group:kubernetes" 'k8s.io/api{/,}**', 'k8s.io/apiextensions-apiserver{/,}**', 'k8s.io/apimachinery{/,}**', @@ -124,6 +136,7 @@ 'k8s.io/sample-apiserver{/,}**', 'k8s.io/sample-cli-plugin{/,}**', 'k8s.io/sample-controller{/,}**', + // added packages 'sigs.k8s.io/controller-runtime{/,}**', ], },