From e3fd313c9c7ac33491658d365a5d939a399563ec Mon Sep 17 00:00:00 2001 From: David Yu Date: Thu, 29 Feb 2024 08:35:45 -0800 Subject: [PATCH 1/2] Update 10-util.sh --- control-plane/build-support/functions/10-util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control-plane/build-support/functions/10-util.sh b/control-plane/build-support/functions/10-util.sh index dfcf5eb361..78ed913d78 100644 --- a/control-plane/build-support/functions/10-util.sh +++ b/control-plane/build-support/functions/10-util.sh @@ -761,7 +761,7 @@ function set_changelog { fi compatibility_note=" -> NOTE: Consul K8s ${version_short}.x is compatible with Consul ${consul_version_short}.x and Consul Dataplane ${consul_dataplane_version_short}.x. Refer to our [compatibility matrix](https://developer.hashicorp.com/consul/docs/k8s/compatibility) for more info." +> NOTE: Consul K8s ${version_short}.x is compatible with Consul ${consul_version_short}.x and Consul Dataplane ${consul_dataplane_version_short}.x. Refer to our [compatibility matrix](https://developer.hashicorp.com/consul/docs/k8s/compatibility) for more info. \n" fi cat <tmp && mv tmp "${curdir}"/CHANGELOG.MD From fc363d76bad3a772ebcc270b5e1bf97cbadf813f Mon Sep 17 00:00:00 2001 From: David Yu Date: Thu, 29 Feb 2024 10:28:07 -0800 Subject: [PATCH 2/2] Update control-plane/build-support/functions/10-util.sh Co-authored-by: Michael Zalimeni --- control-plane/build-support/functions/10-util.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/control-plane/build-support/functions/10-util.sh b/control-plane/build-support/functions/10-util.sh index 78ed913d78..00cbf9d3fa 100644 --- a/control-plane/build-support/functions/10-util.sh +++ b/control-plane/build-support/functions/10-util.sh @@ -761,7 +761,8 @@ function set_changelog { fi compatibility_note=" -> NOTE: Consul K8s ${version_short}.x is compatible with Consul ${consul_version_short}.x and Consul Dataplane ${consul_dataplane_version_short}.x. Refer to our [compatibility matrix](https://developer.hashicorp.com/consul/docs/k8s/compatibility) for more info. \n" +> NOTE: Consul K8s ${version_short}.x is compatible with Consul ${consul_version_short}.x and Consul Dataplane ${consul_dataplane_version_short}.x. Refer to our [compatibility matrix](https://developer.hashicorp.com/consul/docs/k8s/compatibility) for more info. +" fi cat <tmp && mv tmp "${curdir}"/CHANGELOG.MD