From 857cb79881d287b06a920e0c1be3ba5184d787d3 Mon Sep 17 00:00:00 2001 From: John Murret Date: Mon, 4 Nov 2024 09:19:27 -0700 Subject: [PATCH 1/5] update versions for release --- charts/consul/Chart.yaml | 4 ++-- charts/consul/values.yaml | 2 +- version/version.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml index ffe8a457b3..0fa6c4592b 100644 --- a/charts/consul/Chart.yaml +++ b/charts/consul/Chart.yaml @@ -3,7 +3,7 @@ apiVersion: v2 name: consul -version: 1.1.14-dev +version: 1.1.18-dev appVersion: 1.17-dev kubeVersion: ">=1.22.0-0" description: Official HashiCorp Consul Chart @@ -18,7 +18,7 @@ annotations: - name: consul image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.17-dev - name: consul-k8s-control-plane - image: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.1.14-dev + image: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.1.18-dev - name: consul-dataplane image: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.3-dev - name: envoy diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml index 9f4329a6c2..f0896a1cd8 100644 --- a/charts/consul/values.yaml +++ b/charts/consul/values.yaml @@ -86,7 +86,7 @@ global: # image that is used for functionality such as catalog sync. # This can be overridden per component. # @default: hashicorp/consul-k8s-control-plane: - imageK8S: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.1.14-dev + imageK8S: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.1.18-dev # The name of the datacenter that the agents should # register as. This can't be changed once the Consul cluster is up and running diff --git a/version/version.go b/version/version.go index 9d640f22e3..1ca5e2b2a8 100644 --- a/version/version.go +++ b/version/version.go @@ -17,7 +17,7 @@ var ( // // Version must conform to the format expected by // github.com/hashicorp/go-version for tests to work. - Version = "1.1.15" + Version = "1.1.18" // A pre-release marker for the version. If this is "" (empty string) // then it means that it is a final release. Otherwise, this is a pre-release From 2b1ab9d047e7f178a9cd4a122f45156225fb4080 Mon Sep 17 00:00:00 2001 From: John Murret Date: Mon, 4 Nov 2024 09:35:56 -0700 Subject: [PATCH 2/5] 1.1.17 release --- CHANGELOG.md | 17 +++++++++++++++++ charts/consul/Chart.yaml | 12 ++++++------ charts/consul/values.yaml | 6 +++--- version/version.go | 4 ++-- 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ff2263d35..33bbff9f74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,20 @@ +## 1.1.17- (November 4, 2023) + +SECURITY: + +* Upgrade Go to use 1.22.7. This addresses CVE +[CVE-2024-34155](https://nvd.nist.gov/vuln/detail/CVE-2024-34155) [[GH-4313](https://github.com/hashicorp/consul-k8s/issues/4313)] +* crd: Add `contains` and `ignoreCase` to the Intentions CRD to support configuring L7 Header intentions resilient to variable casing and multiple header values. [[GH-4385](https://github.com/hashicorp/consul-k8s/issues/4385)] +* crd: Add `http.incoming.requestNormalization` to the Mesh CRD to support configuring service traffic request normalization. [[GH-4385](https://github.com/hashicorp/consul-k8s/issues/4385)] + +IMPROVEMENTS: + +* helm: Exclude gke namespaces from being connect-injected when the connect-inject: default: true value is set. [[GH-4333](https://github.com/hashicorp/consul-k8s/issues/4333)] + +BUG FIXES: + +* sync-catalog: Enable the user to purge the registered services by passing parent node and necessary filters. [[GH-4255](https://github.com/hashicorp/consul-k8s/issues/4255)] + ## 1.1.16 (August 30, 2024) SECURITY: diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml index 0fa6c4592b..107e81a942 100644 --- a/charts/consul/Chart.yaml +++ b/charts/consul/Chart.yaml @@ -3,8 +3,8 @@ apiVersion: v2 name: consul -version: 1.1.18-dev -appVersion: 1.17-dev +version: 1.1.17 +appVersion: 1.17.3 kubeVersion: ">=1.22.0-0" description: Official HashiCorp Consul Chart home: https://www.consul.io @@ -13,14 +13,14 @@ sources: - https://github.com/hashicorp/consul - https://github.com/hashicorp/consul-k8s annotations: - artifacthub.io/prerelease: true + artifacthub.io/prerelease: false artifacthub.io/images: | - name: consul - image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.17-dev + image: hashicorp/consul:1.17.3 - name: consul-k8s-control-plane - image: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.1.18-dev + image: hashicorp/consul-k8s-control-plane:1.1.17 - name: consul-dataplane - image: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.3-dev + image: hashicorp/consul-dataplane:1.3.9 - name: envoy image: envoyproxy/envoy:v1.25.11 artifacthub.io/license: MPL-2.0 diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml index f0896a1cd8..8a8a5f5c4e 100644 --- a/charts/consul/values.yaml +++ b/charts/consul/values.yaml @@ -66,7 +66,7 @@ global: # image: "hashicorp/consul-enterprise:1.10.0-ent" # ``` # @default: hashicorp/consul: - image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.17-dev + image: hashicorp/consul:1.17.3 # Array of objects containing image pull secret names that will be applied to each service account. # This can be used to reference image pull secrets if using a custom consul or consul-k8s-control-plane Docker image. @@ -86,7 +86,7 @@ global: # image that is used for functionality such as catalog sync. # This can be overridden per component. # @default: hashicorp/consul-k8s-control-plane: - imageK8S: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.1.18-dev + imageK8S: hashicorp/consul-k8s-control-plane:1.1.17 # The name of the datacenter that the agents should # register as. This can't be changed once the Consul cluster is up and running @@ -639,7 +639,7 @@ global: # The name (and tag) of the consul-dataplane Docker image used for the # connect-injected sidecar proxies and mesh, terminating, and ingress gateways. # @default: hashicorp/consul-dataplane: - imageConsulDataplane: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.3-dev + imageConsulDataplane: hashicorp/consul-dataplane:1.3.9 # Configuration for running this Helm chart on the Red Hat OpenShift platform. # This Helm chart currently supports OpenShift v4.x+. diff --git a/version/version.go b/version/version.go index 1ca5e2b2a8..efaa4e4cda 100644 --- a/version/version.go +++ b/version/version.go @@ -17,12 +17,12 @@ var ( // // Version must conform to the format expected by // github.com/hashicorp/go-version for tests to work. - Version = "1.1.18" + Version = "1.1.17" // A pre-release marker for the version. If this is "" (empty string) // then it means that it is a final release. Otherwise, this is a pre-release // such as "dev" (in development), "beta", "rc1", etc. - VersionPrerelease = "dev" + VersionPrerelease = "" ) // GetHumanVersion composes the parts of the version in a way that's suitable From c40ec18957993db82785f7d6023069f9c8ef0e5e Mon Sep 17 00:00:00 2001 From: John Murret Date: Mon, 4 Nov 2024 11:00:30 -0700 Subject: [PATCH 3/5] 1.1.17 release --- CHANGELOG.md | 17 +++++++++++++++++ charts/consul/Chart.yaml | 6 +++--- charts/consul/values.yaml | 4 ++-- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33bbff9f74..da4be457b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,23 @@ BUG FIXES: * sync-catalog: Enable the user to purge the registered services by passing parent node and necessary filters. [[GH-4255](https://github.com/hashicorp/consul-k8s/issues/4255)] +## 1.1.17- (November 4, 2023) + +SECURITY: + +* Upgrade Go to use 1.22.7. This addresses CVE +[CVE-2024-34155](https://nvd.nist.gov/vuln/detail/CVE-2024-34155) [[GH-4313](https://github.com/hashicorp/consul-k8s/issues/4313)] +* crd: Add `contains` and `ignoreCase` to the Intentions CRD to support configuring L7 Header intentions resilient to variable casing and multiple header values. [[GH-4385](https://github.com/hashicorp/consul-k8s/issues/4385)] +* crd: Add `http.incoming.requestNormalization` to the Mesh CRD to support configuring service traffic request normalization. [[GH-4385](https://github.com/hashicorp/consul-k8s/issues/4385)] + +IMPROVEMENTS: + +* helm: Exclude gke namespaces from being connect-injected when the connect-inject: default: true value is set. [[GH-4333](https://github.com/hashicorp/consul-k8s/issues/4333)] + +BUG FIXES: + +* sync-catalog: Enable the user to purge the registered services by passing parent node and necessary filters. [[GH-4255](https://github.com/hashicorp/consul-k8s/issues/4255)] + ## 1.1.16 (August 30, 2024) SECURITY: diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml index 107e81a942..639b915a43 100644 --- a/charts/consul/Chart.yaml +++ b/charts/consul/Chart.yaml @@ -4,7 +4,7 @@ apiVersion: v2 name: consul version: 1.1.17 -appVersion: 1.17.3 +appVersion: 1.15.5 kubeVersion: ">=1.22.0-0" description: Official HashiCorp Consul Chart home: https://www.consul.io @@ -16,11 +16,11 @@ annotations: artifacthub.io/prerelease: false artifacthub.io/images: | - name: consul - image: hashicorp/consul:1.17.3 + image: hashicorp/consul:1.15.5 - name: consul-k8s-control-plane image: hashicorp/consul-k8s-control-plane:1.1.17 - name: consul-dataplane - image: hashicorp/consul-dataplane:1.3.9 + image: hashicorp/consul-dataplane:1.1.13 - name: envoy image: envoyproxy/envoy:v1.25.11 artifacthub.io/license: MPL-2.0 diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml index 8a8a5f5c4e..e1565728bd 100644 --- a/charts/consul/values.yaml +++ b/charts/consul/values.yaml @@ -66,7 +66,7 @@ global: # image: "hashicorp/consul-enterprise:1.10.0-ent" # ``` # @default: hashicorp/consul: - image: hashicorp/consul:1.17.3 + image: hashicorp/consul:1.15.5 # Array of objects containing image pull secret names that will be applied to each service account. # This can be used to reference image pull secrets if using a custom consul or consul-k8s-control-plane Docker image. @@ -639,7 +639,7 @@ global: # The name (and tag) of the consul-dataplane Docker image used for the # connect-injected sidecar proxies and mesh, terminating, and ingress gateways. # @default: hashicorp/consul-dataplane: - imageConsulDataplane: hashicorp/consul-dataplane:1.3.9 + imageConsulDataplane: hashicorp/consul-dataplane:1.1.13 # Configuration for running this Helm chart on the Red Hat OpenShift platform. # This Helm chart currently supports OpenShift v4.x+. From 45b9acf634ce8f1b5a342fe031ae7269a5a6523d Mon Sep 17 00:00:00 2001 From: John Murret Date: Mon, 4 Nov 2024 20:09:12 -0700 Subject: [PATCH 4/5] fix consul version to 1.15.10 --- charts/consul/Chart.yaml | 4 ++-- charts/consul/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml index 639b915a43..df59c16846 100644 --- a/charts/consul/Chart.yaml +++ b/charts/consul/Chart.yaml @@ -4,7 +4,7 @@ apiVersion: v2 name: consul version: 1.1.17 -appVersion: 1.15.5 +appVersion: 1.15.10 kubeVersion: ">=1.22.0-0" description: Official HashiCorp Consul Chart home: https://www.consul.io @@ -16,7 +16,7 @@ annotations: artifacthub.io/prerelease: false artifacthub.io/images: | - name: consul - image: hashicorp/consul:1.15.5 + image: hashicorp/consul:1.15.10 - name: consul-k8s-control-plane image: hashicorp/consul-k8s-control-plane:1.1.17 - name: consul-dataplane diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml index e1565728bd..0e31798daa 100644 --- a/charts/consul/values.yaml +++ b/charts/consul/values.yaml @@ -66,7 +66,7 @@ global: # image: "hashicorp/consul-enterprise:1.10.0-ent" # ``` # @default: hashicorp/consul: - image: hashicorp/consul:1.15.5 + image: hashicorp/consul:1.15.10 # Array of objects containing image pull secret names that will be applied to each service account. # This can be used to reference image pull secrets if using a custom consul or consul-k8s-control-plane Docker image. From 75a11b136596997d3181feeaebe6a6f6edfe6a74 Mon Sep 17 00:00:00 2001 From: John Murret Date: Mon, 4 Nov 2024 20:11:13 -0700 Subject: [PATCH 5/5] remove duplicate changelog section --- CHANGELOG.md | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da4be457b3..33bbff9f74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,23 +15,6 @@ BUG FIXES: * sync-catalog: Enable the user to purge the registered services by passing parent node and necessary filters. [[GH-4255](https://github.com/hashicorp/consul-k8s/issues/4255)] -## 1.1.17- (November 4, 2023) - -SECURITY: - -* Upgrade Go to use 1.22.7. This addresses CVE -[CVE-2024-34155](https://nvd.nist.gov/vuln/detail/CVE-2024-34155) [[GH-4313](https://github.com/hashicorp/consul-k8s/issues/4313)] -* crd: Add `contains` and `ignoreCase` to the Intentions CRD to support configuring L7 Header intentions resilient to variable casing and multiple header values. [[GH-4385](https://github.com/hashicorp/consul-k8s/issues/4385)] -* crd: Add `http.incoming.requestNormalization` to the Mesh CRD to support configuring service traffic request normalization. [[GH-4385](https://github.com/hashicorp/consul-k8s/issues/4385)] - -IMPROVEMENTS: - -* helm: Exclude gke namespaces from being connect-injected when the connect-inject: default: true value is set. [[GH-4333](https://github.com/hashicorp/consul-k8s/issues/4333)] - -BUG FIXES: - -* sync-catalog: Enable the user to purge the registered services by passing parent node and necessary filters. [[GH-4255](https://github.com/hashicorp/consul-k8s/issues/4255)] - ## 1.1.16 (August 30, 2024) SECURITY: