From f23558e2c403e525c53b5efda32e9742805a405d Mon Sep 17 00:00:00 2001 From: Michael Wilkerson Date: Wed, 8 Mar 2023 09:52:11 -0800 Subject: [PATCH] ready for release --- CHANGELOG.md | 12 ++++++++++++ charts/consul/Chart.yaml | 6 +++--- charts/consul/values.yaml | 2 +- cli/version/version.go | 2 +- control-plane/version/version.go | 2 +- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5fe900cb4..ddfbb6f631 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +## 1.0.5 (March 9, 2023) + +SECURITY: + +* upgrade to use Go 1.19.6. This resolves vulnerabilities CVE-2022-41724 in crypto/tls and CVE-2022-41723 in net/http. [[GH-1976](https://github.com/hashicorp/consul-k8s/issues/1976)] + +IMPROVEMENTS: + +* control-plane: server ACL Init always appends both, the secrets from the serviceAccount's secretRefs and the one created by the Helm chart, to support Openshift secret handling. [[GH-1770](https://github.com/hashicorp/consul-k8s/issues/1770)] +* control-plane: update alpine to 3.17 in the Docker image. [[GH-1934](https://github.com/hashicorp/consul-k8s/issues/1934)] +* control-plane: update alpine to 3.17 in the Docker image. [[GH-1953](https://github.com/hashicorp/consul-k8s/issues/1953)] + ## 1.0.4 (February 7, 2023) BREAKING CHANGES: diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml index 2aec77d8a1..5e130c069f 100644 --- a/charts/consul/Chart.yaml +++ b/charts/consul/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: consul -version: 1.0.5-dev +version: 1.0.5 appVersion: 1.14.5 kubeVersion: ">=1.21.0-0" description: Official HashiCorp Consul Chart @@ -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.14.5 - name: consul-k8s-control-plane - image: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.0.5-dev + image: hashicorp/consul-k8s-control-plane:1.0.5 - name: consul-dataplane image: hashicorp/consul-dataplane:1.0.1 - name: envoy diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml index fa9b85ad55..79e9e1a968 100644 --- a/charts/consul/values.yaml +++ b/charts/consul/values.yaml @@ -83,7 +83,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.0.5-dev + imageK8S: hashicorp/consul-k8s-control-plane:1.0.5 # 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 be258a78a9..7a2e10bd27 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 be258a78a9..7a2e10bd27 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