Merge origin/master into release-next#2201
Merged
cert-manager-prow[bot] merged 19 commits intoJul 8, 2026
Merged
Conversation
Signed-off-by: Yasiru Kassapa <me@yasiru.me>
Signed-off-by: Richard Wall <richard.wall@cyberark.com>
…release-jul08 Delay cert-manager 1.21 release by 1 week
…uides The [[VAR::cert_manager_latest_version]] template variable resolves to the current latest version of cert-manager. When used inside frozen release notes and upgrade guides for older releases, this produces confusing instructions such as "When upgrading to cert-manager 1.19, use the latest patch version: v1.20.3." Replace the variable with static text: - upgrading-1.18-1.19.md: "use the latest patch version of cert-manager 1.19" - release-notes-1.16.md: use `v1.16.x` in the helm template command example - release-notes-1.19.md: "use the latest patch version of cert-manager 1.19" Fixes: cert-manager#2105 Signed-off-by: Richard Wall <richard.wall@cyberark.com>
…r-in-frozen-docs docs: remove dynamic variable from frozen release notes and upgrade guides
Fix copy paste error
Signed-off-by: Renovate Bot <renovate-bot@users.noreply.github.com>
…npm-packages fix(deps): update misc npm packages
Signed-off-by: Renovate Bot <renovate-bot@users.noreply.github.com>
…ile-modules chore(deps): update makefile modules to 6ec965f
Signed-off-by: Renovate Bot <renovate-bot@users.noreply.github.com>
…ile-modules chore(deps): update makefile modules to 1a9e320
Signed-off-by: Renovate Bot <renovate-bot@users.noreply.github.com>
…ile-modules chore(deps): update makefile modules to e18d942
Signed-off-by: Renovate Bot <renovate-bot@users.noreply.github.com>
…ile-modules chore(deps): update makefile modules to 80a790b
Generated by running:
./scripts/freeze-docs 1.20
Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Richard Wall <richard.wall@cyberark.com>
Freeze 1.20 docs
Signed-off-by: Richard Wall <richard.wall@cyberark.com>
cert-manager-prow
Bot
added
dco-signoff: yes
✅ Deploy Preview for cert-manager ready!Built without sensitive environment variables
To edit notification comments on pull requests, go to your Netlify project configuration. |
Member
Author
|
Self approving. |
wallrj-cyberark
added
approved
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: 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 |
cert-manager-prow
Bot
merged commit 1068186
into
cert-manager:release-next
7 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Merge
masterintorelease-nextto resolve conflicts ahead of mergingrelease-nextback intomasterafter the v1.21.0 release.There was one conflict in
content/docs/releases/README.md, in the "Upcoming releases" table. Therelease-nextbranch had already moved v1.21 into the "Currently supported releases" table and added v1.22 as the next upcoming release, whilstmasterstill listed v1.21 as upcoming. The resolution keeps only v1.22 as the upcoming release, since v1.21 is already present in the supported releases table onrelease-next.All other changes from
mastermerged cleanly, including the v1.20-docs freeze, dependency updates, and release note corrections.