Skip to content

do-not-merge Trigger tests for consul-ent 1.21.17 #5563

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

Draft
shashankNandigama wants to merge 1 commit into
base: release/1.8.x
Choose a base branch
from
+6 −2
Draft

do-not-merge Trigger tests for consul-ent 1.21.17 #5563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions acceptance/tests/cli/cli_install_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

const ipv4RegEx = "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"

// Dummy comment
// TestInstall tests that we can install consul service mesh with the CLI
// and see that services can connect.
func TestInstall(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions charts/consul/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ global:
# image: "hashicorp/consul-enterprise:1.10.0-ent"
# ```
# @default: hashicorp/consul:<latest version>
image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.21-dev
image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.21.17

# 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 Down Expand Up @@ -794,7 +794,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.8-dev
imageConsulDataplane: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.8.0-dev

# Disable this once the manifests are generated and subsequent helm upgrades

Expand Down
3 changes: 3 additions & 0 deletions control-plane/build-support/scripts/consul-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@ if [[ "${VERSION}" == *"consul-enterprise:"* ]]; then
VERSION=$(echo ${VERSION} | sed "s/consul-enterprise:/consul:/g")
fi

CONSUL_CE_VERSION="1.21.5"
VERSION=$(echo ${VERSION} | sed -E "s/consul:1\.21\.[0-9]+/consul:${CONSUL_CE_VERSION}/g")

echo "${VERSION}"
Loading