Skip to content

Commit 4fcfad1

Browse files
Merge pull request #1832 from cert-manager/master
Sync the release-next branch with master
2 parents 342db6a + c78c264 commit 4fcfad1

File tree

142 files changed

+31822
-298
lines changed

Some content is hidden

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

142 files changed

+31822
-298
lines changed

.devcontainer/devcontainer.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"name": "cert-manager Website Dev",
3+
"image": "mcr.microsoft.com/devcontainers/javascript-node:24",
4+
5+
"postCreateCommand": "npm ci && npm install -g netlify-cli",
6+
7+
"forwardPorts": [3000],
8+
9+
"customizations": {
10+
"vscode": {
11+
"extensions": [
12+
"dbaeumer.vscode-eslint",
13+
"esbenp.prettier-vscode",
14+
"yzhang.markdown-all-in-one"
15+
]
16+
}
17+
}
18+
}

.github/workflows/check.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
runs-on: ubuntu-24.04
1010
steps:
1111
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
12-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
12+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
1313
with:
14-
node-version: 22
14+
node-version: 24
1515
cache: npm
1616
- run: npm ci
1717
- run: npm run check

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
exit 1
3333
3434
- name: Octo STS Token Exchange
35-
uses: octo-sts/action@e480437973a6f6ac2e9caa40ecabedc870d76395 # v1.0.1
35+
uses: octo-sts/action@d6c70ad3b9ac85df6da6b9749014d7283987cfec # v1.0.3
3636
id: octo-sts
3737
with:
3838
scope: 'cert-manager/website'

.github/workflows/renovate.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
exit 1
2828
2929
- name: Octo STS Token Exchange
30-
uses: octo-sts/action@e480437973a6f6ac2e9caa40ecabedc870d76395 # v1.0.1
30+
uses: octo-sts/action@d6c70ad3b9ac85df6da6b9749014d7283987cfec # v1.0.3
3131
id: octo-sts
3232
with:
3333
scope: 'cert-manager/website'
@@ -50,7 +50,7 @@ jobs:
5050
go-version: ${{ steps.go-version.outputs.result }}
5151

5252
- name: Self-hosted Renovate
53-
uses: renovatebot/github-action@f8af9272cd94a4637c29f60dea8731afd3134473 # v43.0.12
53+
uses: renovatebot/github-action@a3c115cd6676c8a5bc72f9715f108759e570daf5 # v43.0.19
5454
with:
5555
configurationFile: .github/renovate.json5
5656
token: ${{ steps.octo-sts.outputs.token }}

.spelling

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,7 @@ v1.18.0
586586
v1.18.0.
587587
v1.19
588588
v1.19.0
589+
v1.19.1
589590
alpha.0
590591
v1.5
591592
v1.5.0

README.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,23 @@ npm ci
141141

142142
This command is similar to `npm install` but it ensures that you will have a clean install of all the dependencies.
143143

144+
### Devcontainer (optional)
145+
146+
The repository includes a ready-to-use **devcontainer** for VS Code Dev Containers or GitHub Codespaces.
147+
This provides a fully configured development environment with all required tools and dependencies,
148+
so you can start working on the website without installing anything on your local machine.
149+
150+
**Usage:**
151+
152+
1. Open the repository in VS Code.
153+
2. When prompted, select **"Reopen in Container"** (or run **Dev Containers: Reopen in Container** from the command palette).
154+
3. Once the container is built, use the integrated terminal to run:
155+
156+
```bash
157+
./scripts/server # start the local development server
158+
./scripts/verify # run lint, link-check, spell-check, etc.
159+
```
160+
144161
### Development Server
145162

146163
The best development environment uses the Netlify CLI to serve the site locally. The Netlify CLI server

components/docs/VersionSelect.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export default function VersionSelect({
2323
return compareVersions(labelFromVersion(first), labelFromVersion(second))
2424
})
2525
.reverse()
26+
.slice(0, 2) // Only show the last two releases in the dropdown list
2627

2728
return (
2829
<div className="bg-gray-1 rounded-md border-2 border-gray-2/50">

content/docs/configuration/acme/http01/README.md

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,10 @@ By default, type `NodePort` will be used when you don't set HTTP01 or when you s
125125
You may wish to change or add to the labels and annotations of solver pods.
126126
These can be configured under the `metadata` field under `podTemplate`.
127127

128-
Similarly, you can set the `nodeSelector`, tolerations and affinity of solver
129-
pods by configuring under the `spec` field of the `podTemplate`. No other
130-
spec fields can be edited.
128+
Similarly, you can set the `nodeSelector`, `tolerations`, `affinity`,
129+
`priorityClassName`, `serviceAccountName`, `securityContext`, `imagePullSecrets`
130+
and `resources` of solver pods by configuring under the `spec` field of
131+
the `podTemplate`. No other spec fields can be edited.
131132

132133
An example of how you could configure the template is as so:
133134

@@ -152,12 +153,25 @@ spec:
152153
spec:
153154
nodeSelector:
154155
bar: baz
156+
resources:
157+
requests:
158+
cpu: 20m
159+
memory: 32Mi
160+
limits:
161+
cpu: 150m
162+
memory: 64Mi
155163
```
156164

157165
The added labels and annotations will merge on top of the cert-manager defaults,
158166
overriding entries with the same key.
159167

160-
No other fields of the `podTemplate` exist.
168+
The resources configuration **overrides** the global defaults (configured via controller flags
169+
`--acme-http01-solver-resource-*`) for the specific Issuer, enabling granular resource management
170+
in multi-tenant or restricted policy scenarios.
171+
172+
> Note that when only specifying resource limits, ensure they are greater than or equal to the
173+
> corresponding global resource requests configured via controller flags. Kubernetes will reject
174+
> pod creation if limits are lower than requests, causing challenge failures.
161175

162176
### `ingressTemplate`
163177

content/docs/installation/helm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ appVersion: "0.1.0"
122122
dependencies:
123123
- name: cert-manager
124124
version: [[VAR::cert_manager_latest_version]]
125-
repository: https://charts.jetstack.io
125+
repository: oci://quay.io/jetstack/charts
126126
alias: cert-manager
127127
condition: cert-manager.enabled
128128
```

content/docs/manifest.json

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,6 @@
3636
"title": "Upgrade 1.17 to 1.18",
3737
"path": "/docs/releases/upgrading/upgrading-1.17-1.18.md"
3838
},
39-
{
40-
"title": "1.17",
41-
"path": "/docs/releases/release-notes/release-notes-1.17.md"
42-
},
43-
{
44-
"title": "Upgrade 1.16 to 1.17",
45-
"path": "/docs/releases/upgrading/upgrading-1.16-1.17.md"
46-
},
47-
{
48-
"title": "1.16",
49-
"path": "/docs/releases/release-notes/release-notes-1.16.md"
50-
},
51-
{
52-
"title": "Upgrading from 1.12",
53-
"path": "/docs/releases/upgrading/upgrading-1.12.md"
54-
},
55-
{
56-
"title": "1.12",
57-
"path": "/docs/releases/release-notes/release-notes-1.12.md"
58-
},
5939
{
6040
"title": "Older releases",
6141
"routes": [
@@ -67,6 +47,18 @@
6747
"title": "Migrating Deprecated API Resources",
6848
"path": "/docs/releases/upgrading/remove-deprecated-apis.md"
6949
},
50+
{
51+
"title": "1.17",
52+
"path": "/docs/releases/release-notes/release-notes-1.17.md"
53+
},
54+
{
55+
"title": "Upgrade 1.16 to 1.17",
56+
"path": "/docs/releases/upgrading/upgrading-1.16-1.17.md"
57+
},
58+
{
59+
"title": "1.16",
60+
"path": "/docs/releases/release-notes/release-notes-1.16.md"
61+
},
7062
{
7163
"title": "Upgrade 1.15 to 1.16",
7264
"path": "/docs/releases/upgrading/upgrading-1.15-1.16.md"
@@ -91,6 +83,15 @@
9183
"title": "1.13",
9284
"path": "/docs/releases/release-notes/release-notes-1.13.md"
9385
},
86+
{
87+
"title": "Upgrading from 1.12",
88+
"path": "/docs/releases/upgrading/upgrading-1.12.md"
89+
},
90+
{
91+
"title": "1.12",
92+
"path": "/docs/releases/release-notes/release-notes-1.12.md"
93+
},
94+
9495
{
9596
"title": "Upgrade 1.11 to 1.12",
9697
"path": "/docs/releases/upgrading/upgrading-1.11-1.12.md"

0 commit comments

Comments
 (0)