From e47da87ef63b026273a4513a890803958c29cb8c Mon Sep 17 00:00:00 2001 From: Nick Ethier Date: Fri, 29 Apr 2022 10:56:59 -0400 Subject: [PATCH] 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")