From 494d7d871f4b8fcf357ec67cae383c7aa7ceee81 Mon Sep 17 00:00:00 2001 From: Andrew Stucki Date: Wed, 27 Apr 2022 12:09:31 -0400 Subject: [PATCH 1/8] Add promote-dev-docker step to ci.hcl (#169) --- .release/ci.hcl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.release/ci.hcl b/.release/ci.hcl index 81628d17c..2cd172c97 100644 --- a/.release/ci.hcl +++ b/.release/ci.hcl @@ -94,6 +94,20 @@ event "verify" { } } +event "promote-dev-docker" { + depends = ["verify"] + action "promote-dev-docker" { + organization = "hashicorp" + repository = "crt-workflows-common" + workflow = "promote-dev-docker" + depends = ["verify"] + } + + notification { + on = "fail" + } +} + ## These are promotion and post-publish events ## they should be added to the end of the file after the verify event stanza. From f2cff57f627df6e8856533bc6966a012df04774d Mon Sep 17 00:00:00 2001 From: Andrew Stucki Date: Wed, 27 Apr 2022 12:46:12 -0400 Subject: [PATCH 2/8] Add dev_tags section for build.yml (#171) --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09ba41ff9..8a25bac31 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -116,3 +116,5 @@ jobs: arch: ${{matrix.arch}} tags: | docker.io/hashicorp/${{env.repo}}:${{env.version}} + dev_tags: | + docker.io/hashicorppreview/${{env.repo}}:${{env.version}} From 00065d67dd2b2f54eda7c3b741e5f5401579597f Mon Sep 17 00:00:00 2001 From: Andrew Stucki Date: Wed, 27 Apr 2022 13:49:35 -0400 Subject: [PATCH 3/8] Add context to TCPRouteController initialization (#175) --- internal/k8s/controller.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/k8s/controller.go b/internal/k8s/controller.go index 28a8016fc..4f97ea46b 100644 --- a/internal/k8s/controller.go +++ b/internal/k8s/controller.go @@ -200,6 +200,7 @@ func (k *Kubernetes) Start(ctx context.Context) error { } err = (&controllers.TCPRouteReconciler{ + Context: ctx, Client: gwClient, Log: k.logger.Named("TCPRoute"), Manager: reconcileManager, From 7e854ef96597abd54818dc2157025969d94d3b07 Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Wed, 27 Apr 2022 14:07:10 -0400 Subject: [PATCH 4/8] conformance: remove Helm chart consul image config (#173) --- internal/testing/conformance/consul-config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/testing/conformance/consul-config.yaml b/internal/testing/conformance/consul-config.yaml index 83acb2864..7a7903547 100644 --- a/internal/testing/conformance/consul-config.yaml +++ b/internal/testing/conformance/consul-config.yaml @@ -1,5 +1,4 @@ global: - image: "hashicorp/consul:1.12.0" # TODO Remove once 1.12.0 is consumed in consul-k8s tls: enabled: true server: From 8cd8b378b83d598900a2b2eb59d36389b1f91fd0 Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Thu, 28 Apr 2022 12:21:15 -0400 Subject: [PATCH 5/8] ci: bump Go version to 1.18 (#167) * deps: bump reflect2 for Go 1.18 compatibility * ci: bump GO_VERSION to 1.18 * changelog: add entry for bumping Go to 1.18 for builds * e2e: pass TLS min version 1.0 config to checkTCPTLSRoute http client where needed Go 1.18 disabled TLS 1.0 and 1.1 by default for client connections https://tip.golang.org/doc/go1.18#tls10 --- .changelog/167.txt | 3 +++ .github/workflows/ci.yml | 6 +++--- .github/workflows/conformance.yml | 2 +- go.mod | 2 +- go.sum | 3 ++- internal/commands/server/k8s_e2e_test.go | 2 ++ 6 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 .changelog/167.txt diff --git a/.changelog/167.txt b/.changelog/167.txt new file mode 100644 index 000000000..4e4c287e0 --- /dev/null +++ b/.changelog/167.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +go: build with Go 1.18 +``` diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7cf43b8f6..906051686 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ on: pull_request: branches: ["main", "release/**"] env: - GO_VERSION: '1.17' + GO_VERSION: '1.18' CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }} jobs: lint: @@ -35,7 +35,7 @@ jobs: name: unit test (consul-version=${{ matrix.consul-version }}) strategy: matrix: - consul-version: + consul-version: - 1.11.5 - 1.12.0 - 1.11.5+ent @@ -86,7 +86,7 @@ jobs: name: e2e tests (consul-image=${{ matrix.consul-image }}) strategy: matrix: - consul-image: + consul-image: - 'hashicorp/consul:1.11.5' - 'hashicorp/consul-enterprise:1.11.5-ent' - 'hashicorp/consul:1.12.0' diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index b3f89f94e..93ed1f2ea 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -24,7 +24,7 @@ on: default: '10' env: - GO_VERSION: "1.17" + GO_VERSION: "1.18" jobs: run-on-kind: diff --git a/go.mod b/go.mod index 2445628da..464028b95 100644 --- a/go.mod +++ b/go.mod @@ -82,7 +82,7 @@ require ( github.com/moby/sys/mount v0.2.0 // indirect github.com/moby/sys/mountinfo v0.4.1 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect github.com/onsi/gomega v1.15.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.1 // indirect diff --git a/go.sum b/go.sum index 74c589732..8bee28e01 100644 --- a/go.sum +++ b/go.sum @@ -651,8 +651,9 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= diff --git a/internal/commands/server/k8s_e2e_test.go b/internal/commands/server/k8s_e2e_test.go index a22d809a0..e7db766a7 100644 --- a/internal/commands/server/k8s_e2e_test.go +++ b/internal/commands/server/k8s_e2e_test.go @@ -966,6 +966,7 @@ func TestTCPMeshService(t *testing.T) { // supported by Envoy defaults checkTCPTLSRoute(t, listenerOnePort, &tls.Config{ InsecureSkipVerify: true, + MinVersion: tls.VersionTLS10, MaxVersion: tls.VersionTLS11, }, "remote error: tls: protocol version not supported", "connection not rejected with expected error in allotted time") @@ -973,6 +974,7 @@ func TestTCPMeshService(t *testing.T) { checkTCPTLSRoute(t, listenerTwoPort, &tls.Config{ InsecureSkipVerify: true, CipherSuites: []uint16{tls.TLS_RSA_WITH_AES_128_CBC_SHA}, + MinVersion: tls.VersionTLS10, MaxVersion: tls.VersionTLS11, }, serviceTwo.Name, "service not routable in allotted time") From 5986efb2a3dbf77fe65b6601435eebbe1b2d2439 Mon Sep 17 00:00:00 2001 From: Andrew Stucki Date: Fri, 29 Apr 2022 07:12:34 -0400 Subject: [PATCH 6/8] Bug: LoadBalancers - Use Hostnames in addition to IP (#187) * Use Hostnames in addition to IPs * Add changelog entry --- .changelog/187.txt | 3 +++ internal/k8s/reconciler/gateway.go | 10 ++++++++-- internal/k8s/reconciler/gateway_test.go | 17 ++++++++++------- 3 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 .changelog/187.txt diff --git a/.changelog/187.txt b/.changelog/187.txt new file mode 100644 index 000000000..8a758c791 --- /dev/null +++ b/.changelog/187.txt @@ -0,0 +1,3 @@ +```release-note:bug +k8s/reconciler: gateway addresses have invalid empty string when LoadBalancer services use a hostname for ExternalIP (like EKS) +``` diff --git a/internal/k8s/reconciler/gateway.go b/internal/k8s/reconciler/gateway.go index baf242104..0b81fbcfb 100644 --- a/internal/k8s/reconciler/gateway.go +++ b/internal/k8s/reconciler/gateway.go @@ -187,8 +187,14 @@ func (g *K8sGateway) assignGatewayIPFromServiceIngress(ctx context.Context, serv } for _, ingress := range updated.Status.LoadBalancer.Ingress { - g.serviceReady = true - g.addresses = append(g.addresses, ingress.IP) + if ingress.IP != "" { + g.serviceReady = true + g.addresses = append(g.addresses, ingress.IP) + } + if ingress.Hostname != "" { + g.serviceReady = true + g.addresses = append(g.addresses, ingress.Hostname) + } } return nil diff --git a/internal/k8s/reconciler/gateway_test.go b/internal/k8s/reconciler/gateway_test.go index b651b10c8..825dd2b1e 100644 --- a/internal/k8s/reconciler/gateway_test.go +++ b/internal/k8s/reconciler/gateway_test.go @@ -103,6 +103,9 @@ func TestGatewayValidateGatewayIP(t *testing.T) { { IP: "4.4.4.4", }, + { + Hostname: "this.is.a.hostname", + }, }, }, }, @@ -110,7 +113,7 @@ func TestGatewayValidateGatewayIP(t *testing.T) { for _, tc := range []struct { // What IP address do we expect the Gateway to be assigned? - expectedIP string + expectedIPs []string // Should the mock client expect a request for the Service? // If false, the mock client expects a request for the Pod instead. @@ -120,22 +123,22 @@ func TestGatewayValidateGatewayIP(t *testing.T) { serviceType *core.ServiceType }{ { - expectedIP: pod.Status.PodIP, + expectedIPs: []string{pod.Status.PodIP}, expectedIPFromSvc: false, serviceType: nil, }, { - expectedIP: pod.Status.HostIP, + expectedIPs: []string{pod.Status.HostIP}, expectedIPFromSvc: false, serviceType: serviceType(core.ServiceTypeNodePort), }, { - expectedIP: svc.Status.LoadBalancer.Ingress[0].IP, + expectedIPs: []string{svc.Status.LoadBalancer.Ingress[0].IP, svc.Status.LoadBalancer.Ingress[1].Hostname}, expectedIPFromSvc: true, serviceType: serviceType(core.ServiceTypeLoadBalancer), }, { - expectedIP: svc.Spec.ClusterIP, + expectedIPs: []string{svc.Spec.ClusterIP}, expectedIPFromSvc: true, serviceType: serviceType(core.ServiceTypeClusterIP), }, @@ -163,8 +166,8 @@ func TestGatewayValidateGatewayIP(t *testing.T) { } assert.NoError(t, gateway.validateGatewayIP(context.Background())) - require.Len(t, gateway.addresses, 1) - assert.Equal(t, tc.expectedIP, gateway.addresses[0]) + require.Len(t, gateway.addresses, len(tc.expectedIPs)) + assert.Equal(t, tc.expectedIPs, gateway.addresses) assert.True(t, gateway.serviceReady) }) From b2c1633276f97594fac3ae86346013fa7f0d6771 Mon Sep 17 00:00:00 2001 From: Andrew Stucki Date: Fri, 29 Apr 2022 07:20:45 -0400 Subject: [PATCH 7/8] Update versions --- CHANGELOG.md | 8 ++++++++ config/deployment/deployment.yaml | 2 +- dev/docs/example-setup.md | 6 +++--- .../k8s/builder/testdata/clusterip.deployment.golden.yaml | 2 +- .../builder/testdata/loadbalancer.deployment.golden.yaml | 2 +- .../testdata/static-mapping.deployment.golden.yaml | 2 +- .../k8s/builder/testdata/tls-cert.deployment.golden.yaml | 2 +- internal/version/version.go | 2 +- 8 files changed, 17 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f896af13..7c5410ce0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ ## UNRELEASED +IMPROVEMENTS: + +* go: build with Go 1.18 [[GH-167](https://github.com/hashicorp/consul-api-gateway/issues/167)] + +BUG FIXES: + +* k8s/reconciler: gateway addresses have invalid empty string when LoadBalancer services use a hostname for ExternalIP (like EKS) [[GH-187](https://github.com/hashicorp/consul-api-gateway/issues/187)] + ## 0.2.0 (April 27, 2022) BREAKING CHANGES: diff --git a/config/deployment/deployment.yaml b/config/deployment/deployment.yaml index ab57079da..265f1cfd9 100644 --- a/config/deployment/deployment.yaml +++ b/config/deployment/deployment.yaml @@ -20,7 +20,7 @@ spec: spec: serviceAccountName: consul-api-gateway-controller containers: - - image: hashicorp/consul-api-gateway:0.2.0 + - image: hashicorp/consul-api-gateway:0.2.1 command: ["consul-api-gateway", "server", "-consul-address", "$(HOST_IP):8501", "-ca-file", "/ca/tls.crt", "-sds-server-host", "$(IP)", "-k8s-namespace", "$(CONSUL_K8S_NAMESPACE)", "-log-level", "$(LOG_LEVEL)"] name: consul-api-gateway-controller ports: diff --git a/dev/docs/example-setup.md b/dev/docs/example-setup.md index e38064d1f..48dea6f8a 100644 --- a/dev/docs/example-setup.md +++ b/dev/docs/example-setup.md @@ -72,8 +72,8 @@ We have provided a set of `kustomize` manifests for installing the Consul API Ga Apply them to your cluster using the following commands. ```bash -kubectl apply -k "github.com/hashicorp/consul-api-gateway/config/crd?ref=v0.2.0" -kubectl apply -k "github.com/hashicorp/consul-api-gateway/config?ref=v0.2.0" +kubectl apply -k "github.com/hashicorp/consul-api-gateway/config/crd?ref=v0.2.1" +kubectl apply -k "github.com/hashicorp/consul-api-gateway/config?ref=v0.2.1" ``` ## Installing the demo Gateway and Mesh Service @@ -116,7 +116,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- github.com/hashicorp/consul-api-gateway/config/example?ref=v0.2.0 +- github.com/hashicorp/consul-api-gateway/config/example?ref=v0.2.1 patches: - target: diff --git a/internal/k8s/builder/testdata/clusterip.deployment.golden.yaml b/internal/k8s/builder/testdata/clusterip.deployment.golden.yaml index 7dce2c3fc..0ab2ee669 100644 --- a/internal/k8s/builder/testdata/clusterip.deployment.golden.yaml +++ b/internal/k8s/builder/testdata/clusterip.deployment.golden.yaml @@ -79,7 +79,7 @@ spec: - cp - /bin/consul-api-gateway - /bootstrap/consul-api-gateway - image: hashicorp/consul-api-gateway:0.2.0 + image: hashicorp/consul-api-gateway:0.2.1 name: consul-api-gateway-init resources: {} volumeMounts: diff --git a/internal/k8s/builder/testdata/loadbalancer.deployment.golden.yaml b/internal/k8s/builder/testdata/loadbalancer.deployment.golden.yaml index 3f95ab414..b466b8233 100644 --- a/internal/k8s/builder/testdata/loadbalancer.deployment.golden.yaml +++ b/internal/k8s/builder/testdata/loadbalancer.deployment.golden.yaml @@ -79,7 +79,7 @@ spec: - cp - /bin/consul-api-gateway - /bootstrap/consul-api-gateway - image: hashicorp/consul-api-gateway:0.2.0 + image: hashicorp/consul-api-gateway:0.2.1 name: consul-api-gateway-init resources: {} volumeMounts: diff --git a/internal/k8s/builder/testdata/static-mapping.deployment.golden.yaml b/internal/k8s/builder/testdata/static-mapping.deployment.golden.yaml index cc9979351..45be6ee36 100644 --- a/internal/k8s/builder/testdata/static-mapping.deployment.golden.yaml +++ b/internal/k8s/builder/testdata/static-mapping.deployment.golden.yaml @@ -82,7 +82,7 @@ spec: - cp - /bin/consul-api-gateway - /bootstrap/consul-api-gateway - image: hashicorp/consul-api-gateway:0.2.0 + image: hashicorp/consul-api-gateway:0.2.1 name: consul-api-gateway-init resources: {} volumeMounts: diff --git a/internal/k8s/builder/testdata/tls-cert.deployment.golden.yaml b/internal/k8s/builder/testdata/tls-cert.deployment.golden.yaml index 8a6574c1e..1739e0ea7 100644 --- a/internal/k8s/builder/testdata/tls-cert.deployment.golden.yaml +++ b/internal/k8s/builder/testdata/tls-cert.deployment.golden.yaml @@ -82,7 +82,7 @@ spec: - cp - /bin/consul-api-gateway - /bootstrap/consul-api-gateway - image: hashicorp/consul-api-gateway:0.2.0 + image: hashicorp/consul-api-gateway:0.2.1 name: consul-api-gateway-init resources: {} volumeMounts: diff --git a/internal/version/version.go b/internal/version/version.go index 063c4d26e..826d4df8a 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -14,7 +14,7 @@ var ( // // Version must conform to the format expected by // github.com/hashicorp/go-version for tests to work. - Version = "0.2.0" + Version = "0.2.1" // A pre-release marker for the version. If this is "" (empty string) // then it means that it is a final release. Otherwise, this is a pre-release From e47da87ef63b026273a4513a890803958c29cb8c Mon Sep 17 00:00:00 2001 From: Nick Ethier Date: Fri, 29 Apr 2022 10:56:59 -0400 Subject: [PATCH 8/8] Revert "ci: bump Go version to 1.18 (#167)" This reverts commit 8cd8b378b83d598900a2b2eb59d36389b1f91fd0. --- .changelog/167.txt | 3 --- .github/workflows/ci.yml | 6 +++--- .github/workflows/conformance.yml | 2 +- go.mod | 2 +- go.sum | 3 +-- internal/commands/server/k8s_e2e_test.go | 2 -- 6 files changed, 6 insertions(+), 12 deletions(-) delete mode 100644 .changelog/167.txt diff --git a/.changelog/167.txt b/.changelog/167.txt deleted file mode 100644 index 4e4c287e0..000000000 --- a/.changelog/167.txt +++ /dev/null @@ -1,3 +0,0 @@ -```release-note:enhancement -go: build with Go 1.18 -``` diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 906051686..7cf43b8f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ on: pull_request: branches: ["main", "release/**"] env: - GO_VERSION: '1.18' + GO_VERSION: '1.17' CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }} jobs: lint: @@ -35,7 +35,7 @@ jobs: name: unit test (consul-version=${{ matrix.consul-version }}) strategy: matrix: - consul-version: + consul-version: - 1.11.5 - 1.12.0 - 1.11.5+ent @@ -86,7 +86,7 @@ jobs: name: e2e tests (consul-image=${{ matrix.consul-image }}) strategy: matrix: - consul-image: + consul-image: - 'hashicorp/consul:1.11.5' - 'hashicorp/consul-enterprise:1.11.5-ent' - 'hashicorp/consul:1.12.0' diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index 93ed1f2ea..b3f89f94e 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -24,7 +24,7 @@ on: default: '10' env: - GO_VERSION: "1.18" + GO_VERSION: "1.17" jobs: run-on-kind: diff --git a/go.mod b/go.mod index 464028b95..2445628da 100644 --- a/go.mod +++ b/go.mod @@ -82,7 +82,7 @@ require ( github.com/moby/sys/mount v0.2.0 // indirect github.com/moby/sys/mountinfo v0.4.1 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect github.com/onsi/gomega v1.15.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.1 // indirect diff --git a/go.sum b/go.sum index 8bee28e01..74c589732 100644 --- a/go.sum +++ b/go.sum @@ -651,9 +651,8 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= diff --git a/internal/commands/server/k8s_e2e_test.go b/internal/commands/server/k8s_e2e_test.go index e7db766a7..a22d809a0 100644 --- a/internal/commands/server/k8s_e2e_test.go +++ b/internal/commands/server/k8s_e2e_test.go @@ -966,7 +966,6 @@ func TestTCPMeshService(t *testing.T) { // supported by Envoy defaults checkTCPTLSRoute(t, listenerOnePort, &tls.Config{ InsecureSkipVerify: true, - MinVersion: tls.VersionTLS10, MaxVersion: tls.VersionTLS11, }, "remote error: tls: protocol version not supported", "connection not rejected with expected error in allotted time") @@ -974,7 +973,6 @@ func TestTCPMeshService(t *testing.T) { checkTCPTLSRoute(t, listenerTwoPort, &tls.Config{ InsecureSkipVerify: true, CipherSuites: []uint16{tls.TLS_RSA_WITH_AES_128_CBC_SHA}, - MinVersion: tls.VersionTLS10, MaxVersion: tls.VersionTLS11, }, serviceTwo.Name, "service not routable in allotted time")