From 23507e6ae26df277502cc071b5c7d4950edd3801 Mon Sep 17 00:00:00 2001 From: William Findlay Date: Tue, 20 Feb 2024 11:30:36 -0500 Subject: [PATCH] renovate: match all Makefiles Remove the restrictions on matching only some Makefiles in renovate, since it would be nice to auto update additional docker dependencies as we add them. Signed-off-by: William Findlay --- .github/renovate.json5 | 82 ++++++++++++++++++++++++++++++------------ 1 file changed, 59 insertions(+), 23 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index c7da9ea37f0..d684ff178d5 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -1,7 +1,9 @@ { // self-hosted configuration "username": "cilium-renovate[bot]", - "repositories": ["cilium/tetragon"], + "repositories": [ + "cilium/tetragon" + ], // renovate first reads this configuration, then reads the repository // configuration, since we don't split between the self-hosted and the // repository configuration, this can lead to duplicate of some areas of the @@ -9,9 +11,9 @@ // https://docs.renovatebot.com/self-hosted-configuration/#requireconfig "requireConfig": "ignored", "allowedPostUpgradeCommands": [ - "^/tmp/install-buildx$", - "^make codegen$", - "^make generate$", + "^/tmp/install-buildx$", + "^make codegen$", + "^make generate$", "^make vendor$", "^make -C install/kubernetes$", "^go mod vendor$", @@ -38,8 +40,7 @@ "contrib/rthooks/tetragon-oci-hook/go.sum", "*Dockerfile*", "install/kubernetes/tetragon/values.yaml", - "Makefile.cli", - "Makefile", + "**/*Makefile*" ], "postUpdateOptions": [ "gomodTidy" @@ -197,14 +198,22 @@ }, { // postUpgradeTasks and postUpdateOptions for all Go updates - "matchManagers": ["gomod"], + "matchManagers": [ + "gomod" + ], "postUpdateOptions": [ // update source import paths on major updates "gomodUpdateImportPaths", ], postUpgradeTasks: { - "commands": ["/tmp/install-buildx", "make codegen", "make generate"], - "fileFilters": ["**/**"], + "commands": [ + "/tmp/install-buildx", + "make codegen", + "make generate" + ], + "fileFilters": [ + "**/**" + ], "executionMode": "branch" } }, @@ -219,8 +228,13 @@ // We need to trigger a golang install manually here because in some // cases it might not be preinstalled, see: // https://github.com/renovatebot/renovate/discussions/23485 - "commands": ["install-tool golang $(grep -oP '^go \\K.+' go.mod)", "make vendor"], - "fileFilters": ["**/**"], + "commands": [ + "install-tool golang $(grep -oP '^go \\K.+' go.mod)", + "make vendor" + ], + "fileFilters": [ + "**/**" + ], "executionMode": "branch" }, }, @@ -240,8 +254,12 @@ ], // lint and generate files for helm chart "postUpgradeTasks": { - "commands": ["make -C install/kubernetes"], - "fileFilters": ["**/**"], + "commands": [ + "make -C install/kubernetes" + ], + "fileFilters": [ + "**/**" + ], "executionMode": "branch" } }, @@ -274,7 +292,9 @@ { // no updates into stable branches (apart from security ones) "enabled": false, - "matchPackagePatterns": ["*"], + "matchPackagePatterns": [ + "*" + ], "matchBaseBranches": [ "v1.0", ] @@ -282,7 +302,9 @@ { // update the base image for stable branches "enabled": true, - "matchPackageNames": ["docker.io/library/alpine"], + "matchPackageNames": [ + "docker.io/library/alpine" + ], "matchBaseBranches": [ "v1.0", ] @@ -339,20 +361,34 @@ { // do not update those packages as they are replaced by the local copy // see https://github.com/cilium/tetragon/blob/7623babdf54e9a38326420c1b188308f6cf96fff/go.mod#L178-L179 - "matchPackageNames": ["github.com/cilium/tetragon/api", "github.com/cilium/tetragon/pkg/k8s", "github.com/cilium/tetragon"], - "matchManagers": ["gomod"], + "matchPackageNames": [ + "github.com/cilium/tetragon/api", + "github.com/cilium/tetragon/pkg/k8s", + "github.com/cilium/tetragon" + ], + "matchManagers": [ + "gomod" + ], "enabled": false }, { // do not update sigstore/cosign-installer as it breaks CI - "matchPackageNames": ["sigstore/cosign-installer"], - "matchManagers": ["github-actions"], + "matchPackageNames": [ + "sigstore/cosign-installer" + ], + "matchManagers": [ + "github-actions" + ], "enabled": false }, { // do not update docker.io/library/ubuntu container image in utility images - "matchPackageNames": ["docker.io/library/ubuntu"], - "matchManagers": ["dockerfile"], + "matchPackageNames": [ + "docker.io/library/ubuntu" + ], + "matchManagers": [ + "dockerfile" + ], "matchFileNames": [ "Dockerfile.clang", "Dockerfile.clang-format" @@ -429,7 +465,7 @@ "customType": "regex", // explicitely not writing ^Makefile$ to match files with Makefile.extension "fileMatch": [ - "^Makefile" + "Makefile" ], // This regex is for upgrading docker image full reference in Makefiles, for examples: // @@ -462,4 +498,4 @@ ] } ] -} +} \ No newline at end of file