From cdbb841530e833b811a4a19ae84141e6f2ee7a27 Mon Sep 17 00:00:00 2001
From: Michael Wilkerson <62034708+wilkermichael@users.noreply.github.com>
Date: Wed, 8 Mar 2023 09:56:21 -0800
Subject: [PATCH] ready for 0.49.5 release (#2000)

---
 CHANGELOG.md                     | 17 +++++++++++++++++
 charts/consul/Chart.yaml         |  6 +++---
 charts/consul/values.yaml        |  2 +-
 cli/version/version.go           |  2 +-
 control-plane/version/version.go |  2 +-
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df9aab2660..02375a2ae2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## 0.49.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-1975](https://github.com/hashicorp/consul-k8s/issues/1975)]
+
+IMPROVEMENTS:
+
+* cli: update minimum go version for project to 1.19. [[GH-1975](https://github.com/hashicorp/consul-k8s/issues/1975)]
+* 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 minimum go version for project to 1.19. [[GH-1975](https://github.com/hashicorp/consul-k8s/issues/1975)]
+
+BUG FIXES:
+
+* control-plane: fix issue where consul-connect-injector acl token was unintentionally being deleted and not recreated when a container was restarted due to a livenessProbe failure. [[GH-1914](https://github.com/hashicorp/consul-k8s/issues/1914)]
+
 ## 0.49.4 (February 7, 2023)
 
 BREAKING CHANGES:
diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml
index 7982d7a899..977f107ea0 100644
--- a/charts/consul/Chart.yaml
+++ b/charts/consul/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: consul
-version: 0.49.5-dev
+version: 0.49.5
 appVersion: 1.13.7
 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.13.7
     - name: consul-k8s-control-plane
-      image: hashicorp/consul-k8s-control-plane:0.49.5-dev
+      image: hashicorp/consul-k8s-control-plane:0.49.5
     - 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 6c33f9c46d..23b32bbadf 100644
--- a/charts/consul/values.yaml
+++ b/charts/consul/values.yaml
@@ -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:<latest version>
-  imageK8S: hashicorp/consul-k8s-control-plane:0.49.5-dev
+  imageK8S: hashicorp/consul-k8s-control-plane:0.49.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 f89582cd9d..8b842b3976 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 f89582cd9d..8b842b3976 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