Skip to content

Commit

Permalink
Run against latest consul version
Browse files Browse the repository at this point in the history
  • Loading branch information
Ashwin Venkatesh committed Dec 7, 2021
1 parent 37edc9f commit 0507cd6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ commands:
type: string
consul-k8s-image:
type: string
default: "docker.mirror.hashicorp.services/hashicorpdev/consul-k8s-control-plane:latest"
default: "ashwinvenkatesh/consul-k8s@sha256:ca2bde89a28563d40100039c217df6f750cc8b3bd72b31036bb1aaaff74f23fc"
go-path:
type: string
default: "/home/circleci/.go_workspace"
Expand Down
4 changes: 2 additions & 2 deletions acceptance/tests/controller/controller_namespaces_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func TestControllerNamespaces(t *testing.T) {
ctx := suite.Environment().DefaultContext(t)

helmValues := map[string]string{
"global.image": "hashicorp/consul-enterprise:1.11.0-ent-beta3",
"global.image": "ashwinvenkatesh/consul@sha256:4be07b9c90fc590827ad72328da332c2003a14d237df317a0c977817f6fdaf0b",

"global.enableConsulNamespaces": "true",
"global.adminPartitions.enabled": "true",
Expand Down Expand Up @@ -156,7 +156,7 @@ func TestControllerNamespaces(t *testing.T) {
require.True(r, ok, "could not cast to ProxyConfigEntry")
require.Equal(r, api.MeshGatewayModeLocal, proxyDefaultEntry.MeshGateway.Mode)

// partition-exports
// exported-services
entry, _, err = consulClient.ConfigEntries().Get(api.ExportedServices, "default", defaultOpts)
require.NoError(r, err)
exportedServicesEntry, ok := entry.(*api.ExportedServicesConfigEntry)
Expand Down
2 changes: 1 addition & 1 deletion charts/consul/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ global:
# image: "hashicorp/consul-enterprise:1.10.0-ent"
# ```
# @default: hashicorp/consul:<latest version>
image: "hashicorp/consul:1.10.4"
image: "ashwinvenkatesh/consul@sha256:4be07b9c90fc590827ad72328da332c2003a14d237df317a0c977817f6fdaf0b"

# 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

0 comments on commit 0507cd6

Please sign in to comment.