From 4d44ab55f4c1b40511e30f7895a30479b29ecc74 Mon Sep 17 00:00:00 2001 From: Morten Torkildsen Date: Wed, 16 Feb 2022 10:56:14 -0800 Subject: [PATCH] Update to go1.17 (#2804) --- .github/workflows/checkLicenses.yml | 4 +- .github/workflows/e2eEnvironment.yml | 2 +- .github/workflows/go.yml | 4 +- .github/workflows/live-e2e.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/verifyContent.yml | 2 +- go.mod | 78 +++++++++++++++++++++++++++- 7 files changed, 84 insertions(+), 10 deletions(-) diff --git a/.github/workflows/checkLicenses.yml b/.github/workflows/checkLicenses.yml index 13f72003f6..c739a4c111 100644 --- a/.github/workflows/checkLicenses.yml +++ b/.github/workflows/checkLicenses.yml @@ -21,10 +21,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Go 1.16 + - name: Set up Go 1.17 uses: actions/setup-go@v1 with: - go-version: 1.16 + go-version: 1.17 - run: | ./scripts/create-licenses.sh # Upload the licenses list so it's available if needed diff --git a/.github/workflows/e2eEnvironment.yml b/.github/workflows/e2eEnvironment.yml index 5b47476e1c..54fef10506 100644 --- a/.github/workflows/e2eEnvironment.yml +++ b/.github/workflows/e2eEnvironment.yml @@ -33,7 +33,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 - uses: actions/checkout@master # Pinned to Commit to ensure action is consistent: https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions # If you upgrade this version confirm the changes match your expectations diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 1cd81adbc0..865c2eff0c 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -22,10 +22,10 @@ jobs: name: Build runs-on: ubuntu-latest steps: - - name: Set up Go 1.16 + - name: Set up Go 1.17 uses: actions/setup-go@v1 with: - go-version: 1.16 + go-version: 1.17 id: go - name: Check out code into the Go module directory uses: actions/checkout@v1 diff --git a/.github/workflows/live-e2e.yml b/.github/workflows/live-e2e.yml index 1efc34de56..810e5e78f9 100644 --- a/.github/workflows/live-e2e.yml +++ b/.github/workflows/live-e2e.yml @@ -33,7 +33,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 - uses: actions/checkout@master # Pinned to Commit to ensure action is consistent: https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions # If you upgrade this version confirm the changes match your expectations diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e39f3a391..b0fe49776e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 - name: Checkout uses: actions/checkout@v2 with: diff --git a/.github/workflows/verifyContent.yml b/.github/workflows/verifyContent.yml index 20e2fbaa70..e35ebb4c4f 100644 --- a/.github/workflows/verifyContent.yml +++ b/.github/workflows/verifyContent.yml @@ -30,7 +30,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 - uses: actions/checkout@v2 - run: | make build diff --git a/go.mod b/go.mod index 958d72bf90..99a9ad9a76 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/GoogleContainerTools/kpt -go 1.16 +go 1.17 require ( github.com/cpuguy83/go-md2man/v2 v2.0.0 @@ -21,10 +21,84 @@ require ( k8s.io/cli-runtime v0.22.2 k8s.io/client-go v0.22.2 k8s.io/klog/v2 v2.10.0 - k8s.io/kube-openapi v0.0.0-20211109043139-026bd182f079 // indirect k8s.io/kubectl v0.22.2 sigs.k8s.io/cli-utils v0.27.0 sigs.k8s.io/controller-runtime v0.10.1 sigs.k8s.io/kustomize/api v0.11.1 sigs.k8s.io/kustomize/kyaml v0.13.3 ) + +require ( + cloud.google.com/go v0.81.0 // indirect + github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/Azure/go-autorest v14.2.0+incompatible // indirect + github.com/Azure/go-autorest/autorest v0.11.18 // indirect + github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect + github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect + github.com/Azure/go-autorest/logger v0.2.1 // indirect + github.com/Azure/go-autorest/tracing v0.6.0 // indirect + github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect + github.com/PuerkitoBio/purell v1.1.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect + github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect + github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/evanphx/json-patch v4.11.0+incompatible // indirect + github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect + github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect + github.com/fvbommel/sortorder v1.0.1 // indirect + github.com/go-logr/logr v0.4.0 // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.19.5 // indirect + github.com/go-openapi/swag v0.19.14 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/btree v1.0.1 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect + github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jonboulle/clockwork v0.2.2 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.11 // indirect + github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect + github.com/mailru/easyjson v0.7.6 // indirect + github.com/mitchellh/go-wordwrap v1.0.0 // indirect + github.com/mitchellh/mapstructure v1.4.1 // indirect + github.com/moby/spdystream v0.2.0 // indirect + github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect + github.com/onsi/gomega v1.16.0 // indirect + github.com/peterbourgon/diskv v2.0.1+incompatible // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/russross/blackfriday v1.5.2 // indirect + github.com/russross/blackfriday/v2 v2.0.1 // indirect + github.com/sergi/go-diff v1.1.0 // indirect + github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/spyzhov/ajson v0.4.2 // indirect + go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect + golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect + golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect + golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect + golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 // indirect + golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect + golang.org/x/text v0.3.6 // indirect + golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.26.0 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + k8s.io/component-base v0.22.2 // indirect + k8s.io/kube-openapi v0.0.0-20211109043139-026bd182f079 // indirect + k8s.io/utils v0.0.0-20210820185131-d34e5cb4466e // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect +)