openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Rename kuryr-status to kuryr-k8s-status"

This commit is contained in:
Zuul 2018-11-21 11:51:33 +00:00 committed by Gerrit Code Review
parent 057b2cf1fa aa5ec451f7
commit 95a3928eeb
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
doc/source/installation/upgrades.rst
View File

@ -6,7 +6,7 @@ is possible and safe:
.. code-block:: bash .. code-block:: bash
$ kuryr-status upgrade check $ kuryr-k8s-status upgrade check
+---------------------------------------+ +---------------------------------------+
| Upgrade Check Results | | Upgrade Check Results |
+---------------------------------------+ +---------------------------------------+
@ -24,21 +24,21 @@ Stein (0.6.x) to T (0.7.x) upgrade
In T we want to drop support for old format of Pod annotations (switch was In T we want to drop support for old format of Pod annotations (switch was
motivated by multi-vif support feature implemented in Rocky). To make sure that motivated by multi-vif support feature implemented in Rocky). To make sure that
you don't have unsupported Pod annotations you need to run ``kuryr-status you don't have unsupported Pod annotations you need to run ``kuryr-k8s-status
upgrade check`` utility **before upgrading Kuryr-Kubernetes services to T**. upgrade check`` utility **before upgrading Kuryr-Kubernetes services to T**.
.. note:: .. note::
In case of running Kuryr-Kubernetes containerized you can use ``kubectl In case of running Kuryr-Kubernetes containerized you can use ``kubectl
exec`` to run kuryr-status exec`` to run kuryr-k8s-status
.. code-block:: bash .. code-block:: bash
$ kubectl -n kube-system exec -it <controller-pod-name> kuryr-status upgrade check $ kubectl -n kube-system exec -it <controller-pod-name> kuryr-k8s-status upgrade check
.. code-block:: bash .. code-block:: bash
$ kuryr-status upgrade check $ kuryr-k8s-status upgrade check
+---------------------------------------+ +---------------------------------------+
| Upgrade Check Results | | Upgrade Check Results |
+---------------------------------------+ +---------------------------------------+
@ -48,21 +48,21 @@ upgrade check`` utility **before upgrading Kuryr-Kubernetes services to T**.
+---------------------------------------+ +---------------------------------------+
In case of *Failure* result of *Pod annotations* check you should run In case of *Failure* result of *Pod annotations* check you should run
``kuryr-status upgrade update-annotations`` command and check again: ``kuryr-k8s-status upgrade update-annotations`` command and check again:
.. code-block:: bash .. code-block:: bash
$ kuryr-status upgrade check $ kuryr-k8s-status upgrade check
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Upgrade Check Results | | Upgrade Check Results |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Check: Pod annotations | | Check: Pod annotations |
| Result: Failure | | Result: Failure |
| Details: You have 3 Kuryr pod annotations in old format. You need to | | Details: You have 3 Kuryr pod annotations in old format. You need to |
| run `kuryr-status upgrade update-annotations` | | run `kuryr-k8s-status upgrade update-annotations` |
| before proceeding with the upgrade. | | before proceeding with the upgrade. |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
$ kuryr-status upgrade update-annotations $ kuryr-k8s-status upgrade update-annotations
+-----------------------+--------+ +-----------------------+--------+
| Stat | Number | | Stat | Number |
+-----------------------+--------+ +-----------------------+--------+
@ -72,7 +72,7 @@ In case of *Failure* result of *Pod annotations* check you should run
+-----------------------+--------+ +-----------------------+--------+
| Annotations left | 0 | | Annotations left | 0 |
+-----------------------+--------+ +-----------------------+--------+
$ kuryr-status upgrade check $ kuryr-k8s-status upgrade check
+---------------------------------------+ +---------------------------------------+
| Upgrade Check Results | | Upgrade Check Results |
+---------------------------------------+ +---------------------------------------+
@ -86,4 +86,4 @@ a warning that should be investigated, but isn't blocking upgrading to T
(it won't make things any worse). (it won't make things any worse).
If in any case you need to rollback those changes, there is If in any case you need to rollback those changes, there is
``kuryr-status upgrade downgrade-annotations`` command as well. ``kuryr-k8s-status upgrade downgrade-annotations`` command as well.

8
kuryr_kubernetes/cmd/status.py
View File

@ -51,7 +51,7 @@ UPGRADE_CHECK_MSG_MAP = {
class UpgradeCheckResult(object): class UpgradeCheckResult(object):
"""Class used for 'kuryr-status upgrade check' results. """Class used for 'kuryr-k8s-status upgrade check' results.
The 'code' attribute is an UpgradeCheckCode enum. The 'code' attribute is an UpgradeCheckCode enum.
The 'details' attribute is a message generally only used for The 'details' attribute is a message generally only used for
@ -118,8 +118,8 @@ class UpgradeCommands(object):
return UpgradeCheckResult(1, msg) return UpgradeCheckResult(1, msg)
elif old_count > 0: elif old_count > 0:
msg = ('You have %d Kuryr pod annotations in old format. You need ' msg = ('You have %d Kuryr pod annotations in old format. You need '
'to run `kuryr-status upgrade update-annotations` before ' 'to run `kuryr-k8s-status upgrade update-annotations` '
'proceeding with the upgrade.' % old_count) 'before proceeding with the upgrade.' % old_count)
return UpgradeCheckResult(2, msg) return UpgradeCheckResult(2, msg)
def upgrade_check(self): def upgrade_check(self):
@ -244,7 +244,7 @@ def add_parsers(subparsers):
def main(): def main():
opt = cfg.SubCommandOpt( opt = cfg.SubCommandOpt(
'category', title='command', 'category', title='command',
description='kuryr-status command or category to execute', description='kuryr-k8s-status command or category to execute',
handler=add_parsers) handler=add_parsers)
conf = cfg.ConfigOpts() conf = cfg.ConfigOpts()

4
releasenotes/notes/stein-upgrade-226c8e7b735701ee.yaml
View File

@ -1,6 +1,6 @@
--- ---
upgrade: upgrade:
- | - |
Before upgrading to T (0.7.x) run ``kuryr-status upgrade check`` to check Before upgrading to T (0.7.x) run ``kuryr-k8s-status upgrade check`` to
if upgrade is possible. In case of negative result refer to check if upgrade is possible. In case of negative result refer to
kuryr-kubernetes documentation for mitigation steps. kuryr-kubernetes documentation for mitigation steps.

2
setup.cfg
View File

@ -31,7 +31,7 @@ console_scripts =
kuryr-k8s-controller = kuryr_kubernetes.cmd.eventlet.controller:start kuryr-k8s-controller = kuryr_kubernetes.cmd.eventlet.controller:start
kuryr-daemon = kuryr_kubernetes.cmd.daemon:start kuryr-daemon = kuryr_kubernetes.cmd.daemon:start
kuryr-cni = kuryr_kubernetes.cmd.cni:run kuryr-cni = kuryr_kubernetes.cmd.cni:run
kuryr-status = kuryr_kubernetes.cmd.status:main kuryr-k8s-status = kuryr_kubernetes.cmd.status:main
kuryr_kubernetes.vif_translators = kuryr_kubernetes.vif_translators =
ovs = kuryr_kubernetes.os_vif_util:neutron_to_osvif_vif_ovs ovs = kuryr_kubernetes.os_vif_util:neutron_to_osvif_vif_ovs