Skip to content

conflict: docs: clarify support for Ingress Annotations (#2575) (0f29ac7) #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

conflict: docs: clarify support for Ingress Annotations (#2575) (0f29ac7) #300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/en/latest/upgrade-guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,11 @@ Currently supports networking.k8s.io/v1 only. Support for other Ingress API vers

##### Limited Support for Ingress Annotations

<<<<<<< HEAD
The following Ingress annotations supported in version 1.x.x are not supported in the current version. They will be supported in a future release. If your existing setup relies on any of the following annotations, validate compatibility or consider delaying the upgrade.
=======
The following Ingress annotations supported in version 1.x.x are not supported in the current version (2.0.0-rc*). They will be supported in the 2.0.0 final release. If your existing setup relies on any of the following annotations, validate compatibility or consider delaying the upgrade.
>>>>>>> 0f29ac7b (docs: clarify support for Ingress Annotations (#2575))

| Ingress Annotations |
| ------------------------------------------------------ |
Expand Down