Skip to content

Commit d978371

Browse files
cert-manager-prow[bot]cert-manager-prow[bot]
authored
Merge pull request #292 from cert-manager/self-upgrade-main
[CI] Self-upgrade merging self-upgrade-main into main
2 parents b219658 + e0ae8a1 commit d978371

File tree

6 files changed

+95
-24
lines changed

6 files changed

+95
-24
lines changed

‎.github/renovate.json5‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
{
55
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
66
enabled: true,
7+
gitAuthor: 'cert-manager-bot <[email protected]>',
78
enabledManagers: [
89
'gomod',
910
],
@@ -39,13 +40,14 @@
3940
],
4041
},
4142
{
42-
groupName: 'Kubernetes Go deps',
43+
groupName: 'Testing Go deps',
4344
matchManagers: [
4445
'gomod',
4546
],
4647
matchPackageNames: [
47-
'sigs.k8s.io**/**',
48-
'k8s.io**/**',
48+
'github.com/onsi/ginkgo**/**',
49+
'github.com/onsi/gomega**/**',
50+
'github.com/stretchr/testify**/**',
4951
],
5052
},
5153
{
@@ -63,6 +65,31 @@
6365
'google.golang.org/api',
6466
],
6567
},
68+
{
69+
groupName: 'Kubernetes Go deps',
70+
matchManagers: [
71+
'gomod',
72+
],
73+
matchPackageNames: [
74+
'sigs.k8s.io**/**',
75+
'k8s.io**/**',
76+
],
77+
},
78+
{
79+
groupName: 'Kubernetes Go patches',
80+
matchManagers: [
81+
'gomod',
82+
],
83+
matchPackageNames: [
84+
'k8s.io**/**',
85+
],
86+
matchUpdateTypes: [
87+
'patch',
88+
],
89+
addLabels: [
90+
'skip-review', // Adding label to allow PRs to automerge
91+
]
92+
},
6693
{
6794
groupName: 'golang.org/x deps',
6895
matchManagers: [

‎.github/workflows/make-self-upgrade.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,6 @@ jobs:
100100
owner,
101101
repo,
102102
issue_number: result.data.number,
103-
labels: ['skip-review']
103+
labels: ['ok-to-test', 'skip-review']
104104
});
105105
}

‎klone.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,45 +10,45 @@ targets:
1010
- folder_name: boilerplate
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: c49d127c34e0222fe24acc0ab0dc3477f0e8e5ba
13+
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
1414
repo_path: modules/boilerplate
1515
- folder_name: cert-manager
1616
repo_url: https://github.com/cert-manager/makefile-modules.git
1717
repo_ref: main
18-
repo_hash: c49d127c34e0222fe24acc0ab0dc3477f0e8e5ba
18+
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
1919
repo_path: modules/cert-manager
2020
- folder_name: executable
2121
repo_url: https://github.com/cert-manager/makefile-modules.git
2222
repo_ref: main
23-
repo_hash: c49d127c34e0222fe24acc0ab0dc3477f0e8e5ba
23+
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
2424
repo_path: modules/executable
2525
- folder_name: generate-verify
2626
repo_url: https://github.com/cert-manager/makefile-modules.git
2727
repo_ref: main
28-
repo_hash: c49d127c34e0222fe24acc0ab0dc3477f0e8e5ba
28+
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
2929
repo_path: modules/generate-verify
3030
- folder_name: go
3131
repo_url: https://github.com/cert-manager/makefile-modules.git
3232
repo_ref: main
33-
repo_hash: c49d127c34e0222fe24acc0ab0dc3477f0e8e5ba
33+
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
3434
repo_path: modules/go
3535
- folder_name: help
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: c49d127c34e0222fe24acc0ab0dc3477f0e8e5ba
38+
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
3939
repo_path: modules/help
4040
- folder_name: klone
4141
repo_url: https://github.com/cert-manager/makefile-modules.git
4242
repo_ref: main
43-
repo_hash: c49d127c34e0222fe24acc0ab0dc3477f0e8e5ba
43+
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
4444
repo_path: modules/klone
4545
- folder_name: repository-base
4646
repo_url: https://github.com/cert-manager/makefile-modules.git
4747
repo_ref: main
48-
repo_hash: c49d127c34e0222fe24acc0ab0dc3477f0e8e5ba
48+
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
4949
repo_path: modules/repository-base
5050
- folder_name: tools
5151
repo_url: https://github.com/cert-manager/makefile-modules.git
5252
repo_ref: main
53-
repo_hash: c49d127c34e0222fe24acc0ab0dc3477f0e8e5ba
53+
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
5454
repo_path: modules/tools

‎make/_shared/repository-base/base-dependabot/.github/renovate.json5‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
{
55
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
66
enabled: true,
7+
gitAuthor: 'cert-manager-bot <[email protected]>',
78
enabledManagers: [
89
'gomod',
910
],
@@ -39,13 +40,14 @@
3940
],
4041
},
4142
{
42-
groupName: 'Kubernetes Go deps',
43+
groupName: 'Testing Go deps',
4344
matchManagers: [
4445
'gomod',
4546
],
4647
matchPackageNames: [
47-
'sigs.k8s.io**/**',
48-
'k8s.io**/**',
48+
'github.com/onsi/ginkgo**/**',
49+
'github.com/onsi/gomega**/**',
50+
'github.com/stretchr/testify**/**',
4951
],
5052
},
5153
{
@@ -63,6 +65,31 @@
6365
'google.golang.org/api',
6466
],
6567
},
68+
{
69+
groupName: 'Kubernetes Go deps',
70+
matchManagers: [
71+
'gomod',
72+
],
73+
matchPackageNames: [
74+
'sigs.k8s.io**/**',
75+
'k8s.io**/**',
76+
],
77+
},
78+
{
79+
groupName: 'Kubernetes Go patches',
80+
matchManagers: [
81+
'gomod',
82+
],
83+
matchPackageNames: [
84+
'k8s.io**/**',
85+
],
86+
matchUpdateTypes: [
87+
'patch',
88+
],
89+
addLabels: [
90+
'skip-review', // Adding label to allow PRs to automerge
91+
]
92+
},
6693
{
6794
groupName: 'golang.org/x deps',
6895
matchManagers: [

‎make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,6 @@ jobs:
100100
owner,
101101
repo,
102102
issue_number: result.data.number,
103-
labels: ['skip-review']
103+
labels: ['ok-to-test', 'skip-review']
104104
});
105105
}

‎make/_shared/tools/00_mod.mk‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ tools += kubectl=v1.33.3
6969
# renovate: datasource=github-releases packageName=kubernetes-sigs/kind
7070
tools += kind=v0.30.0
7171
# https://www.vaultproject.io/downloads
72-
tools += vault=1.20.2
72+
# renovate: datasource=github-releases packageName=hashicorp/vault
73+
tools += vault=v1.20.2
7374
# https://github.com/Azure/azure-workload-identity/releases
7475
# renovate: datasource=github-releases packageName=Azure/azure-workload-identity
7576
tools += azwi=v1.5.1
@@ -84,7 +85,7 @@ tools += yq=v4.47.1
8485
tools += ko=0.18.0
8586
# https://github.com/protocolbuffers/protobuf/releases
8687
# renovate: datasource=github-releases packageName=protocolbuffers/protobuf
87-
tools += protoc=31.1
88+
tools += protoc=32.0
8889
# https://github.com/aquasecurity/trivy/releases
8990
# renovate: datasource=github-releases packageName=aquasecurity/trivy
9091
tools += trivy=v0.65.0
@@ -103,26 +104,36 @@ tools += istioctl=1.27.0
103104
# renovate: datasource=go packageName=sigs.k8s.io/controller-tools
104105
tools += controller-gen=v0.19.0
105106
# https://pkg.go.dev/golang.org/x/tools/cmd/goimports?tab=versions
107+
# renovate: datasource=go packageName=golang.org/x/tools
106108
tools += goimports=v0.35.0
107109
# https://pkg.go.dev/github.com/google/go-licenses/v2?tab=versions
108110
tools += go-licenses=e4be799587800ffd119a1b419f13daf4989da546
109111
# https://pkg.go.dev/gotest.tools/gotestsum?tab=versions
112+
# renovate: datasource=go packageName=gotest.tool/gotestsum
110113
tools += gotestsum=v1.12.3
111114
# https://pkg.go.dev/sigs.k8s.io/kustomize/kustomize/v5?tab=versions
115+
# renovate: datasource=go packageName=sigs.k8s.io/kustomize/kustomize/v5
112116
tools += kustomize=v5.7.1
113117
# https://pkg.go.dev/github.com/itchyny/gojq?tab=versions
118+
# renovate: datasource=go packageName=github.com/itchyny/gojq
114119
tools += gojq=v0.12.17
115120
# https://pkg.go.dev/github.com/google/go-containerregistry/pkg/crane?tab=versions
121+
# renovate: datasource=go packageName=github.com/google/go-containerregistry
116122
tools += crane=v0.20.6
117123
# https://pkg.go.dev/google.golang.org/protobuf/cmd/protoc-gen-go?tab=versions
124+
# renovate: datasource=go packageName=google.golang.org/protobuf
118125
tools += protoc-gen-go=v1.36.7
119126
# https://pkg.go.dev/github.com/sigstore/cosign/v2/cmd/cosign?tab=versions
127+
# renovate: datasource=go packageName=github.com/sigstore/cosign/v2
120128
tools += cosign=v2.5.3
121129
# https://pkg.go.dev/github.com/cert-manager/boilersuite?tab=versions
130+
# renovate: datasource=go packageName=github.com/cert-manager/boilersuite
122131
tools += boilersuite=v0.1.0
123132
# https://pkg.go.dev/github.com/princjef/gomarkdoc/cmd/gomarkdoc?tab=versions
133+
# renovate: datasource=go packageName=github.com/princjef/gomarkdoc
124134
tools += gomarkdoc=v1.1.0
125135
# https://pkg.go.dev/oras.land/oras/cmd/oras?tab=versions
136+
# renovate: datasource=go packageName=oras.land/oras
126137
tools += oras=v1.2.3
127138
# https://pkg.go.dev/github.com/onsi/ginkgo/v2/ginkgo?tab=versions
128139
# The gingko version should be kept in sync with the version used in code.
@@ -132,10 +143,13 @@ tools += oras=v1.2.3
132143
detected_ginkgo_version := $(shell [[ -f go.mod ]] && awk '/ginkgo\/v2/ {print $$2}' go.mod || echo "v2.23.4")
133144
tools += ginkgo=$(detected_ginkgo_version)
134145
# https://pkg.go.dev/github.com/cert-manager/klone?tab=versions
146+
# renovate: datasource=go packageName=github.com/cert-manager/klone
135147
tools += klone=v0.2.0
136148
# https://pkg.go.dev/github.com/goreleaser/goreleaser/v2?tab=versions
149+
# renovate: datasource=go packageName=github.com/goreleaser/goreleaser/v2
137150
tools += goreleaser=v2.11.2
138151
# https://pkg.go.dev/github.com/anchore/syft/cmd/syft?tab=versions
152+
# renovate: datasource=go packageName=github.com/anchore/syft
139153
tools += syft=v1.30.0
140154
# https://github.com/cert-manager/helm-tool/releases
141155
# renovate: datasource=github-releases packageName=cert-manager/helm-tool
@@ -149,13 +163,16 @@ tools += cmctl=v2.3.0
149163
# https://pkg.go.dev/github.com/cert-manager/release/cmd/cmrel?tab=versions
150164
tools += cmrel=e3cbe5171488deda000145003e22567bdce622ea
151165
# https://pkg.go.dev/github.com/golangci/golangci-lint/v2/cmd/golangci-lint?tab=versions
166+
# renovate: datasource=go packageName=github.com/golangci/golangci-lint/v2
152167
tools += golangci-lint=v2.3.0
153168
# https://pkg.go.dev/golang.org/x/vuln?tab=versions
169+
# renovate: datasource=go packageName=golang.org/x/vuln
154170
tools += govulncheck=v1.1.4
155171
# https://github.com/operator-framework/operator-sdk/releases
156172
# renovate: datasource=github-releases packageName=operator-framework/operator-sdk
157173
tools += operator-sdk=v1.41.1
158174
# https://pkg.go.dev/github.com/cli/cli/v2?tab=versions
175+
# renovate: datasource=go packageName=github.com/cli/cli/v2
159176
tools += gh=v2.76.2
160177
# https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases
161178
# renovate: datasource=github-releases packageName=redhat-openshift-ecosystem/openshift-preflight
@@ -473,7 +490,7 @@ vault_darwin_arm64_SHA256SUM=0564747cdc4db1343e17e96ec05c4b69be565052c1ed5377c33
473490
.PRECIOUS: $(DOWNLOAD_DIR)/tools/vault@$(VAULT_VERSION)_$(HOST_OS)_$(HOST_ARCH)
474491
$(DOWNLOAD_DIR)/tools/vault@$(VAULT_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools
475492
@source $(lock_script) $@; \
476-
$(CURL) https://releases.hashicorp.com/vault/$(VAULT_VERSION)/vault_$(VAULT_VERSION)_$(HOST_OS)_$(HOST_ARCH).zip -o $(outfile).zip; \
493+
$(CURL) https://releases.hashicorp.com/vault/$(VAULT_VERSION:v%=%)/vault_$(VAULT_VERSION:v%=%)_$(HOST_OS)_$(HOST_ARCH).zip -o $(outfile).zip; \
477494
$(checkhash_script) $(outfile).zip $(vault_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \
478495
unzip -qq -c $(outfile).zip > $(outfile); \
479496
chmod +x $(outfile); \
@@ -556,10 +573,10 @@ $(DOWNLOAD_DIR)/tools/ko@$(KO_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR
556573
chmod +x $(outfile); \
557574
rm -f $(outfile).tar.gz
558575

559-
protoc_linux_amd64_SHA256SUM=96553041f1a91ea0efee963cb16f462f5985b4d65365f3907414c360044d8065
560-
protoc_linux_arm64_SHA256SUM=6c554de11cea04c56ebf8e45b54434019b1cd85223d4bbd25c282425e306ecc2
561-
protoc_darwin_amd64_SHA256SUM=485e87088b18614c25a99b1c0627918b3ff5b9fde54922fb1c920159fab7ba29
562-
protoc_darwin_arm64_SHA256SUM=4aeea0a34b0992847b03a8489a8dbedf3746de01109b74cc2ce9b6888a901ed9
576+
protoc_linux_amd64_SHA256SUM=7ca037bfe5e5cabd4255ccd21dd265f79eb82d3c010117994f5dc81d2140ee88
577+
protoc_linux_arm64_SHA256SUM=56af3fc2e43a0230802e6fadb621d890ba506c5c17a1ae1070f685fe79ba12d0
578+
protoc_darwin_amd64_SHA256SUM=63eeba15ddc12ab11b0a8bce81fb2d46cc69022c3e6ad21fecde90d52139bff6
579+
protoc_darwin_arm64_SHA256SUM=09a2c729cc821215cc0d4c564b761760961fe338c52f24b302fd7e18e7b675d1
563580

564581
.PRECIOUS: $(DOWNLOAD_DIR)/tools/protoc@$(PROTOC_VERSION)_$(HOST_OS)_$(HOST_ARCH)
565582
$(DOWNLOAD_DIR)/tools/protoc@$(PROTOC_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools

0 commit comments

Comments
 (0)