Skip to content

Commit c162bbb

Browse files
jeanduplessisjeanduplessis
authored
Merge pull request #37 from upbound/bump-deps
Bump dependencies
2 parents 60d4c08 + dc7e6b7 commit c162bbb

7 files changed

Lines changed: 902 additions & 189 deletions

File tree

‎.github/renovate.json5‎

Lines changed: 130 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -1,139 +1,137 @@
11
{
2-
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": [
4-
"config:base"
2+
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
3+
extends: [
4+
'config:recommended',
5+
'helpers:pinGitHubActionDigests',
6+
':semanticCommits',
57
],
6-
// The maximum number of PRs to be created in parallel
7-
"prConcurrentLimit": 5,
8-
// The branches renovate should target
9-
"baseBranches": ["main"],
10-
"ignorePaths": ["design/**"],
11-
"postUpdateOptions": ["gomodTidy"],
12-
// By default renovate will auto detect whether semantic commits have been used
13-
// in the recent history and comply with that, we explicitly disable it
14-
"semanticCommits": "disabled",
15-
// All PRs should have a label
16-
"labels": ["automated"],
17-
"regexManagers": [
8+
rebaseWhen: 'conflicted',
9+
prConcurrentLimit: 5,
10+
baseBranches: [
11+
'main',
12+
],
13+
ignorePaths: [
14+
'design/**',
15+
],
16+
postUpdateOptions: [
17+
'gomodTidy',
18+
],
19+
labels: [
20+
'automated',
21+
],
22+
customManagers: [
23+
{
24+
customType: 'regex',
25+
description: 'Bump Go version used in workflows',
26+
fileMatch: [
27+
'^\\.github\\/workflows\\/[^/]+\\.ya?ml$',
28+
],
29+
matchStrings: [
30+
"GO_VERSION: '(?<currentValue>.*?)'\\n",
31+
],
32+
datasourceTemplate: 'golang-version',
33+
depNameTemplate: 'golang',
34+
},
35+
{
36+
customType: 'regex',
37+
description: 'Bump golangci-lint version in workflows and the Makefile',
38+
fileMatch: [
39+
'^\\.github\\/workflows\\/[^/]+\\.ya?ml$',
40+
'^Makefile$',
41+
],
42+
matchStrings: [
43+
"GOLANGCI_VERSION: 'v(?<currentValue>.*?)'\\n",
44+
'GOLANGCILINT_VERSION = (?<currentValue>.*?)\\n',
45+
],
46+
datasourceTemplate: 'github-tags',
47+
depNameTemplate: 'golangci/golangci-lint',
48+
extractVersionTemplate: '^v(?<version>.*)$',
49+
},
1850
{
19-
// We want a PR to bump Go versions used through env variables in any Github
20-
// Actions, taking it from the official Github repository.
21-
"fileMatch": ["^\\.github\\/workflows\\/[^/]+\\.ya?ml$"],
22-
"matchStrings": [
23-
"GO_VERSION: '(?<currentValue>.*?)'\\n"
24-
],
25-
"datasourceTemplate": "golang-version",
26-
"depNameTemplate": "golang"
27-
}, {
28-
// We want a PR to bump golangci-lint versions used through env variables in
29-
// any Github Actions, taking it from the official Github repository tags.
30-
"fileMatch": ["^\\.github\\/workflows\\/[^/]+\\.ya?ml$"],
31-
"matchStrings": [
32-
"GOLANGCI_VERSION: '(?<currentValue>.*?)'\\n"
33-
],
34-
"datasourceTemplate": "github-tags",
35-
"depNameTemplate": "golangci/golangci-lint"
36-
}
51+
customType: 'regex',
52+
description: 'Bump helm version in the Makefile',
53+
fileMatch: [
54+
'^Makefile$',
55+
],
56+
matchStrings: [
57+
'HELM3_VERSION = (?<currentValue>.*?)\\n',
58+
],
59+
datasourceTemplate: 'github-tags',
60+
depNameTemplate: 'helm/helm',
61+
},
62+
{
63+
customType: 'regex',
64+
description: 'Bump kind version in the Makefile',
65+
fileMatch: [
66+
'^Makefile$',
67+
],
68+
matchStrings: [
69+
'KIND_VERSION = (?<currentValue>.*?)\\n',
70+
],
71+
datasourceTemplate: 'github-tags',
72+
depNameTemplate: 'kubernetes-sigs/kind',
73+
},
3774
],
38-
// PackageRules disabled below should be enabled in case of vulnerabilities
39-
"vulnerabilityAlerts": {
40-
"enabled": true
75+
vulnerabilityAlerts: {
76+
enabled: true,
4177
},
42-
"packageRules": [
78+
osvVulnerabilityAlerts: true,
79+
packageRules: [
80+
{
81+
description: 'Only get Docker image updates every 2 weeks to reduce noise',
82+
matchDatasources: [
83+
'docker',
84+
],
85+
schedule: [
86+
'every 2 week on monday',
87+
],
88+
enabled: true,
89+
},
90+
{
91+
description: 'Ignore k8s.io/client-go older versions, they switched to semantic version and old tags are still available in the repo',
92+
matchDatasources: [
93+
'go',
94+
],
95+
matchDepNames: [
96+
'k8s.io/client-go',
97+
],
98+
allowedVersions: '<1.0',
99+
},
43100
{
44-
// We need to ignore k8s.io/client-go older versions as they switched to
45-
// semantic version and old tags are still available in the repo.
46-
"matchDatasources": [
47-
"go"
48-
],
49-
"matchDepNames": [
50-
"k8s.io/client-go"
51-
],
52-
"allowedVersions": "<1.0"
53-
}, {
54-
// We want a single PR for all the patches bumps of kubernetes related
55-
// dependencies, as most of the times these are all strictly related.
56-
"matchDatasources": [
57-
"go"
58-
],
59-
"groupName": "kubernetes patches",
60-
"matchUpdateTypes": [
61-
"patch",
62-
"digest"
63-
],
64-
"matchPackagePrefixes": [
65-
"k8s.io",
66-
"sigs.k8s.io"
67-
]
68-
}, {
69-
// We want dedicated PRs for each minor and major bumps to kubernetes related
70-
// dependencies.
71-
"matchDatasources": [
72-
"go"
73-
],
74-
"matchUpdateTypes": [
75-
"major",
76-
"minor"
77-
],
78-
"matchPackagePrefixes": [
79-
"k8s.io",
80-
"sigs.k8s.io"
81-
]
82-
}, {
83-
// We want dedicated PRs for each bump to non-kubernetes Go dependencies, but
84-
// only if there are known vulnerabilities in the current version.
85-
"matchDatasources": [
86-
"go"
87-
],
88-
"matchPackagePatterns": [
89-
"*"
90-
],
91-
"enabled": false,
92-
"excludePackagePrefixes": [
93-
"k8s.io",
94-
"sigs.k8s.io"
95-
],
96-
"matchUpdateTypes": [
97-
"major",
98-
],
99-
}, {
100-
// We want a single PR for all minor and patch bumps to non-kubernetes Go
101-
// dependencies, but only if there are known vulnerabilities in the current
102-
// version.
103-
"matchDatasources": [
104-
"go"
105-
],
106-
"matchPackagePatterns": [
107-
"*"
108-
],
109-
"enabled": false,
110-
"excludePackagePrefixes": [
111-
"k8s.io",
112-
"sigs.k8s.io"
113-
],
114-
"matchUpdateTypes": [
115-
"minor",
116-
"patch",
117-
"digest"
118-
],
119-
"groupName": "all non-major go dependencies"
120-
}, {
121-
// We want a single PR for all minor and patch bumps of Github Actions
122-
"matchDepTypes": [
123-
"action"
124-
],
125-
"matchUpdateTypes": [
126-
"minor",
127-
"patch"
128-
],
129-
"groupName": "all non-major github action",
130-
"pinDigests": true
131-
},{
132-
// We want dedicated PRs for each major bump to Github Actions
133-
"matchDepTypes": [
134-
"action"
135-
],
136-
"pinDigests": true
137-
}
138-
]
101+
description: 'Ignore k8s dependencies, should be updated on crossplane-runtime',
102+
matchDatasources: [
103+
'go',
104+
],
105+
enabled: false,
106+
matchPackageNames: [
107+
'k8s.io{/,}**',
108+
'sigs.k8s.io{/,}**',
109+
],
110+
},
111+
{
112+
description: 'Only get dependency digest updates every month to reduce noise, except crossplane-runtime',
113+
matchDatasources: [
114+
'go',
115+
],
116+
matchUpdateTypes: [
117+
'digest',
118+
],
119+
extends: [
120+
'schedule:monthly',
121+
],
122+
matchPackageNames: [
123+
'!github.com/crossplane/crossplane-runtime',
124+
],
125+
},
126+
{
127+
description: "Ignore oss-fuzz, it's not using tags, we'll stick to master",
128+
matchDepTypes: [
129+
'action',
130+
],
131+
matchDepNames: [
132+
'google/oss-fuzz',
133+
],
134+
enabled: false,
135+
},
136+
],
139137
}

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
workflow_dispatch: {}
1414

1515
env:
16-
GO_VERSION: "1.22"
16+
GO_VERSION: "1.23.7"
1717

1818
jobs:
1919
detect-noop:

‎.github/workflows/uptest-trigger.yaml‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,35 @@ on:
99
types: [created]
1010

1111
env:
12-
GO_VERSION: "1.22"
12+
GO_VERSION: "1.23.7"
1313

1414
jobs:
15-
debug:
15+
check-permissions:
1616
runs-on: ubuntu-latest
17+
outputs:
18+
permission: ${{ steps.check-permissions.outputs.permission }}
1719
steps:
18-
- name: Debug
20+
- name: Get Commenter Permissions
21+
id: check-permissions
1922
run: |
2023
echo "Trigger keyword: '/test-examples'"
2124
echo "Go version: ${{ env.GO_VERSION }}"
22-
echo "github.event.comment.author_association: ${{ github.event.comment.author_association }}"
25+
26+
REPO=${{ github.repository }}
27+
COMMENTER=${{ github.event.comment.user.login }}
28+
29+
# Fetch the commenter's repo-level permission grant
30+
GRANTED=$(curl -s -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
31+
-H "Accept: application/vnd.github.v3+json" \
32+
"https://api.github.com/repos/$REPO/collaborators/$COMMENTER/permission" | jq -r .permission)
33+
34+
# Make it accessible in the workflow via a job output -- cannot use env
35+
echo "User $COMMENTER has $GRANTED permissions"
36+
echo "permission=$GRANTED" >> "$GITHUB_OUTPUT"
2337
2438
get-example-list:
25-
if: ${{ (github.event.comment.author_association == 'OWNER' || github.event.comment.author_association == 'MEMBER' ) &&
26-
github.event.issue.pull_request &&
27-
contains(github.event.comment.body, '/test-examples' ) }}
39+
needs: check-permissions
40+
if: ${{ (needs.check-permissions.outputs.permission == 'admin' || needs.check-permissions.outputs.permission == 'write') && github.event.issue.pull_request != null && contains(github.event.comment.body, '/test-examples')}}
2841
runs-on: ubuntu-latest
2942
outputs:
3043
example_list: ${{ steps.get-example-list-name.outputs.example-list }}
@@ -79,12 +92,11 @@ jobs:
7992
-f context="Uptest-${{ steps.get-example-list-name.outputs.example-hash }}"
8093
8194
uptest:
82-
if: ${{ (github.event.comment.author_association == 'OWNER' || github.event.comment.author_association == 'MEMBER' ) &&
83-
github.event.issue.pull_request &&
84-
contains(github.event.comment.body, '/test-examples' ) }}
95+
needs:
96+
- check-permissions
97+
- get-example-list
98+
if: ${{ (needs.check-permissions.outputs.permission == 'admin' || needs.check-permissions.outputs.permission == 'write') && github.event.issue.pull_request != null && contains(github.event.comment.body, '/test-examples')}}
8599
runs-on: ubuntu-latest
86-
needs: get-example-list
87-
88100
steps:
89101
- name: Cleanup Disk
90102
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1

‎Makefile‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ PLATFORMS ?= linux_amd64 linux_arm64
1010
-include build/makelib/output.mk
1111

1212
# Setup Go
13+
GO_REQUIRED_VERSION ?= 1.23.7
1314
NPROCS ?= 1
1415
# GOLANGCILINT_VERSION is inherited from build submodule by default.
1516
# Uncomment below if you need to override the version.
@@ -26,14 +27,14 @@ GO111MODULE = on
2627

2728
# Uncomment below to override the versions from the build module
2829
# KIND_VERSION = v0.15.0
29-
UP_VERSION = v0.33.0
30-
# UP_CHANNEL = stable
30+
UP_VERSION = v0.38.0
31+
UP_CHANNEL = stable
3132
UPTEST_VERSION = v1.1.2
3233
CROSSPLANE_VERSION = 1.17.1
3334
-include build/makelib/k8s_tools.mk
3435

3536
# Setup Images
36-
REGISTRY_ORGS ?= xpkg.upbound.io/upboundcare
37+
REGISTRY_ORGS ?= xpkg.upbound.io/upbound
3738
IMAGES = provider-opentofu
3839
-include build/makelib/imagelight.mk
3940

@@ -59,10 +60,10 @@ submodules:
5960
# ====================================================================================
6061
# Setup XPKG
6162

62-
XPKG_REG_ORGS ?= xpkg.upbound.io/upboundcare
63+
XPKG_REG_ORGS ?= xpkg.upbound.io/upbound
6364
# NOTE(hasheddan): skip promoting on xpkg.upbound.io as channel tags are
6465
# inferred.
65-
XPKG_REG_ORGS_NO_PROMOTE ?= xpkg.upbound.io/upboundcare
66+
XPKG_REG_ORGS_NO_PROMOTE ?= xpkg.upbound.io/upbound
6667
XPKGS = provider-opentofu
6768
-include build/makelib/xpkg.mk
6869

‎examples/install.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ kind: Provider
1313
metadata:
1414
name: crossplane-provider-opentofu
1515
spec:
16-
package: xpkg.upbound.io/upboundcare/provider-opentofu:v0.2.0
16+
package: xpkg.upbound.io/upbound/provider-opentofu:v0.2.2
1717
controllerConfigRef:
1818
name: opentofu-config

0 commit comments

Comments
 (0)