From 02b047b32f922749fd0e5c37f43984acfc15e30a Mon Sep 17 00:00:00 2001 From: "Chris S. Kim" Date: Fri, 22 Sep 2023 16:15:24 -0400 Subject: [PATCH] [1.2.x] Post-release steps (#2989) Post-release steps --- charts/consul/Chart.yaml | 12 ++++++------ charts/consul/values.yaml | 6 +++--- cli/version/version.go | 4 ++-- control-plane/version/version.go | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml index 2520422f1b..694c2daed6 100644 --- a/charts/consul/Chart.yaml +++ b/charts/consul/Chart.yaml @@ -3,8 +3,8 @@ apiVersion: v2 name: consul -version: 1.2.2 -appVersion: 1.16.2 +version: 1.2.3-dev +appVersion: 1.16-dev kubeVersion: ">=1.22.0-0" description: Official HashiCorp Consul Chart home: https://www.consul.io @@ -13,14 +13,14 @@ sources: - https://github.com/hashicorp/consul - https://github.com/hashicorp/consul-k8s annotations: - artifacthub.io/prerelease: false + artifacthub.io/prerelease: true artifacthub.io/images: | - name: consul - image: hashicorp/consul:1.16.2 + image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.16-dev - name: consul-k8s-control-plane - image: hashicorp/consul-k8s-control-plane:1.2.2 + image: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.2.3-dev - name: consul-dataplane - image: hashicorp/consul-dataplane:1.2.2 + image: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.2-dev - name: envoy image: envoyproxy/envoy:v1.25.9 artifacthub.io/license: MPL-2.0 diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml index a8476d4b2a..1fef04c938 100644 --- 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: - image: hashicorp/consul:1.16.2 + image: docker.mirror.hashicorp.services/hashicorppreview/consul: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: - imageK8S: hashicorp/consul-k8s-control-plane:1.2.2 + imageK8S: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.2.3-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 @@ -639,7 +639,7 @@ global: # The name (and tag) of the consul-dataplane Docker image used for the # connect-injected sidecar proxies and mesh, terminating, and ingress gateways. # @default: hashicorp/consul-dataplane: - imageConsulDataplane: hashicorp/consul-dataplane:1.2.2 + imageConsulDataplane: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.2-dev # Configuration for running this Helm chart on the Red Hat OpenShift platform. # This Helm chart currently supports OpenShift v4.x+. diff --git a/cli/version/version.go b/cli/version/version.go index a2ead81654..f69b0dcf17 100644 --- a/cli/version/version.go +++ b/cli/version/version.go @@ -17,12 +17,12 @@ var ( // // Version must conform to the format expected by // github.com/hashicorp/go-version for tests to work. - Version = "1.2.2" + Version = "1.2.3" // 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 = "" + 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 index a2ead81654..f69b0dcf17 100644 --- a/control-plane/version/version.go +++ b/control-plane/version/version.go @@ -17,12 +17,12 @@ var ( // // Version must conform to the format expected by // github.com/hashicorp/go-version for tests to work. - Version = "1.2.2" + Version = "1.2.3" // 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 = "" + VersionPrerelease = "dev" ) // GetHumanVersion composes the parts of the version in a way that's suitable