From e15cdd17742a4e23c9857901a029eb203e32e203 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 25 Oct 2018 15:10:24 -0700 Subject: [PATCH] making corrections per Seb --- .../en/upgrades/upgrades/ha-server-upgrade-helm/_index.md | 6 +++--- .../en/upgrades/upgrades/namespace-migration/_index.md | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md index 7dc410bd5e6..0bcb9627e52 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md @@ -35,7 +35,7 @@ The following instructions will guide you through upgrading a high-availability helm init --upgrade --service-account tiller ``` - **Upgrades to v2.0.7+ only: check system namespace locations** - Starting in v2.0.7, Rancher introduced the `system` project, which is a project that's automatically created to store important namespaces that Kubernetes needs to operate. During upgrade to v2.0.7+, Rancher expects these namespaces to be unassigned from all projects. Before beginning upgrade, check your system namespaces to make sure that they're unassigned to [prevent cluster networking issues]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/namespace-migration/#preventing-cluster-networking-issues). + Starting in v2.0.7, Rancher introduced the `System` project, which is a project that's automatically created to store important namespaces that Kubernetes needs to operate. During upgrade to v2.0.7+, Rancher expects these namespaces to be unassigned from all projects. Before beginning upgrade, check your system namespaces to make sure that they're unassigned to [prevent cluster networking issues]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/namespace-migration/#preventing-cluster-networking-issues). ## Upgrade Rancher @@ -78,11 +78,11 @@ The following instructions will guide you through upgrading a high-availability helm upgrade rancher rancher-/rancher --set hostname=rancher.my.org ``` -**Result:** Rancher is upgraded. Log back into Rancher to confirm that the upgrade succeeded. +**Result:** Rancher is upgraded. Log back into Rancher to confirm that the upgrade succeeded. >**Having Network Issues Following Upgrade?** > -> See [Restoring Cluster Networking]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/namespace-migration/#restoring-cluster-networking). +> See [Restoring Cluster Networking]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/namespace-migration/#restoring-cluster-networking). ## Rolling Back diff --git a/content/rancher/v2.x/en/upgrades/upgrades/namespace-migration/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/namespace-migration/_index.md index 60b58842f73..b51b4bd695a 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/namespace-migration/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/namespace-migration/_index.md @@ -72,14 +72,15 @@ Reset the cluster nodes' network policies to restore connectivity. 1. Before repairing networking, run the following two commands to make sure that your nodes have a status of `Ready` and that your cluster components are `Healthy`. ``` - kubectl get nodes + kubectl get nodes --kubeconfig kube_config_rancher-cluster.yml NAME STATUS ROLES AGE VERSION 165.227.114.63 Ready controlplane,etcd,worker 11m v1.10.1 165.227.116.167 Ready controlplane,etcd,worker 11m v1.10.1 165.227.127.226 Ready controlplane,etcd,worker 11m v1.10.1 - kubectl get cs + kubectl get cs --kubeconfig kube_config_rancher-cluster.yml + NAME STATUS MESSAGE ERROR scheduler Healthy ok controller-manager Healthy ok @@ -115,7 +116,7 @@ Reset the cluster nodes' network policies to restore connectivity. c-59ptz custom false local local false -1. Now remove all `networkpolicies` from system namespaces. Run this command for each cluster, using the kubeconfig generated by RKE. +1. Now remove all network policies from system namespaces. Run this command for each cluster, using the kubeconfig generated by RKE. ``` for namespace in kube-system kube-public cattle-system cattle-alerting cattle-logging cattle-pipeline ingress-nginx; do