diff --git a/Chart.yaml b/Chart.yaml index 687ab6179ad4..ab3b99f8329e 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: consul version: 0.32.0-beta3 -appVersion: 1.10.0-rc +appVersion: 1.10.0-rc2 kubeVersion: ">=1.16.0-0" description: Official HashiCorp Consul Chart home: https://www.consul.io @@ -14,7 +14,7 @@ annotations: artifacthub.io/prerelease: true artifacthub.io/images: | - name: consul - image: hashicorp/consul:1.10.0-rc + image: hashicorp/consul:1.10.0-rc2 - name: consul-k8s image: hashicorp/consul-k8s:0.26.0-beta3 - name: envoy diff --git a/test/acceptance/tests/mesh-gateway/mesh_gateway_test.go b/test/acceptance/tests/mesh-gateway/mesh_gateway_test.go index a65e70f01138..48c56b24fcee 100644 --- a/test/acceptance/tests/mesh-gateway/mesh_gateway_test.go +++ b/test/acceptance/tests/mesh-gateway/mesh_gateway_test.go @@ -36,10 +36,7 @@ func TestMeshGatewayDefault(t *testing.T) { "global.federation.createFederationSecret": "true", "connectInject.enabled": "true", - // Temporarily disable tproxy regardless of the global setting. - // This should be removed once multi-cluster is working with explicit upstreams. - "connectInject.transparentProxy.defaultEnabled": "false", - "controller.enabled": "true", + "controller.enabled": "true", "meshGateway.enabled": "true", "meshGateway.replicas": "1", @@ -85,9 +82,6 @@ func TestMeshGatewayDefault(t *testing.T) { "server.extraVolumes[0].items[0].path": "config.json", "connectInject.enabled": "true", - // Temporarily disable tproxy regardless of the global setting. - // This should be removed once multi-cluster is working with explicit upstreams. - "connectInject.transparentProxy.defaultEnabled": "false", "meshGateway.enabled": "true", "meshGateway.replicas": "1", @@ -166,10 +160,7 @@ func TestMeshGatewaySecure(t *testing.T) { "global.federation.createFederationSecret": "true", "connectInject.enabled": "true", - // Temporarily disable tproxy regardless of the global setting. - // This should be removed once multi-cluster is working with explicit upstreams. - "connectInject.transparentProxy.defaultEnabled": "false", - "controller.enabled": "true", + "controller.enabled": "true", "meshGateway.enabled": "true", "meshGateway.replicas": "1", @@ -220,9 +211,6 @@ func TestMeshGatewaySecure(t *testing.T) { "server.extraVolumes[0].items[0].path": "config.json", "connectInject.enabled": "true", - // Temporarily disable tproxy regardless of the global setting. - // This should be removed once multi-cluster is working with explicit upstreams. - "connectInject.transparentProxy.defaultEnabled": "false", "meshGateway.enabled": "true", "meshGateway.replicas": "1", diff --git a/values.yaml b/values.yaml index df22948aabc0..51ee6b5f0e36 100644 --- a/values.yaml +++ b/values.yaml @@ -32,7 +32,7 @@ global: # image: "hashicorp/consul-enterprise:1.5.0-ent" # ``` # @default: hashicorp/consul: - image: "hashicorp/consul:1.10.0-rc" + image: "hashicorp/consul:1.10.0-rc2" # 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 Docker image.