setup for 1.2 dev (#2347)

hashicorp · Jun 13, 2023 · 3aa4569 · 3aa4569
1 parent d9faf39
commit 3aa4569
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -178,7 +178,7 @@ version:
 	@echo $(VERSION)
 
 consul-version:
-	@echo "hashicorp/consul-enterprise:1.16.0-rc1-ent"
+	@echo $(CONSUL_IMAGE_VERSION)
 
 consul-dataplane-version:
 	@echo $(CONSUL_DATAPLANE_IMAGE_VERSION)

diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml
@@ -3,8 +3,8 @@
 
 apiVersion: v2
 name: consul
-version: 1.2.0-rc1
-appVersion: 1.16.0-rc1
+version: 1.2.0-dev
+appVersion: 1.16-dev
 kubeVersion: ">=1.22.0-0"
 description: Official HashiCorp Consul Chart
 home: https://www.consul.io
@@ -16,9 +16,9 @@ annotations:
   artifacthub.io/prerelease: true
   artifacthub.io/images: |
     - name: consul
-      image: hashicorp/consul:1.16.0-rc1
+      image: docker.mirror.hashicorp.services/hashicorppreview/consul-enterprise:1.16-dev
     - name: consul-k8s-control-plane
-      image: hashicorp/consul-k8s-control-plane:1.2.0-rc1
+      image: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.2.0-dev
     - name: consul-dataplane
       image: hashicorp/consul-dataplane:1.1.2
     - name: envoy

diff --git 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:<latest version>
-  image: hashicorp/consul:1.16.0-rc1
+  image: docker.mirror.hashicorp.services/hashicorppreview/consul-enterprise:1.16-dev
 
   # 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:<latest version>
-  imageK8S: hashicorp/consul-k8s-control-plane:1.2.0-rc1
+  imageK8S: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.2.0-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/cli/version/version.go b/cli/version/version.go
@@ -22,7 +22,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 = "rc1"
+	VersionPrerelease = "dev"
 )
 
 // 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
@@ -22,7 +22,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 = "rc1"
+	VersionPrerelease = "dev"
 )
 
 // GetHumanVersion composes the parts of the version in a way that's suitable