Skip to content
This repository has been archived by the owner on Mar 19, 2024. It is now read-only.

Commit

Permalink
ci: bump Go version to 1.18 (#167)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
mikemorris authored Apr 28, 2022
1 parent 7e854ef commit 8cd8b37
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .changelog/167.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
go: build with Go 1.18
```
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conformance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
default: '10'

env:
GO_VERSION: "1.17"
GO_VERSION: "1.18"

jobs:
run-on-kind:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 2 additions & 0 deletions internal/commands/server/k8s_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -966,13 +966,15 @@ 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")

// Service two listener overrides default config
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")

Expand Down

0 comments on commit 8cd8b37

Please sign in to comment.