backport of commit 8f50af6

hashicorp · Sep 28, 2022 · 648ffff · 648ffff
1 parent 168ccba
commit 648ffff
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,3 @@
-## UNRELEASED
-
 ## 0.49.0 (September 29, 2022)
 
 FEATURES:

diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ use Consul with Kubernetes, please see the
 [Consul and Kubernetes documentation](https://www.consul.io/docs/platform/k8s/index.html).
 
 ### Prerequisites
-  * **Helm 3.6+** 
+  * **Helm 3.2+** (Helm 2 is not supported)
   * **Kubernetes 1.21-1.24** - This is the earliest version of Kubernetes tested.
     It is possible that this chart works with earlier versions, but it is
     untested.

diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: consul
-version: 1.0.0-dev
+version: 0.49.0
 appVersion: 1.13.2
 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.2
     - name: consul-k8s-control-plane
-      image: hashicorp/consul-k8s-control-plane:1.0.0-dev
+      image: hashicorp/consul-k8s-control-plane:0.49.0
     - name: envoy
       image: envoyproxy/envoy:v1.23.1
   artifacthub.io/license: MPL-2.0

diff --git a/charts/consul/README.md b/charts/consul/README.md
@@ -30,7 +30,7 @@ by contacting us at [security@hashicorp.com](mailto:security@hashicorp.com).
     non-Kubernetes nodes to easily discover and access Kubernetes services.
 
 ### Prerequisites
-  * **Helm 3.6+** 
+  * **Helm 3.2+** (Helm 2 is not supported)
   * **Kubernetes 1.21-1.24** - This is the earliest version of Kubernetes tested.
     It is possible that this chart works with earlier versions but it is
     untested.

diff --git 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:1.0.0-dev
+  imageK8S: hashicorp/consul-k8s-control-plane:0.49.0
 
   # 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
@@ -14,12 +14,12 @@ var (
 	//
 	// Version must conform to the format expected by
 	// github.com/hashicorp/go-version for tests to work.
-	Version = "1.0.0"
+	Version = "0.49.0"
 
 	// 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
@@ -14,12 +14,12 @@ var (
 	//
 	// Version must conform to the format expected by
 	// github.com/hashicorp/go-version for tests to work.
-	Version = "1.0.0"
+	Version = "0.49.0"
 
 	// 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