Skip to content
This repository has been archived by the owner on Aug 25, 2021. It is now read-only.

Commit

Permalink
rebase against feature-tproxy
Browse files Browse the repository at this point in the history
  • Loading branch information
ishustava committed Apr 6, 2021
1 parent f2589f6 commit 270e660
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
machine:
image: ubuntu-2004:202010-01
resource_class: xlarge
parallelism: 5
parallelism: 6
steps:
- checkout
- run:
Expand Down Expand Up @@ -615,7 +615,7 @@ workflows:
- go-fmt-and-vet-helm-gen
- test-helm-gen
- unit-helm
- acceptance
- acceptance:
requires:
- unit-helm
- unit-acceptance-framework
Expand Down
1 change: 0 additions & 1 deletion templates/connect-inject-mutatingwebhook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ webhooks:
name: {{ template "consul.fullname" . }}-connect-injector-svc
namespace: {{ .Release.Namespace }}
path: "/mutate"
caBundle: Cg==
rules:
- operations: [ "CREATE" ]
apiGroups: [""]
Expand Down
4 changes: 2 additions & 2 deletions test/acceptance/tests/connect/connect_inject_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions test/acceptance/tests/controller/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions test/acceptance/tests/ingress-gateway/ingress_gateway_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions test/acceptance/tests/mesh-gateway/mesh_gateway_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 270e660

Please sign in to comment.