Skip to content

Commit 7b20bf3

Browse files
HadrienPattejulianwiedmann
authored andcommitted
renovate: Update image-tools images regex
This PR updates the custom versioning regex used for the images from the `image-tools` repository to reflect image versioning scheme changes from cilium/image-tools#413. The existing regex is kept for images that still follow the previous versioning scheme (`image-compilers`, `image-maker`, `startup-script` and `image-tester`). Other images now have a slighlty more elaborate regex to account for their "semantic + timestamp + commit sha" new versioning scheme. Reference: https://docs.renovatebot.com/modules/versioning/regex/ Note: we're using the `build` capture group for the timestamp element Note: Renovate requires that all previous capture groups match (even if with an empty value), this is why the `patch` capture group is configured to either match the patch version component or match to an empty value in case the version does not have a patch number (like for the `checkpatch` and `network-perf` images). Signed-off-by: Hadrien Patte <hadrien.patte@datadoghq.com>
1 parent 884a6e8 commit 7b20bf3

1 file changed

Lines changed: 15 additions & 7 deletions

File tree

.github/renovate.json5

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -655,21 +655,29 @@
655655
}
656656
},
657657
{
658-
// The images from the image-tools repository have a timestamp-based versioning scheme, see https://github.com/cilium/image-tools/pull/286
658+
// Images from the image-tools repository that have a timestamp-based versioning scheme
659+
// See https://github.com/cilium/image-tools/pull/286
659660
"matchPackageNames": [
660-
"quay.io/cilium/cilium-bpftool",
661-
"quay.io/cilium/ca-certificates",
662-
"quay.io/cilium/cilium-checkpatch",
663661
"quay.io/cilium/image-compilers",
664-
"quay.io/cilium/iptables",
665-
"quay.io/cilium/cilium-llvm",
666662
"quay.io/cilium/image-maker",
667-
"quay.io/cilium/network-perf",
668663
"quay.io/cilium/startup-script",
669664
"quay.io/cilium/image-tester",
670665
],
671666
"versioning": "regex:^(?<major>\\d+)-[a-f0-9]{7}$",
672667
},
668+
{
669+
// Images from the image-tools repository that have a semantic + timestamp-based versioning scheme
670+
// See https://github.com/cilium/image-tools/pull/413
671+
// See each image for an example version tag
672+
"matchPackageNames": [
673+
"quay.io/cilium/cilium-bpftool", // 7.4.0-1758805548-08727cd
674+
"quay.io/cilium/cilium-checkpatch", // 5.12-1755701578-b97bd7a
675+
"quay.io/cilium/iptables", // 1.8.8-1-1758805548-08727cd
676+
"quay.io/cilium/cilium-llvm", // 19.1.7-1758805548-08727cd
677+
"quay.io/cilium/network-perf", // 3.19-1758616553-aad452d
678+
],
679+
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)(?:\\.(?<patch>\\d+)|(?<patch>))(-\\d+)?-(?<build>\\d+)-[a-f0-9]{7}$",
680+
},
673681
{
674682
// Avoid updating minor or major version for github.com/envoyproxy/go-control-plane/envoy
675683
// as we need to update cilium-envoy accordingly.

0 commit comments

Comments
 (0)