Skip to content

Commit cde85f3

Browse files
cjeradsnay2
cjerad
and
snay2
authored
upgrade to Go 1.19 (#726)
* upgrade to Go 1.19 * update Go version in Dockerfile.windows * update workflows to use Go ^1.19.3 * Add override for NTH so the license check will find it * Add NTH to THIRD_PARTY_LICENSES to satisfy the license check Co-authored-by: Steve Nay <265958+snay2@users.noreply.github.com>
1 parent eaf8c71 commit cde85f3

File tree

12 files changed

+107
-28
lines changed

12 files changed

+107
-28
lines changed

‎.github/workflows/build-and-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
- cron: '0 19 * * 1-5'
1414

1515
env:
16-
DEFAULT_GO_VERSION: 1.16
16+
DEFAULT_GO_VERSION: ^1.19.3
1717
GITHUB_USERNAME: ${{ secrets.EC2_BOT_GITHUB_USERNAME }}
1818
GITHUB_TOKEN: ${{ secrets.EC2_BOT_GITHUB_TOKEN }}
1919
WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}

‎.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
contents: write # required for uploading releases
1010

1111
env:
12-
DEFAULT_GO_VERSION: ^1.16
12+
DEFAULT_GO_VERSION: ^1.19.3
1313
GITHUB_USERNAME: ${{ secrets.EC2_BOT_GITHUB_USERNAME }}
1414
GITHUB_TOKEN: ${{ secrets.EC2_BOT_GITHUB_TOKEN }}
1515
WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM golang:1.16 as builder
1+
FROM --platform=$BUILDPLATFORM golang:1.19 as builder
22

33
## GOLANG env
44
ARG GOPROXY="https://proxy.golang.org|direct"

‎Dockerfile.windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG WINDOWS_VERSION=1809
22

33
# Build the manager binary
4-
FROM --platform=windows/amd64 golang:1.16 as builder
4+
FROM --platform=windows/amd64 golang:1.19 as builder
55

66
## GOLANG env
77
ENV GO111MODULE="on" CGO_ENABLED="0" GOOS="windows" GOARCH="amd64"

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<a href="https://github.com/kubernetes/kubernetes/releases">
77
<img src="https://img.shields.io/badge/Kubernetes-%3E%3D%201.18-brightgreen" alt="kubernetes">
88
</a>
9-
<a href="https://golang.org/doc/go1.16">
9+
<a href="https://golang.org/doc/go1.19">
1010
<img src="https://img.shields.io/github/go-mod/go-version/aws/aws-node-termination-handler?color=blueviolet" alt="go-version">
1111
</a>
1212
<a href="https://opensource.org/licenses/Apache-2.0">

‎THIRD_PARTY_LICENSES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -912,6 +912,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
912912
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
913913
THE SOFTWARE.
914914
------
915+
** github.com/aws/aws-node-termination-handler ---
915916
** github.com/Masterminds/goutils; v1.1.1 ---
916917
** github.com/go-openapi/jsonpointer; v0.19.3 ---
917918
** github.com/go-openapi/jsonreference; v0.19.3 ---

‎go.mod

Lines changed: 89 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,106 @@
11
module github.com/aws/aws-node-termination-handler
22

3-
go 1.16
3+
go 1.19
44

55
require (
66
github.com/Masterminds/sprig/v3 v3.2.2
77
github.com/aws/aws-sdk-go v1.38.55
8-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
9-
github.com/huandu/xstrings v1.3.2 // indirect
10-
github.com/mitchellh/copystructure v1.2.0 // indirect
118
github.com/rs/zerolog v1.22.0
129
go.opentelemetry.io/contrib/instrumentation/runtime v0.20.0
1310
go.opentelemetry.io/otel v0.20.0
1411
go.opentelemetry.io/otel/exporters/metric/prometheus v0.20.0
1512
go.opentelemetry.io/otel/metric v0.20.0
1613
go.uber.org/multierr v1.7.0
17-
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
18-
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect
19-
golang.org/x/sys v0.0.0-20210608053332-aa57babbf139
20-
golang.org/x/term v0.0.0-20210503060354-a79de5458b56 // indirect
14+
golang.org/x/sys v0.2.0
2115
k8s.io/api v0.21.1
2216
k8s.io/apimachinery v0.21.1
2317
k8s.io/client-go v0.21.1
2418
k8s.io/kubectl v0.21.1
2519
)
20+
21+
require (
22+
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
23+
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
24+
github.com/Masterminds/goutils v1.1.1 // indirect
25+
github.com/Masterminds/semver/v3 v3.1.1 // indirect
26+
github.com/PuerkitoBio/purell v1.1.1 // indirect
27+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
28+
github.com/beorn7/perks v1.0.1 // indirect
29+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
30+
github.com/davecgh/go-spew v1.1.1 // indirect
31+
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
32+
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
33+
github.com/go-errors/errors v1.0.1 // indirect
34+
github.com/go-logr/logr v0.4.0 // indirect
35+
github.com/go-openapi/jsonpointer v0.19.3 // indirect
36+
github.com/go-openapi/jsonreference v0.19.3 // indirect
37+
github.com/go-openapi/spec v0.19.5 // indirect
38+
github.com/go-openapi/swag v0.19.5 // indirect
39+
github.com/gogo/protobuf v1.3.2 // indirect
40+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
41+
github.com/golang/protobuf v1.4.3 // indirect
42+
github.com/google/btree v1.0.0 // indirect
43+
github.com/google/go-cmp v0.5.5 // indirect
44+
github.com/google/gofuzz v1.1.0 // indirect
45+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
46+
github.com/google/uuid v1.1.2 // indirect
47+
github.com/googleapis/gnostic v0.4.1 // indirect
48+
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
49+
github.com/huandu/xstrings v1.3.2 // indirect
50+
github.com/imdario/mergo v0.3.11 // indirect
51+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
52+
github.com/jmespath/go-jmespath v0.4.0 // indirect
53+
github.com/json-iterator/go v1.1.10 // indirect
54+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
55+
github.com/mailru/easyjson v0.7.0 // indirect
56+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
57+
github.com/mitchellh/copystructure v1.2.0 // indirect
58+
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
59+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
60+
github.com/moby/spdystream v0.2.0 // indirect
61+
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
62+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
63+
github.com/modern-go/reflect2 v1.0.1 // indirect
64+
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
65+
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
66+
github.com/pkg/errors v0.9.1 // indirect
67+
github.com/pmezard/go-difflib v1.0.0 // indirect
68+
github.com/prometheus/client_golang v1.10.0 // indirect
69+
github.com/prometheus/client_model v0.2.0 // indirect
70+
github.com/prometheus/common v0.18.0 // indirect
71+
github.com/prometheus/procfs v0.6.0 // indirect
72+
github.com/russross/blackfriday v1.5.2 // indirect
73+
github.com/shopspring/decimal v1.2.0 // indirect
74+
github.com/spf13/cast v1.3.1 // indirect
75+
github.com/spf13/cobra v1.1.1 // indirect
76+
github.com/spf13/pflag v1.0.5 // indirect
77+
github.com/stretchr/testify v1.7.0 // indirect
78+
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
79+
go.opentelemetry.io/contrib v0.20.0 // indirect
80+
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
81+
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
82+
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
83+
go.opentelemetry.io/otel/trace v0.20.0 // indirect
84+
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
85+
go.uber.org/atomic v1.7.0 // indirect
86+
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
87+
golang.org/x/net v0.2.0 // indirect
88+
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
89+
golang.org/x/term v0.2.0 // indirect
90+
golang.org/x/text v0.4.0 // indirect
91+
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
92+
google.golang.org/appengine v1.6.5 // indirect
93+
google.golang.org/protobuf v1.25.0 // indirect
94+
gopkg.in/inf.v0 v0.9.1 // indirect
95+
gopkg.in/yaml.v2 v2.4.0 // indirect
96+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
97+
k8s.io/cli-runtime v0.21.1 // indirect
98+
k8s.io/component-base v0.21.1 // indirect
99+
k8s.io/klog/v2 v2.8.0 // indirect
100+
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
101+
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
102+
sigs.k8s.io/kustomize/api v0.8.8 // indirect
103+
sigs.k8s.io/kustomize/kyaml v0.10.17 // indirect
104+
sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
105+
sigs.k8s.io/yaml v1.2.0 // indirect
106+
)

‎go.sum

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnweb
8686
github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
8787
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
8888
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
89-
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
9089
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
9190
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
9291
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -698,9 +697,8 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R
698697
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
699698
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
700699
golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
701-
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
702-
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0=
703-
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
700+
golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
701+
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
704702
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
705703
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
706704
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -759,21 +757,21 @@ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7w
759757
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
760758
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
761759
golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
762-
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
763-
golang.org/x/sys v0.0.0-20210608053332-aa57babbf139 h1:C+AwYEtBp/VQwoLntUmQ/yx3MS9vmZaKNdw5eOpoQe8=
764-
golang.org/x/sys v0.0.0-20210608053332-aa57babbf139/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
760+
golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
761+
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
765762
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
766763
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
767764
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
768-
golang.org/x/term v0.0.0-20210503060354-a79de5458b56 h1:b8jxX3zqjpqb2LklXPzKSGJhzyxCOZSz8ncv8Nv+y7w=
769-
golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY=
765+
golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM=
766+
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
770767
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
771768
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
772769
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
773770
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
774771
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
775-
golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
776772
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
773+
golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
774+
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
777775
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
778776
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
779777
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -918,7 +916,6 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
918916
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
919917
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
920918
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
921-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
922919
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
923920
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
924921
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎test/license-test/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.16
1+
FROM golang:1.19
22

33
WORKDIR /app
44

‎test/readme-test/spellcheck-Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.16
1+
FROM golang:1.19
22

33
RUN go install github.com/client9/misspell/cmd/misspell@v0.3.4
44

0 commit comments

Comments
 (0)