Skip to content
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

Jump to bottom

Revert "docs: deprecate native-routing-cidr from v1.10" #16695

Merged
merged 1 commit into from
Jun 30, 2021
Merged

Revert "docs: deprecate native-routing-cidr from v1.10" #16695

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions Documentation/operations/upgrade.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,12 @@ Removed Options
* ``hubble-flow-buffer-size``: This option was deprecated in 1.10 in favor
of ``hubble-event-buffer-capacity``. It is now removed.

Deprecated Options
~~~~~~~~~~~~~~~~~~

* ``native-routing-cidr``: This option has been deprecated in favor of
``ipv4-native-routing-cidr`` and will be removed in 1.12.

.. _1.10_upgrade_notes:

1.10 Upgrade Notes
Expand Down Expand Up @@ -435,8 +441,6 @@ Deprecated Options
``encryption.secretName`` and ``encryption.interface`` are now deprecated in
favor of ``encryption.ipsec.keyFile``, ``encryption.ipsec.mountPath``,
``encryption.ipsec.secretName`` and ``encryption.ipsec.interface``.
* ``native-routing-cidr``: This option has been deprecated in favor of
``ipv4-native-routing-cidr`` and will be removed in 1.12.

.. _1.9_upgrade_notes:

Expand Down