Skip to content

Commit f56afe2

Browse files
wallrj-cyberarkwallrj-cyberark
committed
upgrade makefile modules to the latest version
- Ran make upgrade-klone - Removed the boilerplate module because none of the files currently have the header - Ran make generate-base Signed-off-by: Richard Wall <[email protected]>
1 parent ab5ad03 commit f56afe2

File tree

25 files changed

+420
-398
lines changed

25 files changed

+420
-398
lines changed

‎.github/chainguard/make-self-upgrade.sts.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
2+
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/chainguard/make-self-upgrade.sts.yaml instead.
3+
4+
issuer: https://token.actions.githubusercontent.com
5+
subject_pattern: ^repo:jetstack/preflight:ref:refs/heads/(main|master)$
6+
7+
permissions:
8+
contents: write
9+
pull_requests: write
10+
workflows: write

‎.github/chainguard/renovate.sts.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
2+
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/chainguard/renovate.sts.yaml instead.
3+
4+
issuer: https://token.actions.githubusercontent.com
5+
subject_pattern: ^repo:jetstack/preflight:ref:refs/heads/(main|master)$
6+
7+
permissions:
8+
administration: read
9+
contents: write
10+
issues: write
11+
pull_requests: write
12+
security_events: read
13+
statuses: write
14+
workflows: write

‎.github/dependabot.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ updates:
99
schedule:
1010
interval: daily
1111
groups:
12-
all:
12+
all-go-deps:
1313
patterns: ["*"]
1414
- package-ecosystem: github-actions
1515
directory: /
1616
schedule:
1717
interval: daily
1818
groups:
19-
all:
19+
all-gh-actions:
2020
patterns: ["*"]

‎.github/renovate.json5‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
3+
extends: [
4+
'github>cert-manager/renovate-config:default.json5',
5+
],
6+
}

‎.github/workflows/govulncheck.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
govulncheck:
2222
runs-on: ubuntu-latest
2323

24-
if: github.repository_owner == 'jetstack'
24+
if: github.repository == 'jetstack/preflight'
2525

2626
steps:
27-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
27+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2828
# Adding `fetch-depth: 0` makes sure tags are also fetched. We need
2929
# the tags so `git describe` returns a valid version.
3030
# see https://github.com/actions/checkout/issues/701 for extra info about this option

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ jobs:
1515
self_upgrade:
1616
runs-on: ubuntu-latest
1717

18-
if: github.repository_owner == 'cert-manager'
18+
if: github.repository == 'jetstack/preflight'
1919

2020
permissions:
21-
contents: write
22-
pull-requests: write
21+
id-token: write
2322

2423
env:
2524
SOURCE_BRANCH: "${{ github.ref_name }}"
@@ -32,17 +31,26 @@ jobs:
3231
echo "This workflow should not be run on a non-branch-head."
3332
exit 1
3433
35-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34+
- name: Octo STS Token Exchange
35+
uses: octo-sts/action@e480437973a6f6ac2e9caa40ecabedc870d76395 # v1.0.1
36+
id: octo-sts
37+
with:
38+
scope: 'jetstack/preflight'
39+
identity: make-self-upgrade
40+
41+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3642
# Adding `fetch-depth: 0` makes sure tags are also fetched. We need
3743
# the tags so `git describe` returns a valid version.
3844
# see https://github.com/actions/checkout/issues/701 for extra info about this option
39-
with: { fetch-depth: 0 }
45+
with:
46+
fetch-depth: 0
47+
token: ${{ steps.octo-sts.outputs.token }}
4048

4149
- id: go-version
4250
run: |
4351
make print-go-version >> "$GITHUB_OUTPUT"
4452
45-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
53+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
4654
with:
4755
go-version: ${{ steps.go-version.outputs.result }}
4856

@@ -73,8 +81,9 @@ jobs:
7381
git push -f origin "$SELF_UPGRADE_BRANCH"
7482
7583
- if: ${{ steps.is-up-to-date.outputs.result != 'true' }}
76-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
84+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
7785
with:
86+
github-token: ${{ steps.octo-sts.outputs.token }}
7887
script: |
7988
const { repo, owner } = context.repo;
8089
const pulls = await github.rest.pulls.list({
@@ -100,6 +109,6 @@ jobs:
100109
owner,
101110
repo,
102111
issue_number: result.data.number,
103-
labels: ['skip-review']
112+
labels: ['ok-to-test', 'skip-review', 'release-note-none', 'kind/cleanup']
104113
});
105114
}

‎.github/workflows/renovate.yaml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
2+
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/workflows/renovate.yaml instead.
3+
4+
name: Renovate
5+
on:
6+
workflow_dispatch: {}
7+
schedule:
8+
- cron: '0 2 * * *'
9+
10+
permissions:
11+
contents: read
12+
13+
jobs:
14+
renovate:
15+
runs-on: ubuntu-latest
16+
17+
if: github.repository == 'jetstack/preflight'
18+
19+
permissions:
20+
id-token: write
21+
22+
steps:
23+
- name: Fail if branch is not head of branch.
24+
if: ${{ !startsWith(github.ref, 'refs/heads/') && env.SOURCE_BRANCH != '' && env.SELF_UPGRADE_BRANCH != '' }}
25+
run: |
26+
echo "This workflow should not be run on a non-branch-head."
27+
exit 1
28+
29+
- name: Octo STS Token Exchange
30+
uses: octo-sts/action@e480437973a6f6ac2e9caa40ecabedc870d76395 # v1.0.1
31+
id: octo-sts
32+
with:
33+
scope: 'jetstack/preflight'
34+
identity: renovate
35+
36+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
37+
# Adding `fetch-depth: 0` makes sure tags are also fetched. We need
38+
# the tags so `git describe` returns a valid version.
39+
# see https://github.com/actions/checkout/issues/701 for extra info about this option
40+
with:
41+
fetch-depth: 0
42+
token: ${{ steps.octo-sts.outputs.token }}
43+
44+
- id: go-version
45+
run: |
46+
make print-go-version >> "$GITHUB_OUTPUT"
47+
48+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
49+
with:
50+
go-version: ${{ steps.go-version.outputs.result }}
51+
52+
- name: Self-hosted Renovate
53+
uses: renovatebot/github-action@7876d7a812254599d262d62b6b2c2706018258a2 # v43.0.10
54+
with:
55+
configurationFile: .github/renovate.json5
56+
token: ${{ steps.octo-sts.outputs.token }}
57+
env:
58+
RENOVATE_REPOSITORIES: '["${{ github.repository }}"]'
59+
RENOVATE_ONBOARDING: "false"
60+
RENOVATE_PLATFORM: "github"
61+
LOG_LEVEL: "debug"
62+
RENOVATE_ALLOWED_COMMANDS: '[".*"]'

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
# For details on some of these "prelude" settings, see:
4040
# https://clarkgrubb.com/makefile-style-guide
4141
MAKEFLAGS += --warn-undefined-variables --no-builtin-rules
42-
SHELL := /usr/bin/env bash
42+
SHELL := /usr/bin/env PS1="" bash
4343
.SHELLFLAGS := -uo pipefail -c
4444
.DEFAULT_GOAL := help
4545
.DELETE_ON_ERROR:

‎klone.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,55 +10,55 @@ targets:
1010
- folder_name: generate-verify
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
13+
repo_hash: c6780c07eac8a92586f59b7e02195c49a94013e6
1414
repo_path: modules/generate-verify
1515
- folder_name: go
1616
repo_url: https://github.com/cert-manager/makefile-modules.git
1717
repo_ref: main
18-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
18+
repo_hash: c6780c07eac8a92586f59b7e02195c49a94013e6
1919
repo_path: modules/go
2020
- folder_name: helm
2121
repo_url: https://github.com/cert-manager/makefile-modules.git
2222
repo_ref: main
23-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
23+
repo_hash: c6780c07eac8a92586f59b7e02195c49a94013e6
2424
repo_path: modules/helm
2525
- folder_name: help
2626
repo_url: https://github.com/cert-manager/makefile-modules.git
2727
repo_ref: main
28-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
28+
repo_hash: c6780c07eac8a92586f59b7e02195c49a94013e6
2929
repo_path: modules/help
3030
- folder_name: kind
3131
repo_url: https://github.com/cert-manager/makefile-modules.git
3232
repo_ref: main
33-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
33+
repo_hash: c6780c07eac8a92586f59b7e02195c49a94013e6
3434
repo_path: modules/kind
3535
- folder_name: klone
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
38+
repo_hash: c6780c07eac8a92586f59b7e02195c49a94013e6
3939
repo_path: modules/klone
4040
- folder_name: licenses
4141
repo_url: https://github.com/cert-manager/makefile-modules.git
4242
repo_ref: main
43-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
43+
repo_hash: c6780c07eac8a92586f59b7e02195c49a94013e6
4444
repo_path: modules/licenses
4545
- folder_name: oci-build
4646
repo_url: https://github.com/cert-manager/makefile-modules.git
4747
repo_ref: main
48-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
48+
repo_hash: c6780c07eac8a92586f59b7e02195c49a94013e6
4949
repo_path: modules/oci-build
5050
- folder_name: oci-publish
5151
repo_url: https://github.com/cert-manager/makefile-modules.git
5252
repo_ref: main
53-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
53+
repo_hash: c6780c07eac8a92586f59b7e02195c49a94013e6
5454
repo_path: modules/oci-publish
5555
- folder_name: repository-base
5656
repo_url: https://github.com/cert-manager/makefile-modules.git
5757
repo_ref: main
58-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
58+
repo_hash: c6780c07eac8a92586f59b7e02195c49a94013e6
5959
repo_path: modules/repository-base
6060
- folder_name: tools
6161
repo_url: https://github.com/cert-manager/makefile-modules.git
6262
repo_ref: main
63-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
63+
repo_hash: c6780c07eac8a92586f59b7e02195c49a94013e6
6464
repo_path: modules/tools

‎make/00_mod.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ helm_chart_image_name := quay.io/jetstack/charts/venafi-kubernetes-agent
4242
helm_chart_version := $(VERSION)
4343
helm_labels_template_name := preflight.labels
4444

45-
# We skip using the upstream govulncheck targets because we need to customise the workflow YAML
45+
# We skip using the upstream govulncheck generate target because we need to customise the workflow YAML
4646
# locally. We provide the targets in this repo instead, and manually maintain the workflow.
47-
govulncheck_skip := true
47+
dont_generate_govulncheck := true
4848

4949
helm_image_name ?= $(oci_preflight_image_name)
5050
helm_image_tag ?= $(oci_preflight_image_tag)

0 commit comments

Comments
 (0)