Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mw/prepare main for 1.5 dev #3535

Merged
merged 2 commits into from
Feb 2, 2024
Merged

Mw/prepare main for 1.5 dev #3535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
497da57
bump versions to next version
wilkermichael Feb 1, 2024
7a293b0
updated script to handle new Consul-k8s images
wilkermichael Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions charts/consul/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

apiVersion: v2
name: consul
version: 1.4.0-dev
appVersion: 1.18-dev
version: 1.5.0-dev
appVersion: 1.19-dev
kubeVersion: ">=1.22.0-0"
description: Official HashiCorp Consul Chart
home: https://www.consul.io
Expand All @@ -16,11 +16,11 @@ annotations:
artifacthub.io/prerelease: true
artifacthub.io/images: |
- name: consul
image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.18-dev
image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.19-dev
- name: consul-k8s-control-plane
image: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.4-dev
image: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.5-dev
- name: consul-dataplane
image: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.4-dev
image: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.5-dev
- name: envoy
image: envoyproxy/envoy:v1.25.11
artifacthub.io/license: MPL-2.0
Expand Down
6 changes: 3 additions & 3 deletions charts/consul/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ global:
# image: "hashicorp/consul-enterprise:1.10.0-ent"
# ```
# @default: hashicorp/consul:<latest version>
image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.18-dev
image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.19-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.
Expand All @@ -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: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.4-dev
imageK8S: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.5-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
Expand Down Expand Up @@ -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:<latest supported version>
imageConsulDataplane: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.4-dev
imageConsulDataplane: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.5-dev

# Configuration for running this Helm chart on the Red Hat OpenShift platform.
# This Helm chart currently supports OpenShift v4.x+.
Expand Down
2 changes: 1 addition & 1 deletion cli/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var (
//
// Version must conform to the format expected by
// github.com/hashicorp/go-version for tests to work.
Version = "1.4.0"
Version = "1.5.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
Expand Down
5 changes: 3 additions & 2 deletions control-plane/build-support/functions/10-util.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,15 +629,16 @@ function update_version_helm {
full_consul_version="$5-$3"
full_consul_dataplane_version="$7-$3"
elif test "$3" == "dev"; then
full_version="$2-$3"
full_version="${2%.*}-$3"
full_version_k8s_for_chart_version="$2-$3"
# strip off the last minor patch version so that the consul image can be set to something like 1.16-dev. The image
# is produced by Consul every night
full_consul_version="${5%.*}-$3"
full_consul_dataplane_version="${7%.*}-$3"
fi

sed_i ${SED_EXT} -e "s/(imageK8S:.*\/consul-k8s-control-plane:)[^\"]*/imageK8S: $4${full_version}/g" "${vfile}"
sed_i ${SED_EXT} -e "s/(version:[[:space:]]*)[^\"]*/\1${full_version}/g" "${cfile}"
sed_i ${SED_EXT} -e "s/(version:[[:space:]]*)[^\"]*/\1${full_version_k8s_for_chart_version}/g" "${cfile}"
sed_i ${SED_EXT} -e "s/(appVersion:[[:space:]]*)[^\"]*/\1${full_consul_version}/g" "${cfile}"
sed_i ${SED_EXT} -e "s/(image:.*\/consul-k8s-control-plane:)[^\"]*/image: $4${full_version}/g" "${cfile}"

Expand Down
2 changes: 1 addition & 1 deletion control-plane/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var (
//
// Version must conform to the format expected by
// github.com/hashicorp/go-version for tests to work.
Version = "1.4.0"
Version = "1.5.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
Expand Down
Loading