From 0a397e5bd2d64c734750f39ea753835a1a951345 Mon Sep 17 00:00:00 2001 From: Dale Bewley Date: Mon, 3 Aug 2020 15:16:34 -0700 Subject: [PATCH 1/4] revise watch of openshift-sdn spindown Explicitely state success of no lingering openshift-sdn pods Use watch command rather than the oc --watch arg, which offers no indication of completion --- modules/nw-ovn-kubernetes-migration.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nw-ovn-kubernetes-migration.adoc b/modules/nw-ovn-kubernetes-migration.adoc index e5f9fb41f275..807c9f7dd193 100644 --- a/modules/nw-ovn-kubernetes-migration.adoc +++ b/modules/nw-ovn-kubernetes-migration.adoc @@ -43,10 +43,10 @@ $ oc patch Network.config.openshift.io cluster \ --type='merge' --patch '{ "spec": { "networkType": "OVNKubernetes" } }' ---- -. To confirm the migration disabled the OpenShift SDN default CNI network provider, enter the following command. It might take several moments for all the OpenShift SDN Pods to stop. +. To confirm the migration disabled the OpenShift SDN default CNI network provider and removed all OpenShift SDN Pods, enter the following command. It might take several moments for all the OpenShift SDN Pods to stop. + ---- -$ oc get pod -n openshift-sdn --watch +$ watch oc get pod -n openshift-sdn ---- . To complete the migration, reboot each node in your cluster. For example, you could use a bash script similar to the following. The script assumes that you can connect to each host by using `ssh` and that you have configured `sudo` to not prompt for a password. From ca27af4a6d8ce6bf5cf5afd939ede5cc5d2b2520 Mon Sep 17 00:00:00 2001 From: Dale Bewley Date: Mon, 3 Aug 2020 15:52:10 -0700 Subject: [PATCH 2/4] more explicit watch of ovn-kubernetes spin down --- modules/nw-ovn-kubernetes-rollback.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nw-ovn-kubernetes-rollback.adoc b/modules/nw-ovn-kubernetes-rollback.adoc index cb63228b8ae0..58e5f33aaf90 100644 --- a/modules/nw-ovn-kubernetes-rollback.adoc +++ b/modules/nw-ovn-kubernetes-rollback.adoc @@ -39,10 +39,10 @@ $ oc patch Network.config.openshift.io cluster \ $ oc edit Network.config.openshift.io cluster ---- -. To confirm that the migration disabled the OVN-Kubernetes default CNI network provider, enter the following command. It might take several moments for all the OVN-Kubernetes Pods to stop. +. To confirm that the migration disabled the OVN-Kubernetes default CNI network provider and removed all the OVN-Kubernetes pods, enter the following command. It might take several moments for all the OVN-Kubernetes Pods to stop. + ---- -$ oc get pod -n openshift-ovn-kubernetes --watch +$ watch oc get pod -n openshift-ovn-kubernetes ---- . To complete the rollback, reboot each node in your cluster. For example, you could use a bash script similar to the following. The script assumes that you can connect to each host by using `ssh` and that you have configured `sudo` to not prompt for a password. From aa43222ea2b0583e983a059c7dd3e4eb9cf28725 Mon Sep 17 00:00:00 2001 From: Vagner Farias Date: Mon, 3 Aug 2020 22:39:49 -0300 Subject: [PATCH 3/4] capture backup of cluster network configuration --- modules/nw-ovn-kubernetes-migration.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nw-ovn-kubernetes-migration.adoc b/modules/nw-ovn-kubernetes-migration.adoc index 807c9f7dd193..0a60d60a2e0b 100644 --- a/modules/nw-ovn-kubernetes-migration.adoc +++ b/modules/nw-ovn-kubernetes-migration.adoc @@ -26,7 +26,7 @@ Perform the migration only when an interruption in service is acceptable. . To backup the configuration for the cluster network, enter the following command: + ---- -$ oc get Network.config.openshift.io cluster -o yaml +$ oc get Network.config.openshift.io cluster -o yaml > cluster-openshift-sdn.yaml ---- . To enable the migration, set an annotation on the Cluster Network Operator configuration object by entering the following command: From d43e97055f50c79f38ababaf1fbd591e50acfb32 Mon Sep 17 00:00:00 2001 From: Dale Bewley Date: Mon, 10 Aug 2020 08:28:00 -0700 Subject: [PATCH 4/4] typos --- modules/nw-ovn-kubernetes-migration.adoc | 2 +- modules/nw-ovn-kubernetes-rollback.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nw-ovn-kubernetes-migration.adoc b/modules/nw-ovn-kubernetes-migration.adoc index 0a60d60a2e0b..eccf57b11f18 100644 --- a/modules/nw-ovn-kubernetes-migration.adoc +++ b/modules/nw-ovn-kubernetes-migration.adoc @@ -26,7 +26,7 @@ Perform the migration only when an interruption in service is acceptable. . To backup the configuration for the cluster network, enter the following command: + ---- -$ oc get Network.config.openshift.io cluster -o yaml > cluster-openshift-sdn.yaml +$ oc get Network.config.openshift.io cluster -o yaml > cluster-openshift-sdn.yaml ---- . To enable the migration, set an annotation on the Cluster Network Operator configuration object by entering the following command: diff --git a/modules/nw-ovn-kubernetes-rollback.adoc b/modules/nw-ovn-kubernetes-rollback.adoc index 58e5f33aaf90..5d6b0cea7e15 100644 --- a/modules/nw-ovn-kubernetes-rollback.adoc +++ b/modules/nw-ovn-kubernetes-rollback.adoc @@ -39,7 +39,7 @@ $ oc patch Network.config.openshift.io cluster \ $ oc edit Network.config.openshift.io cluster ---- -. To confirm that the migration disabled the OVN-Kubernetes default CNI network provider and removed all the OVN-Kubernetes pods, enter the following command. It might take several moments for all the OVN-Kubernetes Pods to stop. +. To confirm that the migration disabled the OVN-Kubernetes default CNI network provider and removed all the OVN-Kubernetes Pods, enter the following command. It might take several moments for all the OVN-Kubernetes Pods to stop. + ---- $ watch oc get pod -n openshift-ovn-kubernetes