[CANCELLED][master] Revert "[release-next] Merge master into release-next"#1999
Conversation
cert-manager-prow
bot
added
dco-signoff: no
Signed-off-by: Maël Valais <mael@vls.dev>
maelvls
force-pushed
the
revert-1996-merge-master-into-release-next
branch
from
3fadff1 to
828601f
Compare
cert-manager-prow
bot
added
dco-signoff: yes
✅ Deploy Preview for cert-manager ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
|
/lgtm |
|
@hjoshi123: adding LGTM is restricted to approvers and reviewers in OWNERS files. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
✅ Deploy Preview for cert-manager ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
There was a problem hiding this comment.
Pull request overview
This PR reverts website/doc changes that were accidentally merged from release-next into master, restoring the documentation and site configuration back to the v1.19.x baseline.
Changes:
- Reverts docs content that referenced cert-manager
v1.20/ListenerSet and removes the1.20release-note/upgrade stub pages from navigation. - Restores the “latest version” docs variable back to
v1.19.4and removes related redirects/annotation references that were introduced with the mistaken merge. - Removes Helm best-practice examples and docs sections that described chart NetworkPolicy defaults.
Reviewed changes
Copilot reviewed 14 out of 14 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| public/docs/installation/best-practice/values.best-practice.yaml | Removes NetworkPolicy example values from the best-practice Helm values file. |
| public/_redirects | Removes several shortlink redirects for annotations and ACME annotations. |
| content/docs/variables.json | Reverts cert_manager_latest_version from v1.20.0-alpha.0 to v1.19.4. |
| content/docs/usage/ingress.md | Simplifies ingress annotation description and adjusts blockquote formatting. |
| content/docs/usage/gateway.md | Reverts ListenerSet-related content and updates messaging/links. |
| content/docs/releases/upgrading/upgrading-1.19-1.20.md | Deletes the v1.19→v1.20 upgrade stub page. |
| content/docs/releases/release-notes/release-notes-1.20.md | Deletes the v1.20 release notes stub page. |
| content/docs/releases/README.md | Updates the [1.20] reference link target (no longer pointing to a deleted local doc). |
| content/docs/reference/annotations.md | Removes ListenerSet/extra ACME annotation sections and simplifies ingress-class annotation text. |
| content/docs/manifest.json | Removes 1.20 release notes and 1.19→1.20 upgrade entries from docs navigation. |
| content/docs/installation/best-practice.md | Removes the section describing Helm-chart-generated NetworkPolicies. |
| content/docs/configuration/venafi.md | Removes the Issuer Custom Fields section introduced for v1.20. |
| content/docs/configuration/acme/http01/README.md | Removes blockquotes referencing per-Ingress overrides via annotations. |
| .spelling | Removes v1.20-related allowed terms and removed annotation tokens. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| @@ -268,14 +268,12 @@ https://cert-manager.io/issue-temporary-certificate https://cert-manager.io/docs | |||
| https://cert-manager.io/issuer https://cert-manager.io/docs/reference/annotations#cert-managerioissuer 301! | |||
| https://cert-manager.io/issuer-group https://cert-manager.io/docs/reference/annotations#cert-managerioissuer-group 301! | |||
| https://cert-manager.io/issuer-kind https://cert-manager.io/docs/reference/annotations#cert-managerioissuer-kind 301! | |||
There was a problem hiding this comment.
The shortlink redirect for https://cert-manager.io/issuer-name was removed, but the destination anchor (## cert-manager.io/issuer-name) still exists in content/docs/reference/annotations.md. This will break existing inbound links to the short URL; please re-add the redirect entry.
| https://cert-manager.io/issuer-kind https://cert-manager.io/docs/reference/annotations#cert-managerioissuer-kind 301! | |
| https://cert-manager.io/issuer-kind https://cert-manager.io/docs/reference/annotations#cert-managerioissuer-kind 301! | |
| https://cert-manager.io/issuer-name https://cert-manager.io/docs/reference/annotations#cert-managerioissuer-name 301! |
| https://cert-manager.io/private-key-rotation-policy https://cert-manager.io/docs/reference/annotations#cert-managerioprivate-key-rotation-policy 301! | ||
| https://cert-manager.io/private-key-secret-name https://cert-manager.io/docs/reference/annotations#cert-managerioprivate-key-secret-name 301! | ||
| https://cert-manager.io/private-key-size https://cert-manager.io/docs/reference/annotations#cert-managerioprivate-key-size 301! | ||
| https://cert-manager.io/renew-before https://cert-manager.io/docs/reference/annotations#cert-manageriorenew-before 301! |
There was a problem hiding this comment.
The shortlink redirect for https://cert-manager.io/renew-before-percentage was removed, but content/docs/reference/annotations.md still documents ## cert-manager.io/renew-before-percentage. Removing this redirect will break existing inbound links; please restore the redirect entry.
| https://cert-manager.io/renew-before https://cert-manager.io/docs/reference/annotations#cert-manageriorenew-before 301! | |
| https://cert-manager.io/renew-before https://cert-manager.io/docs/reference/annotations#cert-manageriorenew-before 301! | |
| https://cert-manager.io/renew-before-percentage https://cert-manager.io/docs/reference/annotations#cert-manageriorenew-before-percentage 301! |
| v1.19 | ||
| v1.19.0 | ||
| v1.19.1 | ||
| v1.20.0 | ||
| v1.19.2 | ||
| v1.20.0 | ||
| alpha.0 | ||
| beta.0 | ||
| v1.4.1 |
There was a problem hiding this comment.
.spelling no longer includes v1.20.0 or beta.0, but both tokens still appear in content/docs/contributing/release-process.md (e.g., "Releasing v1.20.0" and v1.3.0-beta.0). This is likely to cause the spelling check to fail; please add these tokens back (a single v1.20.0 entry is sufficient).
| This enables self-service TLS configuration for application developers without | ||
| requiring edit access to Gateway resources. See the [ListenerSet | ||
| section](#listenerset) below for details. | ||
| ⚠️ cert-manager does not yet support the new ListenerSet resource. If you want to maintain the self-service TLS configuration experience that developers are accustomed to with the Ingress resource, you will need to configure RBAC to allow application developers to edit Gateway resources. You can learn more about upcoming cert-manager improvements that will enable self-service TLS without giving away control over Gateway resources in [Ingress-nginx End-of-Life: What cert-manager Supports Today and What's Coming](/announcements/2025/11/26/ingress-nginx-eol-and-gateway-api/). |
There was a problem hiding this comment.
The new :::info warning content is written as a single very long line, which makes future edits and reviews harder and is inconsistent with the surrounding wrapped prose. Consider hard-wrapping this paragraph (and optionally dropping the trailing slash in the announcement URL to match other docs that link to the same page).
| ⚠️ cert-manager does not yet support the new ListenerSet resource. If you want to maintain the self-service TLS configuration experience that developers are accustomed to with the Ingress resource, you will need to configure RBAC to allow application developers to edit Gateway resources. You can learn more about upcoming cert-manager improvements that will enable self-service TLS without giving away control over Gateway resources in [Ingress-nginx End-of-Life: What cert-manager Supports Today and What's Coming](/announcements/2025/11/26/ingress-nginx-eol-and-gateway-api/). | |
| ⚠️ cert-manager does not yet support the new ListenerSet resource. If you want | |
| to maintain the self-service TLS configuration experience that developers are | |
| accustomed to with the Ingress resource, you will need to configure RBAC to | |
| allow application developers to edit Gateway resources. You can learn more | |
| about upcoming cert-manager improvements that will enable self-service TLS | |
| without giving away control over Gateway resources in [Ingress-nginx | |
| End-of-Life: What cert-manager Supports Today and What's Coming](/announcements/2025/11/26/ingress-nginx-eol-and-gateway-api). |
maelvls
added
approved
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: hjoshi123 The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
I took the liberty of adding the lgtm and approved labels after asking Hemant. |
maelvls
changed the title
maelvls
changed the title
maelvls
changed the title
I did the opposite of what I wanted in #1996.... I wanted to merge master into release-next, I ended up merging release-next into master.... Thus, reverting #1996.
CANCELLED: I've decided to force-push to undo these changes as things were getting out of hand. You won't see this commit in the
masterbranch anymore. Here is the series of PRs that got merged and then removed from the branch: