Skip to content

Commit 7855f88

Browse files
authored
Merge pull request #1883 from kube-logging/fix/renovate
feat: upgrade renovate config
2 parents 23d4606 + 9f217dd commit 7855f88

File tree

2 files changed

+92
-25
lines changed

2 files changed

+92
-25
lines changed

Makefile

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
# A Self-Documenting Makefile: http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
22

3+
####
4+
## Dependency versions
5+
####
6+
7+
# renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools versioning=semver
8+
CONTROLLER_GEN_VERSION := v0.16.3
9+
10+
# renovate: datasource=github-releases depName=golangci/golangci-lint versioning=semver
11+
GOLANGCI_LINT_VERSION := v1.61.0
12+
13+
# renovate: datasource=github-releases depName=norwoodj/helm-docs versioning=semver
14+
HELM_DOCS_VERSION = 1.11.0
15+
16+
# renovate: datasource=github-releases depName=kubernetes-sigs/kind versioning=semver
17+
KIND_VERSION ?= v0.24.0
18+
19+
# renovate: datasource=github-releases depName=kubernetes-sigs/kubebuilder versioning=semver
20+
KUBEBUILDER_VERSION = v3.1.0
21+
22+
# renovate: datasource=go depName=github.com/goph/licensei versioning=semver
23+
LICENSEI_VERSION = v0.9.0
24+
25+
# renovate: datasource=go depName=github.com/stern/stern versioning=semver
26+
STERN_VERSION := 1.25.0
27+
328
BIN := ${PWD}/bin
429

530
export PATH := $(BIN):$(PATH)
@@ -26,31 +51,23 @@ E2E_TEST_TIMEOUT ?= 20m
2651
TEST_COV_DIR := $(shell mkdir -p build/_test_coverage && realpath build/_test_coverage)
2752

2853
CONTROLLER_GEN := ${BIN}/controller-gen
29-
CONTROLLER_GEN_VERSION := v0.16.3
3054

3155
ENVTEST_BIN_DIR := ${BIN}/envtest
3256
ENVTEST_K8S_VERSION := 1.31.0
3357
ENVTEST_BINARY_ASSETS := ${ENVTEST_BIN_DIR}/bin
3458

3559
GOLANGCI_LINT := ${BIN}/golangci-lint
36-
GOLANGCI_LINT_VERSION := v1.61.0
3760
LINTER_FLAGS := --timeout 10m
3861

3962
HELM_DOCS := ${BIN}/helm-docs
40-
HELM_DOCS_VERSION = 1.11.0
4163

4264
KIND := ${BIN}/kind
43-
KIND_VERSION ?= v0.24.0
4465
KIND_IMAGE ?= kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865
4566
KIND_CLUSTER := kind
4667

4768
KUBEBUILDER := ${BIN}/kubebuilder
48-
KUBEBUILDER_VERSION = v3.1.0
4969

5070
LICENSEI := ${BIN}/licensei
51-
LICENSEI_VERSION = v0.9.0
52-
53-
STERN_VERSION := 1.25.0
5471

5572
SETUP_ENVTEST := ${BIN}/setup-envtest
5673

renovate.json

Lines changed: 67 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,86 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": [
4-
"config:base",
4+
"config:recommended",
5+
"helpers:pinGitHubActionDigestsToSemver",
6+
":semanticCommitTypeAll(chore)",
57
"schedule:daily",
68
"group:all"
79
],
8-
"automerge": true,
9-
"major": {
10-
"automerge": false
11-
},
12-
"gomodTidy": true,
13-
"requiredStatusChecks": null,
14-
"postUpdateOptions": [
15-
"gomodTidy"
16-
],
10+
"configMigration": true,
1711
"constraints": {
1812
"go": "1.23"
1913
},
20-
"labels": ["dependencies"],
14+
"customManagers": [
15+
{
16+
"customType": "regex",
17+
"fileMatch": [
18+
"^Makefile$"
19+
],
20+
"matchStrings": [
21+
"# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?( registryUrl=(?<registryUrl>.*?))?\\s.*?_VERSION\\s?:?=\\s?(?<currentValue>.*)\\s"
22+
],
23+
"versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}",
24+
"description": [
25+
"Custom dependency manager for updating tools defined in Makefiles."
26+
]
27+
}
28+
],
29+
"enabled": true,
30+
"enabledManagers": [
31+
"custom.regex",
32+
"dockerfile",
33+
"github-actions",
34+
"gomod",
35+
"helm-values",
36+
"helmv3",
37+
"kubernetes",
38+
"kustomize",
39+
"asdf"
40+
],
41+
"labels": [
42+
"dependencies"
43+
],
44+
"osvVulnerabilityAlerts": true,
2145
"packageRules": [
2246
{
23-
"matchPackageNames": ["k8s.io/client-go"],
47+
"matchPackageNames": [
48+
"k8s.io/client-go"
49+
],
2450
"allowedVersions": "/^v[0-9]+\\.[0-9]+\\.[0-9]+(\\.[0-9]+)?$/"
2551
},
2652
{
27-
"matchUpdateTypes": ["major"],
53+
"matchUpdateTypes": [
54+
"major"
55+
],
2856
"enabled": false
2957
},
3058
{
31-
"matchUpdateTypes": ["minor"],
32-
"matchPackagePrefixes": ["k8s.io"],
33-
"stabilityDays": 60
59+
"matchUpdateTypes": [
60+
"minor"
61+
],
62+
"minimumReleaseAge": "60 days",
63+
"matchPackageNames": [
64+
"k8s.io{/,}**"
65+
]
66+
},
67+
{
68+
"matchFileNames": [
69+
"Makefile"
70+
],
71+
"extractVersion": "^v(?<version>.*)$",
72+
"description": [
73+
"Add build label to PRs which are related to build tools defined in Makefiles.",
74+
"Group Makefile dependency updates in single PR."
75+
]
3476
}
35-
]
77+
],
78+
"postUpdateOptions": [
79+
"gomodTidy",
80+
"gomodUpdateImportPaths"
81+
],
82+
"printConfig": false,
83+
"rebaseWhen": "behind-base-branch",
84+
"semanticCommits": "enabled",
85+
"timezone": "Etc/UTC"
3686
}

0 commit comments

Comments
 (0)