Skip to content

Commit 77cdb0e

Browse files
pjbgfpjbgf
authored
Merge pull request #723 from pjbgf/renovate-changes
Renovate changes
2 parents a380fb9 + 3501541 commit 77cdb0e

File tree

4 files changed

+189
-105
lines changed

4 files changed

+189
-105
lines changed

‎.github/renovate-backports.json‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
{
2+
"extends": [
3+
"github>rancher/renovate-config#release"
4+
],
5+
"baseBranches": [
6+
"release/v1.1",
7+
"release/v1.2",
8+
"release/v1.3",
9+
"release/v1.4"
10+
],
11+
"ignoreDeps":[
12+
"github.com/rancher/lasso"
13+
],
14+
"prHourlyLimit": 10,
15+
"packageRules": [
16+
{
17+
"matchBaseBranches": [
18+
"release/v1.4"
19+
],
20+
"matchDepNames": [
21+
"k8s.io/api",
22+
"k8s.io/apiextensions-apiserver",
23+
"k8s.io/apimachinery",
24+
"k8s.io/client-go"
25+
],
26+
"allowedVersions": "<0.33.0"
27+
},
28+
{
29+
"matchBaseBranches": [
30+
"release/v1.3"
31+
],
32+
"matchDepNames": [
33+
"k8s.io/api",
34+
"k8s.io/apiextensions-apiserver",
35+
"k8s.io/apimachinery",
36+
"k8s.io/client-go"
37+
],
38+
"allowedVersions": "<0.32.0"
39+
},
40+
{
41+
"matchBaseBranches": [
42+
"release/v1.4"
43+
],
44+
"matchDepNames": [
45+
"github.com/rancher/security-scan"
46+
],
47+
"allowedVersions": "<v0.7.0"
48+
},
49+
{
50+
"matchBaseBranches": [
51+
"release/v1.3"
52+
],
53+
"matchDepNames": [
54+
"github.com/rancher/security-scan"
55+
],
56+
"allowedVersions": "<v0.6.0"
57+
},
58+
{
59+
"matchBaseBranches": ["release/v1.2"],
60+
"matchDepNames": [
61+
"k8s.io/api",
62+
"k8s.io/apiextensions-apiserver",
63+
"k8s.io/apimachinery",
64+
"k8s.io/client-go"
65+
],
66+
"allowedVersions": "<0.31.0"
67+
},
68+
{
69+
"matchBaseBranches": ["release/v1.2"],
70+
"matchDepNames": [
71+
"github.com/rancher/security-scan"
72+
],
73+
"allowedVersions": "<v0.5.0"
74+
},
75+
{
76+
"matchBaseBranches": ["release/v1.1"],
77+
"matchDepNames": [
78+
"k8s.io/api",
79+
"k8s.io/apiextensions-apiserver",
80+
"k8s.io/apimachinery",
81+
"k8s.io/client-go"
82+
],
83+
"allowedVersions": "<0.31.0"
84+
},
85+
{
86+
"matchBaseBranches": ["release/v1.1"],
87+
"matchDepNames": [
88+
"github.com/rancher/security-scan"
89+
],
90+
"allowedVersions": "<v0.4.0"
91+
},
92+
{
93+
"matchBaseBranches": ["release/v1.3"],
94+
"matchDepNames": [
95+
"github.com/prometheus-operator/prometheus-operator/pkg/client",
96+
"github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring"
97+
],
98+
"allowedVersions": "<v0.79.0"
99+
},
100+
{
101+
"matchBaseBranches": [
102+
"release/v1.1",
103+
"release/v1.2"
104+
],
105+
"matchDepNames": [
106+
"github.com/prometheus-operator/prometheus-operator/pkg/client",
107+
"github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring"
108+
],
109+
"allowedVersions": "<v0.75.0"
110+
},
111+
{
112+
"matchBaseBranches": [
113+
"release/v1.1",
114+
"release/v1.2",
115+
"release/v1.3"
116+
],
117+
"matchDepNames": [
118+
"github.com/urfave/cli"
119+
],
120+
"allowedVersions": "<v2.0.0"
121+
},
122+
{
123+
"matchBaseBranches": [
124+
"release/v1.1",
125+
"release/v1.2"
126+
],
127+
"matchDepNames": [
128+
"github.com/rancher/wrangler"
129+
],
130+
"allowedVersions": "<v3.0.1"
131+
}
132+
]
133+
}

‎.github/renovate.json‎

Lines changed: 26 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,17 @@
33
"github>rancher/renovate-config#release"
44
],
55
"baseBranches": [
6-
"main",
7-
"release/v1.1",
8-
"release/v1.2",
9-
"release/v1.3",
10-
"release/v1.4"
6+
"main"
117
],
128
"ignoreDeps":[
139
"github.com/rancher/lasso"
1410
],
1511
"prHourlyLimit": 4,
1612
"packageRules": [
1713
{
14+
"description": "Constraint k8s versions",
1815
"matchBaseBranches": [
19-
"main",
20-
"release/v1.4"
16+
"main"
2117
],
2218
"matchDepNames": [
2319
"k8s.io/api",
@@ -28,108 +24,35 @@
2824
"allowedVersions": "<0.33.0"
2925
},
3026
{
27+
"description": "Disable non-security bumps for backporting branches",
28+
"enabled": false,
3129
"matchBaseBranches": [
32-
"release/v1.3"
33-
],
34-
"matchDepNames": [
35-
"k8s.io/api",
36-
"k8s.io/apiextensions-apiserver",
37-
"k8s.io/apimachinery",
38-
"k8s.io/client-go"
39-
],
40-
"allowedVersions": "<0.32.0"
41-
},
42-
{
43-
"matchBaseBranches": [
30+
"release/v1.1",
31+
"release/v1.2",
32+
"release/v1.3",
4433
"release/v1.4"
45-
],
46-
"matchDepNames": [
47-
"github.com/rancher/security-scan"
48-
],
49-
"allowedVersions": "<v0.7.0"
34+
]
5035
},
5136
{
37+
"description": "Ensure CA bumps are enabled for backporting branches",
38+
"enabled": true,
5239
"matchBaseBranches": [
53-
"release/v1.3"
54-
],
55-
"matchDepNames": [
56-
"github.com/rancher/security-scan"
57-
],
58-
"allowedVersions": "<v0.6.0"
59-
},
60-
{
61-
"matchBaseBranches": ["release/v1.2"],
62-
"matchDepNames": [
63-
"k8s.io/api",
64-
"k8s.io/apiextensions-apiserver",
65-
"k8s.io/apimachinery",
66-
"k8s.io/client-go"
67-
],
68-
"allowedVersions": "<0.31.0"
69-
},
70-
{
71-
"matchBaseBranches": ["release/v1.2"],
72-
"matchDepNames": [
73-
"github.com/rancher/security-scan"
74-
],
75-
"allowedVersions": "<v0.5.0"
76-
},
77-
{
78-
"matchBaseBranches": ["release/v1.1"],
79-
"matchDepNames": [
80-
"k8s.io/api",
81-
"k8s.io/apiextensions-apiserver",
82-
"k8s.io/apimachinery",
83-
"k8s.io/client-go"
84-
],
85-
"allowedVersions": "<0.31.0"
86-
},
87-
{
88-
"matchBaseBranches": ["release/v1.1"],
89-
"matchDepNames": [
90-
"github.com/rancher/security-scan"
91-
],
92-
"allowedVersions": "<v0.4.0"
93-
},
94-
{
95-
"matchBaseBranches": ["release/v1.3"],
96-
"matchDepNames": [
97-
"github.com/prometheus-operator/prometheus-operator/pkg/client",
98-
"github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring"
99-
],
100-
"allowedVersions": "<v0.79.0"
101-
},
102-
{
103-
"matchBaseBranches": [
104-
"release/v1.1",
105-
"release/v1.2"
106-
],
107-
"matchDepNames": [
108-
"github.com/prometheus-operator/prometheus-operator/pkg/client",
109-
"github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring"
110-
],
111-
"allowedVersions": "<v0.75.0"
112-
},
113-
{
114-
"matchBaseBranches": [
115-
"release/v1.1",
116-
"release/v1.2",
117-
"release/v1.3"
118-
],
119-
"matchDepNames": [
120-
"github.com/urfave/cli"
121-
],
122-
"allowedVersions": "<v2.0.0"
123-
},
124-
{
125-
"matchBaseBranches": [
126-
"release/v1.1",
127-
"release/v1.2"
40+
"release/v1.1",
41+
"release/v1.2",
42+
"release/v1.3",
43+
"release/v1.4"
12844
],
129-
"matchDepNames": [
130-
"github.com/rancher/wrangler"
45+
"matchPackageNames": [
46+
"golang.org/x/crypto/x509roots/fallback"
13147
],
132-
"allowedVersions": "<v3.0.1"
48+
"matchUpdateTypes": [
49+
"patch",
50+
"digest"
51+
]
13352
}
134-
]
53+
],
54+
"vulnerabilityAlerts": {
55+
"enabled": true
56+
},
57+
"osvVulnerabilityAlerts": true
13558
}

‎.github/workflows/renovate-vault-backports.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Renovate
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
logLevel:
6+
description: "Override default log level"
7+
required: false
8+
default: "info"
9+
type: string
10+
overrideSchedule:
11+
description: "Override all schedules"
12+
required: false
13+
default: "false"
14+
type: string
15+
16+
permissions:
17+
contents: read
18+
id-token: write
19+
20+
jobs:
21+
call-workflow:
22+
uses: rancher/renovate-config/.github/workflows/renovate-vault.yml@release
23+
with:
24+
logLevel: ${{ inputs.logLevel || 'info' }}
25+
overrideSchedule: ${{ github.event.inputs.overrideSchedule == 'true' && '{''schedule'':null}' || '' }}
26+
renovateConfig: .github/renovate-backports.json
27+
secrets: inherit

‎.github/workflows/renovate-vault.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ on:
1212
required: false
1313
default: "false"
1414
type: string
15-
# Run twice in the early morning (UTC) for initial and follow up steps (create pull request and merge)
1615
schedule:
17-
- cron: '30 4,6 * * *'
16+
# Runs twice on Tuesdays to Thursdays.
17+
- cron: '30 4,6 * * 2-4'
1818

1919
permissions:
2020
contents: read
@@ -26,4 +26,5 @@ jobs:
2626
with:
2727
logLevel: ${{ inputs.logLevel || 'info' }}
2828
overrideSchedule: ${{ github.event.inputs.overrideSchedule == 'true' && '{''schedule'':null}' || '' }}
29+
renovateConfig: .github/renovate-backports.json
2930
secrets: inherit

0 commit comments

Comments
 (0)