From 000570c505c12effe5a64d3740b678d9c655396a Mon Sep 17 00:00:00 2001 From: Derek Menteer Date: Thu, 12 Oct 2023 14:42:57 -0500 Subject: [PATCH 1/8] Add 1.17 upgrade-specific note for upstream normalization. --- website/content/docs/upgrading/upgrade-specific.mdx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/website/content/docs/upgrading/upgrade-specific.mdx b/website/content/docs/upgrading/upgrade-specific.mdx index 75722fd36a55..56b798c72802 100644 --- a/website/content/docs/upgrading/upgrade-specific.mdx +++ b/website/content/docs/upgrading/upgrade-specific.mdx @@ -19,6 +19,16 @@ upgrade flow. Prior to Consul 1.17.0, audit logs contained timestamps on both the original log file names as well as rotated log file names. After Consul 1.17.0, only timestamps will be included in rotated log file names. +#### Service-defaults upstream config (Enterprise) +Prior to Consul 1.17.0, [Consul-k8s upstreams](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-connect-service-upstreams) +that did not explicitly specify a namespace or partition would incorrectly use service-defaults configuration (such as protocol) +from the default partition / namespace, rather than the local partition / namespace. + +This bug is fixed starting in Consul 1.17.0, and the service-defaults from the local partition and namespace will now be fetched instead. +If using non-default partitions and namespaces with Consul-k8s, it is advised to explicitly define these fields for all upstreams and to +ensure proper service-defaults entries exist in each namespace / partition before upgrading so that no unexpected protocol changes occur. + + ## Consul 1.16.x ### Known issues From f214afe2f383704e635a3d16300345e180b37165 Mon Sep 17 00:00:00 2001 From: Derek Menteer <105233703+hashi-derek@users.noreply.github.com> Date: Thu, 12 Oct 2023 14:57:56 -0500 Subject: [PATCH 2/8] Update website/content/docs/upgrading/upgrade-specific.mdx Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com> --- website/content/docs/upgrading/upgrade-specific.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/content/docs/upgrading/upgrade-specific.mdx b/website/content/docs/upgrading/upgrade-specific.mdx index 56b798c72802..249a8830abab 100644 --- a/website/content/docs/upgrading/upgrade-specific.mdx +++ b/website/content/docs/upgrading/upgrade-specific.mdx @@ -21,8 +21,8 @@ After Consul 1.17.0, only timestamps will be included in rotated log file names. #### Service-defaults upstream config (Enterprise) Prior to Consul 1.17.0, [Consul-k8s upstreams](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-connect-service-upstreams) -that did not explicitly specify a namespace or partition would incorrectly use service-defaults configuration (such as protocol) -from the default partition / namespace, rather than the local partition / namespace. +that did not explicitly specify a namespace or partition would incorrectly use service-defaults configurations, such as the incorrect protocol, +from the `default` partition and namespace, rather than the local partition and namespace. This bug is fixed starting in Consul 1.17.0, and the service-defaults from the local partition and namespace will now be fetched instead. If using non-default partitions and namespaces with Consul-k8s, it is advised to explicitly define these fields for all upstreams and to From 2440fa225bc4b8b43766b5143c705019cd18a20d Mon Sep 17 00:00:00 2001 From: Derek Menteer <105233703+hashi-derek@users.noreply.github.com> Date: Thu, 12 Oct 2023 14:58:05 -0500 Subject: [PATCH 3/8] Update website/content/docs/upgrading/upgrade-specific.mdx Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com> --- website/content/docs/upgrading/upgrade-specific.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/docs/upgrading/upgrade-specific.mdx b/website/content/docs/upgrading/upgrade-specific.mdx index 249a8830abab..bc005a0acc89 100644 --- a/website/content/docs/upgrading/upgrade-specific.mdx +++ b/website/content/docs/upgrading/upgrade-specific.mdx @@ -24,7 +24,7 @@ Prior to Consul 1.17.0, [Consul-k8s upstreams](/consul/docs/k8s/annotations-and- that did not explicitly specify a namespace or partition would incorrectly use service-defaults configurations, such as the incorrect protocol, from the `default` partition and namespace, rather than the local partition and namespace. -This bug is fixed starting in Consul 1.17.0, and the service-defaults from the local partition and namespace will now be fetched instead. +This bug is fixed starting in Consul 1.17.0, and the service-defaults from the local partition and namespace are now fetched instead. If using non-default partitions and namespaces with Consul-k8s, it is advised to explicitly define these fields for all upstreams and to ensure proper service-defaults entries exist in each namespace / partition before upgrading so that no unexpected protocol changes occur. From 1fc25870870322bd34a09e5f7a5e8972b7b4f824 Mon Sep 17 00:00:00 2001 From: Derek Menteer <105233703+hashi-derek@users.noreply.github.com> Date: Thu, 12 Oct 2023 14:58:24 -0500 Subject: [PATCH 4/8] Update website/content/docs/upgrading/upgrade-specific.mdx Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com> --- website/content/docs/upgrading/upgrade-specific.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/docs/upgrading/upgrade-specific.mdx b/website/content/docs/upgrading/upgrade-specific.mdx index bc005a0acc89..fb64fa124f2e 100644 --- a/website/content/docs/upgrading/upgrade-specific.mdx +++ b/website/content/docs/upgrading/upgrade-specific.mdx @@ -25,7 +25,7 @@ that did not explicitly specify a namespace or partition would incorrectly use s from the `default` partition and namespace, rather than the local partition and namespace. This bug is fixed starting in Consul 1.17.0, and the service-defaults from the local partition and namespace are now fetched instead. -If using non-default partitions and namespaces with Consul-k8s, it is advised to explicitly define these fields for all upstreams and to +If you are using non-default partitions and namespaces with Consul-k8s, we recommend explicitly defining these fields for all upstreams. Doing so ensure proper service-defaults entries exist in each namespace / partition before upgrading so that no unexpected protocol changes occur. From 0d898389e610b1d513eabe05977218dd9823344a Mon Sep 17 00:00:00 2001 From: Derek Menteer <105233703+hashi-derek@users.noreply.github.com> Date: Thu, 12 Oct 2023 14:58:37 -0500 Subject: [PATCH 5/8] Update website/content/docs/upgrading/upgrade-specific.mdx Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com> --- website/content/docs/upgrading/upgrade-specific.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/docs/upgrading/upgrade-specific.mdx b/website/content/docs/upgrading/upgrade-specific.mdx index fb64fa124f2e..bcfccdd87a71 100644 --- a/website/content/docs/upgrading/upgrade-specific.mdx +++ b/website/content/docs/upgrading/upgrade-specific.mdx @@ -26,7 +26,7 @@ from the `default` partition and namespace, rather than the local partition and This bug is fixed starting in Consul 1.17.0, and the service-defaults from the local partition and namespace are now fetched instead. If you are using non-default partitions and namespaces with Consul-k8s, we recommend explicitly defining these fields for all upstreams. Doing so -ensure proper service-defaults entries exist in each namespace / partition before upgrading so that no unexpected protocol changes occur. +ensures that proper service-defaults entries exist in each namespace and partition prior to upgrading, which prevents unexpected protocol changes. ## Consul 1.16.x From 2e13beb19a09f073f4823e758dc178a6ebb16dec Mon Sep 17 00:00:00 2001 From: Derek Menteer Date: Thu, 12 Oct 2023 15:05:46 -0500 Subject: [PATCH 6/8] Extra docs tweaks. --- website/content/docs/upgrading/upgrade-specific.mdx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/website/content/docs/upgrading/upgrade-specific.mdx b/website/content/docs/upgrading/upgrade-specific.mdx index bcfccdd87a71..e9ca8046e649 100644 --- a/website/content/docs/upgrading/upgrade-specific.mdx +++ b/website/content/docs/upgrading/upgrade-specific.mdx @@ -20,13 +20,12 @@ Prior to Consul 1.17.0, audit logs contained timestamps on both the original log After Consul 1.17.0, only timestamps will be included in rotated log file names. #### Service-defaults upstream config (Enterprise) -Prior to Consul 1.17.0, [Consul-k8s upstreams](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-connect-service-upstreams) -that did not explicitly specify a namespace or partition would incorrectly use service-defaults configurations, such as the incorrect protocol, -from the `default` partition and namespace, rather than the local partition and namespace. +Prior to Consul v1.17.0, [Kubernetes annotations for upstream services](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-connect-service-upstreams) +that did not explicitly specify a namespace or partition incorrectly used service-defaults configurations, such as [default protocol](https://developer.hashicorp.com/consul/docs/connect/config-entries/service-defaults#set-the-default-protocol) from the default partition and namespace instead of the local partition and namespace. -This bug is fixed starting in Consul 1.17.0, and the service-defaults from the local partition and namespace are now fetched instead. -If you are using non-default partitions and namespaces with Consul-k8s, we recommend explicitly defining these fields for all upstreams. Doing so -ensures that proper service-defaults entries exist in each namespace and partition prior to upgrading, which prevents unexpected protocol changes. +This bug is fixed starting in Consul v1.17.0. Now service-defaults configurations from the local partition and namespace are fetched when not specified in annotations. +If you are using non-default partitions and namespaces with Consul-k8s, we recommend explicitly defining these fields for all upstreams in addition to ensuring that accurate +service-defaults are configured in each partition and namespace before upgrading. Doing so will ensure that no unexpected protocol changes occur during the upgrade. ## Consul 1.16.x From 14b5f090a8a38d7156c8a1bc6ee8e9a0a9bfa990 Mon Sep 17 00:00:00 2001 From: Derek Menteer <105233703+hashi-derek@users.noreply.github.com> Date: Thu, 12 Oct 2023 15:17:05 -0500 Subject: [PATCH 7/8] Update website/content/docs/upgrading/upgrade-specific.mdx Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com> --- website/content/docs/upgrading/upgrade-specific.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/docs/upgrading/upgrade-specific.mdx b/website/content/docs/upgrading/upgrade-specific.mdx index e9ca8046e649..dc61cab06093 100644 --- a/website/content/docs/upgrading/upgrade-specific.mdx +++ b/website/content/docs/upgrading/upgrade-specific.mdx @@ -21,7 +21,7 @@ After Consul 1.17.0, only timestamps will be included in rotated log file names. #### Service-defaults upstream config (Enterprise) Prior to Consul v1.17.0, [Kubernetes annotations for upstream services](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-connect-service-upstreams) -that did not explicitly specify a namespace or partition incorrectly used service-defaults configurations, such as [default protocol](https://developer.hashicorp.com/consul/docs/connect/config-entries/service-defaults#set-the-default-protocol) from the default partition and namespace instead of the local partition and namespace. +that did not explicitly specify a namespace or partition incorrectly used service-defaults configurations, such as [default protocol](https://developer.hashicorp.com/consul/docs/connect/config-entries/service-defaults#set-the-default-protocol), from the default partition and namespace instead of the local partition and namespace. This bug is fixed starting in Consul v1.17.0. Now service-defaults configurations from the local partition and namespace are fetched when not specified in annotations. If you are using non-default partitions and namespaces with Consul-k8s, we recommend explicitly defining these fields for all upstreams in addition to ensuring that accurate From 86bdede6dc797b31a6e3df81260a493abf51d3ee Mon Sep 17 00:00:00 2001 From: Derek Menteer <105233703+hashi-derek@users.noreply.github.com> Date: Thu, 12 Oct 2023 15:17:17 -0500 Subject: [PATCH 8/8] Update website/content/docs/upgrading/upgrade-specific.mdx Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com> --- website/content/docs/upgrading/upgrade-specific.mdx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/website/content/docs/upgrading/upgrade-specific.mdx b/website/content/docs/upgrading/upgrade-specific.mdx index dc61cab06093..720f8c9814b1 100644 --- a/website/content/docs/upgrading/upgrade-specific.mdx +++ b/website/content/docs/upgrading/upgrade-specific.mdx @@ -25,8 +25,7 @@ that did not explicitly specify a namespace or partition incorrectly used servic This bug is fixed starting in Consul v1.17.0. Now service-defaults configurations from the local partition and namespace are fetched when not specified in annotations. If you are using non-default partitions and namespaces with Consul-k8s, we recommend explicitly defining these fields for all upstreams in addition to ensuring that accurate -service-defaults are configured in each partition and namespace before upgrading. Doing so will ensure that no unexpected protocol changes occur during the upgrade. - +service-defaults are configured in each partition and namespace before upgrading. Doing so ensures that no unexpected protocol changes occur during the upgrade. ## Consul 1.16.x