From 4f9d5cd5432ac4d68861840b3911c7672a8bdd00 Mon Sep 17 00:00:00 2001 From: Iryna Shustava Date: Fri, 23 Jun 2023 16:11:13 +0000 Subject: [PATCH 1/3] backport of commit ad7cbd5c70605da42417caa9a666af1080645eb6 --- website/content/docs/k8s/upgrade/index.mdx | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/website/content/docs/k8s/upgrade/index.mdx b/website/content/docs/k8s/upgrade/index.mdx index d5ea03dae0e..353cb0cd9ee 100644 --- a/website/content/docs/k8s/upgrade/index.mdx +++ b/website/content/docs/k8s/upgrade/index.mdx @@ -219,7 +219,7 @@ In earlier versions, Consul on Kubernetes used client agents in its deployments. If you upgrade Consul from a version that uses client agents to a version the uses dataplanes, complete the following steps to upgrade your deployment safely and without downtime. -1. Before you upgrade, edit your Helm chart to enable Consul client agents by setting `client.enabled` and `client.updateStrategy`: +1. Before you upgrade, edit your Helm chart configuration to enable Consul client agents by setting `client.enabled` and `client.updateStrategy`: ```yaml filename="values.yaml" client: @@ -228,6 +228,18 @@ If you upgrade Consul from a version that uses client agents to a version the us type: OnDelete ``` +1. Update the `connect-injector` to not log out on restart. +We need to do it to make sure that the ACL tokens that existing services are using are still valid while we are migrating them to `consul-dataplane`. +Note that this token will need to be cleaned up manually. + + ```bash + kubectl config set-context --current --namespace= + INJECTOR_DEPLOYMENT=$(kg deploy -l "component=connect-injector" -o=jsonpath='{.items[0].metadata.name}') + kubectl patch deploy $INJECTOR_DEPLOYMENT --type='json' -p='[{"op": "remove", "path": "/spec/template/spec/containers/0/lifecycle"}]' + ``` + +This will trigger the deployment rollout. We need to wait for the rollout to complete before proceeding to next step. + 1. Follow our [recommended procedures to upgrade servers](#upgrade-consul-servers) on Kubernetes deployments to upgrade Helm values for the new version of Consul. 1. Run `kubectl rollout restart` to restart your service mesh applications. Restarting service mesh application causes Kubernetes to re-inject them with the webhook for dataplanes. From 72103599458e6bda9975165534d76da55bd2725a Mon Sep 17 00:00:00 2001 From: Iryna Shustava Date: Fri, 23 Jun 2023 21:14:00 +0000 Subject: [PATCH 2/3] backport of commit 122b50b088828e95d746b16c4bf294a4f09e498f --- website/content/docs/k8s/upgrade/index.mdx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/website/content/docs/k8s/upgrade/index.mdx b/website/content/docs/k8s/upgrade/index.mdx index 353cb0cd9ee..7c962efa6f5 100644 --- a/website/content/docs/k8s/upgrade/index.mdx +++ b/website/content/docs/k8s/upgrade/index.mdx @@ -228,9 +228,11 @@ If you upgrade Consul from a version that uses client agents to a version the us type: OnDelete ``` -1. Update the `connect-injector` to not log out on restart. -We need to do it to make sure that the ACL tokens that existing services are using are still valid while we are migrating them to `consul-dataplane`. -Note that this token will need to be cleaned up manually. +1. Update the `connect-injector` to not log out on restart +to make sure that the ACL tokens used by existing services are still valid during the migration to `consul-dataplane`. +Note that you must remove the token manually after completing the migration. + +The following command triggers the deployment rollout. Wait for the rollout to complete before proceeding to next step. ```bash kubectl config set-context --current --namespace= @@ -238,8 +240,6 @@ Note that this token will need to be cleaned up manually. kubectl patch deploy $INJECTOR_DEPLOYMENT --type='json' -p='[{"op": "remove", "path": "/spec/template/spec/containers/0/lifecycle"}]' ``` -This will trigger the deployment rollout. We need to wait for the rollout to complete before proceeding to next step. - 1. Follow our [recommended procedures to upgrade servers](#upgrade-consul-servers) on Kubernetes deployments to upgrade Helm values for the new version of Consul. 1. Run `kubectl rollout restart` to restart your service mesh applications. Restarting service mesh application causes Kubernetes to re-inject them with the webhook for dataplanes. From ab390b560a3a41496d182cb4c4940a0247f95c13 Mon Sep 17 00:00:00 2001 From: Iryna Shustava Date: Fri, 23 Jun 2023 21:37:36 +0000 Subject: [PATCH 3/3] backport of commit fea8da71090c663193cb91addecdb7da2ab722b3 --- website/content/docs/k8s/upgrade/index.mdx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/website/content/docs/k8s/upgrade/index.mdx b/website/content/docs/k8s/upgrade/index.mdx index 7c962efa6f5..933c98f8c65 100644 --- a/website/content/docs/k8s/upgrade/index.mdx +++ b/website/content/docs/k8s/upgrade/index.mdx @@ -232,13 +232,13 @@ If you upgrade Consul from a version that uses client agents to a version the us to make sure that the ACL tokens used by existing services are still valid during the migration to `consul-dataplane`. Note that you must remove the token manually after completing the migration. -The following command triggers the deployment rollout. Wait for the rollout to complete before proceeding to next step. + The following command triggers the deployment rollout. Wait for the rollout to complete before proceeding to next step. - ```bash - kubectl config set-context --current --namespace= - INJECTOR_DEPLOYMENT=$(kg deploy -l "component=connect-injector" -o=jsonpath='{.items[0].metadata.name}') - kubectl patch deploy $INJECTOR_DEPLOYMENT --type='json' -p='[{"op": "remove", "path": "/spec/template/spec/containers/0/lifecycle"}]' - ``` + ```bash + kubectl config set-context --current --namespace= + INJECTOR_DEPLOYMENT=$(kg deploy -l "component=connect-injector" -o=jsonpath='{.items[0].metadata.name}') + kubectl patch deploy $INJECTOR_DEPLOYMENT --type='json' -p='[{"op": "remove", "path": "/spec/template/spec/containers/0/lifecycle"}]' + ``` 1. Follow our [recommended procedures to upgrade servers](#upgrade-consul-servers) on Kubernetes deployments to upgrade Helm values for the new version of Consul.