Skip to content

Commit 2a82848

Browse files
inteoninteon
committed
Run 'make upgrade-klone' and 'make generate'
Signed-off-by: Tim Ramlot <[email protected]>
1 parent 44d9065 commit 2a82848

File tree

17 files changed

+174
-141
lines changed

17 files changed

+174
-141
lines changed

‎.github/dependabot.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
2-
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/dependabot.yaml instead.
2+
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base-dependabot/.github/dependabot.yaml instead.
33

44
# Update Go dependencies and GitHub Actions dependencies daily.
55
version: 2

‎.github/workflows/govulncheck.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,21 @@ on:
1010
schedule:
1111
- cron: '0 0 * * *'
1212

13+
permissions:
14+
contents: read
15+
1316
jobs:
1417
govulncheck:
1518
runs-on: ubuntu-latest
1619

1720
steps:
18-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
1922

2023
- id: go-version
2124
run: |
2225
make print-go-version >> "$GITHUB_OUTPUT"
2326
24-
- uses: actions/setup-go@v5
27+
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
2528
with:
2629
go-version: ${{ steps.go-version.outputs.result }}
2730

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

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@ on:
88
schedule:
99
- cron: '0 0 * * *'
1010

11+
permissions:
12+
contents: read
13+
1114
jobs:
1215
self_upgrade:
1316
runs-on: ubuntu-latest
1417

18+
if: github.repository_owner == 'cert-manager'
19+
1520
permissions:
1621
contents: write
1722
pull-requests: write
@@ -27,13 +32,13 @@ jobs:
2732
echo "This workflow should not be run on a non-branch-head."
2833
exit 1
2934
30-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3136

3237
- id: go-version
3338
run: |
3439
make print-go-version >> "$GITHUB_OUTPUT"
3540
36-
- uses: actions/setup-go@v5
41+
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
3742
with:
3843
go-version: ${{ steps.go-version.outputs.result }}
3944

@@ -64,7 +69,7 @@ jobs:
6469
git push -f origin "$SELF_UPGRADE_BRANCH"
6570
6671
- if: ${{ steps.is-up-to-date.outputs.result != 'true' }}
67-
uses: actions/github-script@v7
72+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
6873
with:
6974
script: |
7075
const { repo, owner } = context.repo;
@@ -77,7 +82,7 @@ jobs:
7782
});
7883
7984
if (pulls.data.length < 1) {
80-
await github.rest.pulls.create({
85+
const result = await github.rest.pulls.create({
8186
title: '[CI] Merge ' + process.env.SELF_UPGRADE_BRANCH + ' into ' + process.env.SOURCE_BRANCH,
8287
owner: owner,
8388
repo: repo,
@@ -87,4 +92,10 @@ jobs:
8792
'This PR is auto-generated to bump the Makefile modules.',
8893
].join('\n'),
8994
});
95+
await github.rest.issues.addLabels({
96+
owner,
97+
repo,
98+
issue_number: result.data.number,
99+
labels: ['skip-review']
100+
});
90101
}

‎.golangci.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,15 @@ linters:
1717
- bidichk
1818
- bodyclose
1919
- contextcheck
20+
- copyloopvar
2021
- decorder
2122
- dogsled
2223
- dupword
2324
- durationcheck
2425
- errcheck
2526
- errchkjson
2627
- errname
27-
- execinquery
2828
- exhaustive
29-
- exportloopref
3029
- forbidigo
3130
- gci
3231
- ginkgolinter

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
##################################
3131

3232
# Some modules build their dependencies from variables, we want these to be
33-
# evalutated at the last possible moment. For this we use second expansion to
33+
# evaluated at the last possible moment. For this we use second expansion to
3434
# re-evaluate the generate and verify targets a second time.
3535
#
3636
# See https://www.gnu.org/software/make/manual/html_node/Secondary-Expansion.html

‎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: 652f41ca2a789690977902191af89b423482853f
13+
repo_hash: 43af254fa25ae30453a9ffe63cd37feab130917c
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: 652f41ca2a789690977902191af89b423482853f
18+
repo_hash: 43af254fa25ae30453a9ffe63cd37feab130917c
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: 652f41ca2a789690977902191af89b423482853f
23+
repo_hash: 43af254fa25ae30453a9ffe63cd37feab130917c
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: 652f41ca2a789690977902191af89b423482853f
28+
repo_hash: 43af254fa25ae30453a9ffe63cd37feab130917c
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: 652f41ca2a789690977902191af89b423482853f
33+
repo_hash: 43af254fa25ae30453a9ffe63cd37feab130917c
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: 652f41ca2a789690977902191af89b423482853f
38+
repo_hash: 43af254fa25ae30453a9ffe63cd37feab130917c
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: 652f41ca2a789690977902191af89b423482853f
43+
repo_hash: 43af254fa25ae30453a9ffe63cd37feab130917c
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: 652f41ca2a789690977902191af89b423482853f
48+
repo_hash: 43af254fa25ae30453a9ffe63cd37feab130917c
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: 652f41ca2a789690977902191af89b423482853f
53+
repo_hash: 43af254fa25ae30453a9ffe63cd37feab130917c
5454
repo_path: modules/tools

‎make/_shared/cert-manager/00_mod.mk‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
images_amd64 ?=
1616
images_arm64 ?=
1717

18-
cert_manager_version := v1.15.0
18+
cert_manager_version := v1.16.0
1919

20-
images_amd64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:9b5d5e9c0fd4944221d059921cc05f388c9a5fc0b02a60b47f0eccfcd8243331
21-
images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:edb1c1e0083ee4cd8e2ccb296ee0f436d2e465ecf90159f9d03141fc19bd3c23
22-
images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:85df7b64a3d66de3cd7995ae0f2151b54fd18db424cb7cf84d3bd6d4a39d975f
23-
images_amd64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:6365e940a5a913a3aeca0ea519102236d9bec5f0e8f0011fa3498c26d18348e5
20+
images_amd64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:b45df0d537a7a8ef2d968bd2621547dd43d93230a5b12a89cf496a081db2edd3
21+
images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:13d60b82759fec353c5c35280b902bf3f3c8680b471501792b62a7db2ef706e1
22+
images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:a98cc73669ed5e3220a064732649c541b4d2c272327271f63f9129a6f234ca63
23+
images_amd64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:42b5c24cdf9fb68ccc4de4854e0336ac9e05bfacbd4c6ad9b85787db2e73c646
2424

25-
images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:716c154f0eecb381d5f63ba78ee1dd0cce4b57dbe15cbbc121f7e8b1071e6268
26-
images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:59cbf06f489a7bb2c859296fa32ac7fcfd315c3f2e802be7805b598303b6cef5
27-
images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:039c83b5b081d519e9152c19aedd1c7c17daa09187d1ad21df6689da342bb5b7
28-
images_arm64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:b2d5b00de8b1de6051c02a3f82cfa4ee617210ef1db5c295440e9a2d2069e547
25+
images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:af089c67364f0ed282cb11b3994bea7bfa485d75a7b019c2c532ea118455f49b
26+
images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:53a5206399898f2f754d45943211a38bdd82a23beb7f3ce33c30950117c95ebc
27+
images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:f8f633a1fe9089375e1c0debd5e7b1672ac740f2294453a37863a3d0b6d0a1cc
28+
images_arm64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:9ab84f036989c71d531882acb3549799265e7f04b5fb719f4fd1bce6f9e2c9b0

‎make/_shared/generate-verify/02_mod.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
## Generate all generate targets.
1717
## @category [shared] Generate/ Verify
1818
generate: $$(shared_generate_targets)
19-
@echo "The following targets cannot be run simultaniously with each other or other generate scripts:"
19+
@echo "The following targets cannot be run simultaneously with each other or other generate scripts:"
2020
$(foreach TARGET,$(shared_generate_targets_dirty), $(MAKE) $(TARGET))
2121

2222
verify_script := $(dir $(lastword $(MAKEFILE_LIST)))/util/verify.sh

‎make/_shared/generate-verify/util/verify.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ if ! diff \
5858
then
5959
echo
6060
echo "Project '${projectdir}' is out of date."
61-
echo "Please run '${*}'"
61+
echo "Please run '${*}' or apply the above diffs"
6262
exit 1
6363
fi

‎make/_shared/go/.golangci.override.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@ linters:
77
- bidichk
88
- bodyclose
99
- contextcheck
10+
- copyloopvar
1011
- decorder
1112
- dogsled
1213
- dupword
1314
- durationcheck
1415
- errcheck
1516
- errchkjson
1617
- errname
17-
- execinquery
1818
- exhaustive
19-
- exportloopref
2019
- forbidigo
2120
- gci
2221
- ginkgolinter

0 commit comments

Comments
 (0)