Skip to content

Commit 544d9e0

Browse files
Merge pull request #1780 from cert-manager/master
Sync the release-next branch with master
2 parents ed75687 + 96a1159 commit 544d9e0

File tree

264 files changed

+39552
-4954
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

264 files changed

+39552
-4954
lines changed

.eslintignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

.eslintrc.json

Lines changed: 0 additions & 32 deletions
This file was deleted.
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:cert-manager/website:ref:refs/heads/(main|master)$
6+
7+
permissions:
8+
contents: write
9+
pull_requests: write
10+
workflows: write
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:cert-manager/website: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: 0 additions & 20 deletions
This file was deleted.

.github/renovate.json5

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
3+
extends: [
4+
'github>cert-manager/renovate-config:default.json5',
5+
],
6+
packageRules: [
7+
{
8+
groupName: 'Misc NPM packages',
9+
matchManagers: [
10+
'npm',
11+
],
12+
matchUpdateTypes: [
13+
'minor',
14+
'patch',
15+
],
16+
},
17+
],
18+
}

.github/workflows/check.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ on:
66
pull_request:
77
jobs:
88
pull-cert-manager-website-verify:
9-
runs-on: ubuntu-22.04
9+
runs-on: ubuntu-24.04
1010
steps:
11-
- uses: actions/checkout@v4
12-
- uses: actions/setup-node@v4
11+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
12+
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
1313
with:
14-
node-version: 20
14+
node-version: 22
1515
cache: npm
1616
- run: npm ci
1717
- run: npm run check

.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 == 'cert-manager/website'
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: 'cert-manager/website'
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 == 'cert-manager/website'
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: 'cert-manager/website'
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@f8af9272cd94a4637c29f60dea8731afd3134473 # v43.0.12
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: '[".*"]'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public/feed.*
5050

5151
# IntelliJ
5252
.idea
53+
*.iml
5354

5455
# Our release-process.md tells us to run 'sed' commands that create .bak files.
5556
*.bak

0 commit comments

Comments
 (0)