Skip to content

Commit b813377

Browse files
mnenciasxd
andauthored
chore: improve renovate configurations (cloudnative-pg#1473)
Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com> Signed-off-by: Jonathan Gonzalez V <jonathan.gonzalez@enterprisedb.com> Co-authored-by: Jonathan Gonzalez V <jonathan.gonzalez@enterprisedb.com>
1 parent 73cb895 commit b813377

6 files changed

+27
-23
lines changed

.github/renovate.json5

+21-18
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"extends": [
44
"config:base"
55
],
6+
"rebaseWhen": "never",
67
// The maximum number of PRs to be created in parallel
78
"prConcurrentLimit": 5,
89
// The branches renovate should target
@@ -12,15 +13,15 @@
1213
"postUpdateOptions": ["gomodTidy"],
1314
"semanticCommits": "enabled",
1415
// All PRs should have a label
15-
"labels": ["automated", "do not backport"],
16+
"labels": ["automated", "do not backport", "no-issue"],
1617
"regexManagers": [
1718
{
1819
// We want a PR to bump Kustomize version in the Makefile
1920
"fileMatch": [
2021
"^Makefile$",
2122
],
2223
"matchStrings": [
23-
"KUSTOMIZE_VERSION \\?\\= (?<currentValue>.*?)\\n"
24+
"KUSTOMIZE_VERSION \\?= (?<currentValue>.*?)\\n"
2425
],
2526
"datasourceTemplate": "go",
2627
"depNameTemplate": "sigs.k8s.io/kustomize/kustomize/v4",
@@ -30,7 +31,7 @@
3031
"^Makefile$",
3132
],
3233
"matchStrings": [
33-
"CONTROLLER_TOOLS_VERSION \\?\\= (?<currentValue>.*?)\\n"
34+
"CONTROLLER_TOOLS_VERSION \\?= (?<currentValue>.*?)\\n"
3435
],
3536
"datasourceTemplate": "go",
3637
"depNameTemplate": "sigs.k8s.io/controller-tools",
@@ -40,40 +41,42 @@
4041
"^Makefile$",
4142
],
4243
"matchStrings": [
43-
"GORELEASER_VERSION \\?\\= (?<currentValue>.*?)\\n"
44+
"GORELEASER_VERSION \\?= (?<currentValue>.*?)\\n"
4445
],
4546
"datasourceTemplate": "go",
4647
"versioningTemplate": "loose",
4748
"depNameTemplate": "github.com/goreleaser/goreleaser",
4849
}, {
49-
// We want a PR to bump kind version in the Makefile
50+
// We want a PR to bump kind node version in the Makefile
5051
"fileMatch": [
5152
"^Makefile$",
53+
"^hack/setup-cluster.sh^",
5254
],
5355
"matchStrings": [
54-
"KIND_CLUSTER_VERSION \\?\\= (?<currentValue>.*?)\\n"
56+
"KIND_CLUSTER_VERSION \\?= (?<currentValue>.*?)\\n",
57+
"K8S_DEFAULT_VERSION=(?<currentValue>.*?)\\n",
5558
],
5659
"datasourceTemplate": "docker",
5760
"versioningTemplate": "loose",
5861
"depNameTemplate": "kindest/node",
5962
}, {
60-
// We want a PR to bump kind version in the Makefile
63+
// We want a PR to bump spellcheck version in the Makefile
6164
"fileMatch": [
6265
"^Makefile$",
6366
],
6467
"matchStrings": [
65-
"SPELLCHECK_VERSION \\?\\= (?<currentValue>.*?)\\n"
68+
"SPELLCHECK_VERSION \\?= (?<currentValue>.*?)\\n"
6669
],
6770
"datasourceTemplate": "docker",
6871
"versioningTemplate": "loose",
6972
"depNameTemplate": "jonasbn/github-action-spellcheck",
7073
}, {
71-
// We want a PR to bump kind version in the Makefile
74+
// We want a PR to bump woke version in the Makefile
7275
"fileMatch": [
7376
"^Makefile$",
7477
],
7578
"matchStrings": [
76-
"WOKE_VERSION \\?\\= (?<currentValue>.*?)\\n"
79+
"WOKE_VERSION \\?= (?<currentValue>.*?)\\n"
7780
],
7881
"datasourceTemplate": "docker",
7982
"versioningTemplate": "loose",
@@ -91,8 +94,8 @@
9194
"datasourceTemplate": "docker",
9295
"versioningTemplate": "loose",
9396
}, {
94-
// We want a PR to bump Go versions used through env variables in any Github
95-
// Actions, taking it from the official Github repository.
97+
// We want a PR to bump Go versions used through env variables in any GitHub
98+
// Actions, taking it from the official GitHub repository.
9699
"fileMatch": ["^\\.github\\/workflows\\/[^/]+\\.ya?ml$"],
97100
"matchStrings": [
98101
"GO_VERSION: '(?<currentValue>.*?)'\\n"
@@ -101,7 +104,7 @@
101104
"depNameTemplate": "golang"
102105
}, {
103106
// We want a PR to bump golangci-lint versions used through env variables in
104-
// any Github Actions or Makefile, taking it from the official Github
107+
// any GitHub Actions or Makefile, taking it from the official GitHub
105108
// repository tags.
106109
"fileMatch": ["^\\.github\\/workflows\\/[^/]+\\.ya?ml$"],
107110
"matchStrings": [
@@ -124,7 +127,7 @@
124127
"allowedVersions": "<1.0"
125128
}, {
126129
// We want a single PR for all the patches bumps of kubernetes related
127-
// dependencies, as most of the times these are all strictly related.
130+
// dependencies, as usually these are all strictly related.
128131
"matchDatasources": [
129132
"go"
130133
],
@@ -190,7 +193,7 @@
190193
],
191194
"groupName": "all non-major go dependencies"
192195
}, {
193-
// We want a single PR for all minor and patch bumps of Github Actions
196+
// We want a single PR for all minor and patch bumps of GitHub Actions
194197
"matchDepTypes": [
195198
"action"
196199
],
@@ -199,13 +202,13 @@
199202
"patch"
200203
],
201204
"groupName": "all non-major github action",
202-
"pinDigests": true
205+
"pinDigests": false
203206
},{
204-
// We want dedicated PRs for each major bump to Github Actions
207+
// We want dedicated PRs for each major bump to GitHub Actions
205208
"matchDepTypes": [
206209
"action"
207210
],
208-
"pinDigests": true
211+
"pinDigests": false
209212
}
210213
]
211214
}

config/crd/bases/postgresql.cnpg.io_backups.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.1
6+
controller-gen.kubebuilder.io/version: v0.11.3
77
creationTimestamp: null
88
name: backups.postgresql.cnpg.io
99
spec:

config/crd/bases/postgresql.cnpg.io_clusters.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.1
6+
controller-gen.kubebuilder.io/version: v0.11.3
77
creationTimestamp: null
88
name: clusters.postgresql.cnpg.io
99
spec:

config/crd/bases/postgresql.cnpg.io_poolers.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.1
6+
controller-gen.kubebuilder.io/version: v0.11.3
77
creationTimestamp: null
88
name: poolers.postgresql.cnpg.io
99
spec:

config/crd/bases/postgresql.cnpg.io_scheduledbackups.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.1
6+
controller-gen.kubebuilder.io/version: v0.11.3
77
creationTimestamp: null
88
name: scheduledbackups.postgresql.cnpg.io
99
spec:

hack/setup-cluster.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ if [ "${DEBUG-}" = true ]; then
2424
fi
2525

2626
# Defaults
27-
K8S_VERSION=${K8S_VERSION:-v1.26.0}
27+
K8S_DEFAULT_VERSION=v1.26.0
28+
K8S_VERSION=${K8S_VERSION:-$K8S_DEFAULT_VERSION}
2829
KUBECTL_VERSION=${KUBECTL_VERSION:-$K8S_VERSION}
2930
ENGINE=${CLUSTER_ENGINE:-kind}
3031
ENABLE_REGISTRY=${ENABLE_REGISTRY:-}

0 commit comments

Comments
 (0)