From ab567d877ae6afe7af701cb77ca4f037195e8a18 Mon Sep 17 00:00:00 2001 From: Curt Bushko Date: Thu, 1 Dec 2022 10:42:20 -0500 Subject: [PATCH 1/2] Release 0.49.2 --- CHANGELOG.md | 8 +++++++- charts/consul/Chart.yaml | 10 +++++----- charts/consul/values.yaml | 4 ++-- cli/version/version.go | 2 +- control-plane/version/version.go | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c143631db7..0024cac00f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,14 @@ -## UNRELEASED +## 0.49.2 (December 1, 2022) IMPROVEMENTS: * Control Plane * Bump Dockerfile base image for RedHat UBI `consul-k8s-control-plane` image to `ubi-minimal:9.1`. [[GH-1725](https://github.com/hashicorp/consul-k8s/pull/1725)] +* Helm + * Add fields `localConnectTimeoutMs` and `localRequestTimeoutMs` to the `ServiceDefaults` CRD. [[GH-1647](https://github.com/hashicorp/consul-k8s/pull/1647)] + +BUG FIXES: +* Helm: + * Disable PodSecurityPolicies in all templates when `global.enablePodSecurityPolicies` is `false`. [[GH-1693](https://github.com/hashicorp/consul-k8s/pull/1693)] ## 0.49.1 (November 14, 2022) BREAKING CHANGES: diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml index caf7e23a08..fe8877e667 100644 --- a/charts/consul/Chart.yaml +++ b/charts/consul/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: consul -version: 0.49.2-dev -appVersion: 1.13.3 +version: 0.49.2 +appVersion: 1.13.4 kubeVersion: ">=1.21.0-0" description: Official HashiCorp Consul Chart home: https://www.consul.io @@ -10,12 +10,12 @@ 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: hashicorp/consul:1.13.3 + image: hashicorp/consul:1.13.4 - name: consul-k8s-control-plane - image: hashicorp/consul-k8s-control-plane:0.49.2-dev + image: hashicorp/consul-k8s-control-plane:0.49.2 - name: envoy image: envoyproxy/envoy:v1.23.1 artifacthub.io/license: MPL-2.0 diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml index 367b816089..9d0cb37a0f 100644 --- a/charts/consul/values.yaml +++ b/charts/consul/values.yaml @@ -109,7 +109,7 @@ global: # image: "hashicorp/consul-enterprise:1.10.0-ent" # ``` # @default: hashicorp/consul: - image: "hashicorp/consul:1.13.3" + image: "hashicorp/consul:1.13.4" # 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. @@ -129,7 +129,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: hashicorp/consul-k8s-control-plane:0.49.2-dev + imageK8S: hashicorp/consul-k8s-control-plane:0.49.2 # 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/cli/version/version.go b/cli/version/version.go index 42c4088e43..cbb75dc281 100644 --- a/cli/version/version.go +++ b/cli/version/version.go @@ -19,7 +19,7 @@ var ( // 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 diff --git a/control-plane/version/version.go b/control-plane/version/version.go index 42c4088e43..cbb75dc281 100644 --- a/control-plane/version/version.go +++ b/control-plane/version/version.go @@ -19,7 +19,7 @@ var ( // 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 2b8976497c6856441f71d485913054315d99039b Mon Sep 17 00:00:00 2001 From: Curt Bushko Date: Thu, 1 Dec 2022 10:56:11 -0500 Subject: [PATCH 2/2] Update CHANGELOG.md Co-authored-by: Kyle Schochenmaier --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0024cac00f..d9a0bc9f61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ IMPROVEMENTS: BUG FIXES: * Helm: - * Disable PodSecurityPolicies in all templates when `global.enablePodSecurityPolicies` is `false`. [[GH-1693](https://github.com/hashicorp/consul-k8s/pull/1693)] + * Disable PodSecurityPolicies templating for `gossip-encryption-autogenerate` and `partition-init` when `global.enablePodSecurityPolicies` is `false`. [[GH-1693](https://github.com/hashicorp/consul-k8s/pull/1693)] ## 0.49.1 (November 14, 2022) BREAKING CHANGES: