rebase against feature-tproxy

hashicorp · Apr 6, 2021 · fd2e0a7 · fd2e0a7
1 parent f2589f6
commit fd2e0a7
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 27 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -86,7 +86,7 @@ jobs:
     machine:
       image: ubuntu-2004:202010-01
     resource_class: xlarge
-    parallelism: 5
+    parallelism: 6
     steps:
       - checkout
       - run:
@@ -615,7 +615,7 @@ workflows:
             - go-fmt-and-vet-helm-gen
       - test-helm-gen
       - unit-helm
-      - acceptance
+      - acceptance:
           requires:
             - unit-helm
             - unit-acceptance-framework

diff --git a/templates/connect-inject-deployment.yaml b/templates/connect-inject-deployment.yaml
@@ -87,8 +87,8 @@ spec:
                 -consul-image="{{ default .Values.global.image .Values.connectInject.imageConsul }}" \
                 -envoy-image="{{ .Values.global.imageEnvoy }}" \
                 -consul-k8s-image="{{ default .Values.global.imageK8S .Values.connectInject.image }}" \
-                -release-name="{{ .Release.Name }} \
-                -release-namespace="{{ .Release.Namespace }} \
+                -release-name="{{ .Release.Name }}" \
+                -release-namespace="{{ .Release.Namespace }}" \
                 -listen=:8080 \
                 {{- if .Values.connectInject.logLevel }}
                 -log-level={{ .Values.connectInject.logLevel }} \

diff --git a/templates/connect-inject-mutatingwebhook.yaml b/templates/connect-inject-mutatingwebhook.yaml
@@ -26,7 +26,6 @@ webhooks:
         name: {{ template "consul.fullname" . }}-connect-injector-svc
         namespace: {{ .Release.Namespace }}
         path: "/mutate"
-      caBundle: Cg==
     rules:
       - operations: [ "CREATE" ]
         apiGroups: [""]

diff --git a/test/acceptance/tests/connect/connect_inject_test.go b/test/acceptance/tests/connect/connect_inject_test.go
@@ -27,8 +27,8 @@ func TestConnectInject(t *testing.T) {
 		autoEncrypt bool
 	}{
 		{false, false},
-		//{true, false},
-		//{true, true},
+		{true, false},
+		{true, true},
 	}
 
 	for _, c := range cases {

diff --git a/test/acceptance/tests/controller/controller_test.go b/test/acceptance/tests/controller/controller_test.go
@@ -23,8 +23,8 @@ func TestController(t *testing.T) {
 		autoEncrypt bool
 	}{
 		{false, false},
-		//{true, false},
-		//{true, true},
+		{true, false},
+		{true, true},
 	}
 
 	// The name of a service intention in consul is

diff --git a/test/acceptance/tests/ingress-gateway/ingress_gateway_test.go b/test/acceptance/tests/ingress-gateway/ingress_gateway_test.go
@@ -23,14 +23,14 @@ func TestIngressGateway(t *testing.T) {
 			false,
 			false,
 		},
-		//{
-		//	true,
-		//	false,
-		//},
-		//{
-		//	true,
-		//	true,
-		//},
+		{
+			true,
+			false,
+		},
+		{
+			true,
+			true,
+		},
 	}
 	for _, c := range cases {
 		name := fmt.Sprintf("secure: %t; auto-encrypt: %t", c.secure, c.autoEncrypt)

diff --git a/test/acceptance/tests/mesh-gateway/mesh_gateway_test.go b/test/acceptance/tests/mesh-gateway/mesh_gateway_test.go
@@ -131,8 +131,6 @@ func TestMeshGatewayDefault(t *testing.T) {
 // Test that Connect and wan federation over mesh gateways work in a secure installation,
 // with ACLs and TLS with and without auto-encrypt enabled.
 func TestMeshGatewaySecure(t *testing.T) {
-	// Skip until the endpoints controller supports TLS and ACLs.
-	t.Skip()
 	cases := []struct {
 		name              string
 		enableAutoEncrypt string

diff --git a/test/acceptance/tests/terminating-gateway/terminating_gateway_test.go b/test/acceptance/tests/terminating-gateway/terminating_gateway_test.go
@@ -28,14 +28,14 @@ func TestTerminatingGateway(t *testing.T) {
 			false,
 			false,
 		},
-		//{
-		//	true,
-		//	true,
-		//},
-		//{
-		//	true,
-		//	true,
-		//},
+		{
+			true,
+			true,
+		},
+		{
+			true,
+			true,
+		},
 	}
 	for _, c := range cases {
 		name := fmt.Sprintf("secure: %t, auto-encrypt: %t", c.secure, c.autoEncrypt)