From e7d7cb723a5770a906b19c0e58460a6fa819912f Mon Sep 17 00:00:00 2001 From: "nitin.sachdev" Date: Fri, 10 Jan 2025 21:16:02 +0530 Subject: [PATCH] syncing with 1.6.2 & preparing release/1.6.x branch for next release --- charts/consul/Chart.yaml | 12 ++++++------ charts/consul/values.yaml | 6 +++--- version/version.go | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml index 3326312c1c..72ea8e6896 100644 --- a/charts/consul/Chart.yaml +++ b/charts/consul/Chart.yaml @@ -3,8 +3,8 @@ apiVersion: v2 name: consul -version: 1.6.2 -appVersion: 1.20.2 +version: 1.6.3-dev +appVersion: 1.20-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.20.2 + image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.20-dev - name: consul-k8s-control-plane - image: hashicorp/consul-k8s-control-plane:1.6.2 + image: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.6-dev - name: consul-dataplane - image: hashicorp/consul-dataplane:1.6.2 + image: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.6-dev - name: envoy image: envoyproxy/envoy:v1.25.11 artifacthub.io/license: MPL-2.0 diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml index 8ede5520fb..0415904c8a 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.20.2 + image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.20-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.6.2 + imageK8S: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.6-dev # The image pull policy used globally for images controlled by Consul (consul, consul-dataplane, consul-k8s, consul-telemetry-collector). # One of "IfNotPresent", "Always", "Never", and "". Refer to https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy @@ -793,7 +793,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.6.2 + imageConsulDataplane: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.6-dev # Configuration for running this Helm chart on the Red Hat OpenShift platform. # This Helm chart currently supports OpenShift v4.x+. diff --git a/version/version.go b/version/version.go index 523e4377e8..2405a02bd8 100644 --- a/version/version.go +++ b/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.6.2" + Version = "1.6.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