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.

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

Reset to dev after release of 1.1.4 #2753

Merged
merged 1 commit into from
Aug 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions charts/consul/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: consul
version: 1.1.4
appVersion: 1.15.5
version: 1.1.5-dev
appVersion: 1.15-dev
kubeVersion: ">=1.22.0-0"
description: Official HashiCorp Consul Chart
home: https://www.consul.io
Expand All @@ -10,14 +10,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.15.5
image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.15-dev
- name: consul-k8s-control-plane
image: hashicorp/consul-k8s-control-plane:1.1.4
image: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.1.5-dev
- name: consul-dataplane
image: hashicorp/consul-dataplane:1.1.4
image: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.1-dev
- name: envoy
image: envoyproxy/envoy:v1.25.9
artifacthub.io/license: MPL-2.0
Expand Down
6 changes: 3 additions & 3 deletions charts/consul/values.yaml
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: hashicorp/consul:1.15.5
image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.15-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: hashicorp/consul-k8s-control-plane:1.1.4
imageK8S: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.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 @@ -627,7 +627,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: hashicorp/consul-dataplane:1.1.4
imageConsulDataplane: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.1-dev

# Configuration for running this Helm chart on the Red Hat OpenShift platform.
# This Helm chart currently supports OpenShift v4.x+.
Expand Down
4 changes: 2 additions & 2 deletions cli/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ var (
//
// Version must conform to the format expected by
// github.com/hashicorp/go-version for tests to work.
Version = "1.1.4"
Version = "1.1.5"

// 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
Expand Down
4 changes: 2 additions & 2 deletions control-plane/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ var (
//
// Version must conform to the format expected by
// github.com/hashicorp/go-version for tests to work.
Version = "1.1.4"
Version = "1.1.5"

// 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
Expand Down