From 0ce8f4729f2ee8d15f66890567bb413962a18510 Mon Sep 17 00:00:00 2001 From: Barbara McKercher Date: Thu, 6 Jul 2023 15:06:12 -0700 Subject: [PATCH] DOCS-1547-Upgrade-failing --- .../upgrading/kubernetes-upgrade.mdx | 32 +++++++++---------- .../upgrading/kubernetes-upgrade.mdx | 29 ++++++++--------- .../upgrading/kubernetes-upgrade.mdx | 28 ++++++++-------- 3 files changed, 42 insertions(+), 47 deletions(-) diff --git a/calico/operations/upgrading/kubernetes-upgrade.mdx b/calico/operations/upgrading/kubernetes-upgrade.mdx index 3c58eec6a4..bffd83fd60 100644 --- a/calico/operations/upgrading/kubernetes-upgrade.mdx +++ b/calico/operations/upgrading/kubernetes-upgrade.mdx @@ -56,7 +56,7 @@ ownership of the helm resources to the new chart location. 1. Apply the {{version}} CRDs: ```bash - kubectl apply --server-side --force-conflicts -f {{manifestsUrl}}/manifests/operator-crds.yaml + kubectl apply --server-side --force-conflicts -f {{manifestsURL}}/manifests/operator-crds.yaml ``` 1. Install the helm chart in the `tigera-operator` namespace. @@ -83,7 +83,7 @@ the output and then re-running the command without --dry-run to commit to the ch 1. Apply the {{version}} CRDs: ```bash - kubectl apply --server-side --force-conflicts -f {{manifestsUrl}}/manifests/operator-crds.yaml + kubectl apply --server-side --force-conflicts -f {{manifestsURL}}/manifests/operator-crds.yaml ``` 1. Run the helm upgrade: @@ -113,19 +113,19 @@ the output and then re-running the command without --dry-run to commit to the ch **{{prodname}} for policy and networking** ```bash - curl {{manifestsUrl}}/manifests/calico.yaml -O + curl {{manifestsURL}}/manifests/calico.yaml -o upgrade.yaml ``` **{{prodname}} for policy and flannel for networking** ```bash - curl {{manifestsUrl}}/manifests/canal.yaml -O + curl {{manifestsURL}}/manifests/canal.yaml -o upgrade.yaml ``` **{{prodname}} for policy (advanced)** ```bash - curl {{manifestsUrl}}/manifests/calico-policy-only.yaml -O + curl {{manifestsURL}}/manifests/calico-policy-only.yaml -o upgrade.yaml ``` :::note @@ -135,16 +135,15 @@ the output and then re-running the command without --dry-run to commit to the ch ::: -1. Use the following command to initiate a rolling update, after replacing - `` with the file name of your {{version}} manifest. +1. Use the following command to initiate a rolling update. - ``` - kubectl replace -f + ```bash + kubectl apply --server-side --force-conflicts -f upgrade.yaml ``` 1. Watch the status of the upgrade as follows. - ``` + ```bash watch kubectl get pods -n kube-system ``` @@ -182,13 +181,13 @@ the output and then re-running the command without --dry-run to commit to the ch **{{prodname}} for policy and networking** ```bash - curl {{manifestsUrl}}/manifests/calico-etcd.yaml -O + curl {{manifestsUrl}}/manifests/calico-etcd.yaml -o upgrade.yaml ``` **{{prodname}} for policy and flannel for networking** ```bash - curl {{manifestsUrl}}/manifests/canal-etcd.yaml -O + curl {{manifestsUrl}}/manifests/canal-etcd.yaml -o upgrade.yaml ``` :::note @@ -199,16 +198,15 @@ the output and then re-running the command without --dry-run to commit to the ch ::: -1. Use the following command to initiate a rolling update, after replacing - `` with the file name of your {{version}} manifest. +1. Use the following command to initiate a rolling update. - ``` - kubectl apply -f + ```bash + kubectl apply --server-side --force-conflicts -f upgrade.yaml ``` 1. Watch the status of the upgrade as follows. - ``` + ```bash watch kubectl get pods -n kube-system ``` diff --git a/calico_versioned_docs/version-3.25/operations/upgrading/kubernetes-upgrade.mdx b/calico_versioned_docs/version-3.25/operations/upgrading/kubernetes-upgrade.mdx index 3c58eec6a4..69cd619bb3 100644 --- a/calico_versioned_docs/version-3.25/operations/upgrading/kubernetes-upgrade.mdx +++ b/calico_versioned_docs/version-3.25/operations/upgrading/kubernetes-upgrade.mdx @@ -113,19 +113,19 @@ the output and then re-running the command without --dry-run to commit to the ch **{{prodname}} for policy and networking** ```bash - curl {{manifestsUrl}}/manifests/calico.yaml -O + curl {{manifestsUrl}}/manifests/calico.yaml -o upgrade.yaml ``` **{{prodname}} for policy and flannel for networking** ```bash - curl {{manifestsUrl}}/manifests/canal.yaml -O + curl {{manifestsUrl}}/manifests/canal.yaml -o upgrade.yaml ``` **{{prodname}} for policy (advanced)** ```bash - curl {{manifestsUrl}}/manifests/calico-policy-only.yaml -O + curl {{manifestsUrl}}/manifests/calico-policy-only.yaml -o upgrade.yaml ``` :::note @@ -135,22 +135,21 @@ the output and then re-running the command without --dry-run to commit to the ch ::: -1. Use the following command to initiate a rolling update, after replacing - `` with the file name of your {{version}} manifest. +1. Use the following command to initiate a rolling update. - ``` - kubectl replace -f + ```bash + kubectl apply --server-side --force-conflicts -f upgrade.yaml ``` 1. Watch the status of the upgrade as follows. - ``` + ```bash watch kubectl get pods -n kube-system ``` Verify that the status of all {{prodname}} pods indicate `Running`. - ``` + ```bash {{noderunning}}-hvvg8 2/2 Running 0 3m {{noderunning}}-vm8kh 2/2 Running 0 3m {{noderunning}}-w92wk 2/2 Running 0 3m @@ -182,13 +181,13 @@ the output and then re-running the command without --dry-run to commit to the ch **{{prodname}} for policy and networking** ```bash - curl {{manifestsUrl}}/manifests/calico-etcd.yaml -O + curl {{manifestsUrl}}/manifests/calico-etcd.yaml -o upgrade.yaml ``` **{{prodname}} for policy and flannel for networking** ```bash - curl {{manifestsUrl}}/manifests/canal-etcd.yaml -O + curl {{manifestsUrl}}/manifests/canal-etcd.yaml -o upgrade.yaml ``` :::note @@ -199,15 +198,15 @@ the output and then re-running the command without --dry-run to commit to the ch ::: -1. Use the following command to initiate a rolling update, after replacing - `` with the file name of your {{version}} manifest. +1. Use the following command to initiate a rolling update. - ``` - kubectl apply -f + ```bash + kubectl apply --server-side --force-conflicts -f upgrade.yaml ``` 1. Watch the status of the upgrade as follows. + bash ``` watch kubectl get pods -n kube-system ``` diff --git a/calico_versioned_docs/version-3.26/operations/upgrading/kubernetes-upgrade.mdx b/calico_versioned_docs/version-3.26/operations/upgrading/kubernetes-upgrade.mdx index 3c58eec6a4..961b73d6f3 100644 --- a/calico_versioned_docs/version-3.26/operations/upgrading/kubernetes-upgrade.mdx +++ b/calico_versioned_docs/version-3.26/operations/upgrading/kubernetes-upgrade.mdx @@ -113,19 +113,19 @@ the output and then re-running the command without --dry-run to commit to the ch **{{prodname}} for policy and networking** ```bash - curl {{manifestsUrl}}/manifests/calico.yaml -O + curl {{manifestsUrl}}/manifests/calico.yaml -o upgrade.yaml ``` **{{prodname}} for policy and flannel for networking** ```bash - curl {{manifestsUrl}}/manifests/canal.yaml -O + curl {{manifestsUrl}}/manifests/canal.yaml -o upgrade.yaml ``` **{{prodname}} for policy (advanced)** ```bash - curl {{manifestsUrl}}/manifests/calico-policy-only.yaml -O + curl {{manifestsUrl}}/manifests/calico-policy-only.yaml -o upgrade.yaml ``` :::note @@ -135,16 +135,15 @@ the output and then re-running the command without --dry-run to commit to the ch ::: -1. Use the following command to initiate a rolling update, after replacing - `` with the file name of your {{version}} manifest. +1. Use the following command to initiate a rolling update. - ``` - kubectl replace -f + ```bash + kubectl apply --server-side --force-conflicts -f upgrade.yaml ``` 1. Watch the status of the upgrade as follows. - ``` + ```bash watch kubectl get pods -n kube-system ``` @@ -182,13 +181,13 @@ the output and then re-running the command without --dry-run to commit to the ch **{{prodname}} for policy and networking** ```bash - curl {{manifestsUrl}}/manifests/calico-etcd.yaml -O + curl {{manifestsUrl}}/manifests/calico-etcd.yaml -o upgrade.yaml ``` **{{prodname}} for policy and flannel for networking** ```bash - curl {{manifestsUrl}}/manifests/canal-etcd.yaml -O + curl {{manifestsUrl}}/manifests/canal-etcd.yaml -o upgrade.yaml ``` :::note @@ -199,16 +198,15 @@ the output and then re-running the command without --dry-run to commit to the ch ::: -1. Use the following command to initiate a rolling update, after replacing - `` with the file name of your {{version}} manifest. +1. Use the following command to initiate a rolling update. - ``` - kubectl apply -f + ```bash + kubectl apply --server-side --force-conflicts -f upgrade.yaml ``` 1. Watch the status of the upgrade as follows. - ``` + ```bash watch kubectl get pods -n kube-system ```