diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 41798ea5e3..0e7363c439 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -13,7 +13,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: '1.16' + go-version: '1.17' id: go - name: Use Node 16.x diff --git a/.github/workflows/plugin_tests.yaml b/.github/workflows/plugin_tests.yaml index 6903ca3133..a2395d3175 100644 --- a/.github/workflows/plugin_tests.yaml +++ b/.github/workflows/plugin_tests.yaml @@ -25,7 +25,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: "1.16" + go-version: "1.17" id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/providers.yaml b/.github/workflows/providers.yaml index 61676443ee..6263e35c65 100644 --- a/.github/workflows/providers.yaml +++ b/.github/workflows/providers.yaml @@ -27,7 +27,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: '1.16' + go-version: '1.17' id: go - name: Extract PR Info diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3082869ad5..8be627bbde 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -18,7 +18,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: '1.16' + go-version: '1.17' id: go - name: Use Node 16.x diff --git a/.github/workflows/release_staging.yaml b/.github/workflows/release_staging.yaml index 54f98ff350..1797cf411e 100644 --- a/.github/workflows/release_staging.yaml +++ b/.github/workflows/release_staging.yaml @@ -14,7 +14,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: '1.16' + go-version: '1.17' id: go - name: Use Node 16.x diff --git a/.github/workflows/security_codeql.yaml b/.github/workflows/security_codeql.yaml index f371b505dd..0252e2cbe7 100644 --- a/.github/workflows/security_codeql.yaml +++ b/.github/workflows/security_codeql.yaml @@ -13,7 +13,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: '1.16' + go-version: '1.17' id: go - name: Use Node 16.x diff --git a/.github/workflows/tkg_integration_tests.yaml b/.github/workflows/tkg_integration_tests.yaml index 941f88a206..cb3a318b05 100644 --- a/.github/workflows/tkg_integration_tests.yaml +++ b/.github/workflows/tkg_integration_tests.yaml @@ -26,7 +26,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: '1.16' + go-version: '1.17' id: go - name: Check out code into the Go module directory @@ -91,7 +91,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: '1.16' + go-version: '1.17' id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/tkgpackage_integration_test.yaml b/.github/workflows/tkgpackage_integration_test.yaml index d5205e8130..2c4585414f 100644 --- a/.github/workflows/tkgpackage_integration_test.yaml +++ b/.github/workflows/tkgpackage_integration_test.yaml @@ -27,7 +27,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: '1.16' + go-version: '1.17' id: go - name: Check out code into the Go module directory diff --git a/addons/Dockerfile b/addons/Dockerfile index cca2adac8b..fcb622401a 100644 --- a/addons/Dockerfile +++ b/addons/Dockerfile @@ -3,7 +3,7 @@ # Build from publicly reachable source by default, but allow people to re-build images on # top of their own trusted images. -ARG BUILDER_BASE_IMAGE=mirror.gcr.io/library/golang:1.16 +ARG BUILDER_BASE_IMAGE=mirror.gcr.io/library/golang:1.17 # Build the manager binary FROM $BUILDER_BASE_IMAGE as builder diff --git a/addons/go.mod b/addons/go.mod index 147dc22397..3e438d81f4 100644 --- a/addons/go.mod +++ b/addons/go.mod @@ -1,6 +1,6 @@ module github.com/vmware-tanzu/tanzu-framework/addons -go 1.16 +go 1.17 replace ( github.com/vmware-tanzu/tanzu-framework => ../ @@ -24,3 +24,60 @@ require ( sigs.k8s.io/cluster-api v1.0.1 sigs.k8s.io/controller-runtime v0.10.3 ) + +require ( + cloud.google.com/go v0.93.3 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/blang/semver v3.5.1+incompatible // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/coredns/caddy v1.1.1 // indirect + github.com/coredns/corefile-migration v1.0.13 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/docker/distribution v2.7.1+incompatible // indirect + github.com/evanphx/json-patch v4.11.0+incompatible // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/go-logr/zapr v0.4.0 // indirect + github.com/gobuffalo/flect v0.2.3 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.6 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/prometheus/client_golang v1.11.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.31.1 // indirect + github.com/prometheus/procfs v0.7.3 // indirect + github.com/spf13/pflag v1.0.5 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + go.uber.org/zap v1.19.0 // indirect + golang.org/x/net v0.0.0-20211005215030-d2e5035098b3 // indirect + golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect + golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef // indirect + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect + gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + k8s.io/apiextensions-apiserver v0.22.2 // indirect + k8s.io/cluster-bootstrap v0.22.2 // indirect + k8s.io/component-base v0.22.2 // indirect + k8s.io/klog/v2 v2.10.0 // indirect + k8s.io/kube-openapi v0.0.0-20210929172449-94abcedd1aa4 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect + sigs.k8s.io/yaml v1.3.0 // indirect +) diff --git a/addons/pinniped/post-deploy/Dockerfile b/addons/pinniped/post-deploy/Dockerfile index dfb59ae9b3..4a21ce2804 100644 --- a/addons/pinniped/post-deploy/Dockerfile +++ b/addons/pinniped/post-deploy/Dockerfile @@ -3,7 +3,7 @@ # Build from publicly reachable source by default, but allow people to re-build images on # top of their own trusted images. -ARG BUILDER_BASE_IMAGE=mirror.gcr.io/library/golang:1.16 +ARG BUILDER_BASE_IMAGE=mirror.gcr.io/library/golang:1.17 # Build the post-deploy binary FROM $BUILDER_BASE_IMAGE as builder diff --git a/addons/pinniped/post-deploy/go.mod b/addons/pinniped/post-deploy/go.mod index c07dc3e3ae..89b359cfd8 100644 --- a/addons/pinniped/post-deploy/go.mod +++ b/addons/pinniped/post-deploy/go.mod @@ -1,6 +1,6 @@ module github.com/vmware-tanzu/tanzu-framework/addons/pinniped/post-deploy -go 1.16 +go 1.17 require ( github.com/jetstack/cert-manager v1.1.0 @@ -15,6 +15,41 @@ require ( sigs.k8s.io/controller-runtime v0.7.0 ) +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/evanphx/json-patch v4.9.0+incompatible // indirect + github.com/go-logr/logr v0.3.0 // indirect + github.com/gogo/protobuf v1.3.1 // indirect + github.com/golang/protobuf v1.4.3 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/googleapis/gnostic v0.5.1 // indirect + github.com/imdario/mergo v0.3.10 // indirect + github.com/json-iterator/go v1.1.10 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + go.uber.org/atomic v1.6.0 // indirect + go.uber.org/multierr v1.5.0 // indirect + golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect + golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect + golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect + golang.org/x/sys v0.0.0-20201112073958-5cba982894dd // indirect + golang.org/x/text v0.3.4 // indirect + golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect + google.golang.org/appengine v1.6.6 // indirect + google.golang.org/protobuf v1.25.0 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v2 v2.3.0 // indirect + k8s.io/apiextensions-apiserver v0.19.2 // indirect + k8s.io/klog/v2 v2.4.0 // indirect + k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // indirect + k8s.io/utils v0.0.0-20200912215256-4140de9c8800 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect +) + // Import an nested go modules have some known issues. The following replace temporarily fixes it // https://github.com/golang/go/issues/34055 // diff --git a/apis/cli/v1alpha1/zz_generated.deepcopy.go b/apis/cli/v1alpha1/zz_generated.deepcopy.go index 4e76d2a74e..74eb919f1f 100644 --- a/apis/cli/v1alpha1/zz_generated.deepcopy.go +++ b/apis/cli/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // Copyright 2022 VMware, Inc. All Rights Reserved. diff --git a/apis/config/v1alpha1/zz_generated.deepcopy.go b/apis/config/v1alpha1/zz_generated.deepcopy.go index b8a737aced..fbf858213b 100644 --- a/apis/config/v1alpha1/zz_generated.deepcopy.go +++ b/apis/config/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // Copyright 2022 VMware, Inc. All Rights Reserved. diff --git a/apis/run/v1alpha1/zz_generated.deepcopy.go b/apis/run/v1alpha1/zz_generated.deepcopy.go index 51b35ac51a..1e6fb602be 100644 --- a/apis/run/v1alpha1/zz_generated.deepcopy.go +++ b/apis/run/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // Copyright 2022 VMware, Inc. All Rights Reserved. diff --git a/apis/run/v1alpha2/zz_generated.deepcopy.go b/apis/run/v1alpha2/zz_generated.deepcopy.go index 7cc47ec494..ae522a1436 100644 --- a/apis/run/v1alpha2/zz_generated.deepcopy.go +++ b/apis/run/v1alpha2/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // Copyright 2022 VMware, Inc. All Rights Reserved. diff --git a/docs/cli/getting-started.md b/docs/cli/getting-started.md index b642d146db..24b5a4e24c 100644 --- a/docs/cli/getting-started.md +++ b/docs/cli/getting-started.md @@ -178,7 +178,7 @@ If you want the very latest, you can also build and install tanzu CLI, and its p ### Prerequisites -- [go](https://golang.org/dl/) version 1.16 +- [go](https://golang.org/dl/) version 1.17 - Clone Tanzu Framework and run the below command to build and install CLI and plugins locally for your platform. diff --git a/docs/release/release-notes-gathering-process.md b/docs/release/release-notes-gathering-process.md index d31f106d8f..5466cff54a 100644 --- a/docs/release/release-notes-gathering-process.md +++ b/docs/release/release-notes-gathering-process.md @@ -9,16 +9,10 @@ notes for Tanzu Framework. ## Installation -The simplest way to install the release-notes CLI is via go get: +The simplest way to install the release-notes CLI is via `go install`: ```sh -GO111MODULE=on go get k8s.io/release/cmd/release-notes -``` - -From Go 1.16: - -```sh -go get k8s.io/release/cmd/release-notes@latest +go install k8s.io/release/cmd/release-notes@latest ``` ## Usage diff --git a/go.mod b/go.mod index 6480380095..4c602b61a9 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,13 @@ module github.com/vmware-tanzu/tanzu-framework -go 1.16 +go 1.17 replace ( github.com/briandowns/spinner => github.com/alonyb/spinner v1.12.7 github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5 // indirect github.com/k14s/kbld => github.com/anujc25/carvel-kbld v0.31.0-update-vendir sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.0.1 + sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.0.1 sigs.k8s.io/kind => sigs.k8s.io/kind v0.11.1 ) @@ -19,7 +20,6 @@ require ( github.com/Jeffail/gabs v1.4.0 github.com/MakeNowJust/heredoc v1.0.0 github.com/Masterminds/semver v1.5.0 - github.com/Netflix/go-expect v0.0.0-20190729225929-0e00d9168667 // indirect github.com/adrg/xdg v0.2.1 github.com/apparentlymart/go-cidr v1.1.0 github.com/aunum/log v0.0.0-20200821225356-38d2e2c8b489 @@ -52,7 +52,6 @@ require ( github.com/gorilla/websocket v1.4.2 github.com/gosuri/uitable v0.0.4 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 - github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c // indirect github.com/imdario/mergo v0.3.12 github.com/jeremywohl/flatten v1.0.1 github.com/jessevdk/go-flags v1.4.0 @@ -113,3 +112,125 @@ require ( sigs.k8s.io/kind v0.11.1 sigs.k8s.io/yaml v1.3.0 ) + +require ( + cloud.google.com/go v0.93.3 // 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/adal v0.9.16 // indirect + github.com/Azure/go-autorest/autorest/azure/cli v0.4.2 // indirect + github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect + github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect + github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect + github.com/Azure/go-autorest/logger v0.2.1 // indirect + github.com/Azure/go-autorest/tracing v0.6.0 // indirect + github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c // indirect + github.com/BurntSushi/toml v0.4.1 // indirect + github.com/Microsoft/go-winio v0.5.0 // indirect + github.com/Netflix/go-expect v0.0.0-20190729225929-0e00d9168667 // indirect + github.com/PuerkitoBio/purell v1.1.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect + github.com/alessio/shellescape v1.4.1 // indirect + github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect + github.com/aws/amazon-vpc-cni-k8s v1.9.1 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/blang/semver v3.5.1+incompatible // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/cheggaaa/pb v1.0.29 // indirect + github.com/containerd/containerd v1.5.7 // indirect + github.com/coredns/caddy v1.1.1 // indirect + github.com/coredns/corefile-migration v1.0.13 // indirect + github.com/cppforlife/cobrautil v0.0.0-20200514214827-bb86e6965d72 // indirect + github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dimchansky/utfbom v1.1.1 // indirect + github.com/docker/cli v20.10.7+incompatible // indirect + github.com/docker/distribution v2.7.1+incompatible // indirect + github.com/docker/docker-credential-helpers v0.6.3 // indirect + github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-units v0.4.0 // indirect + github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect + github.com/evanphx/json-patch v4.11.0+incompatible // indirect + github.com/evanphx/json-patch/v5 v5.5.0 // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/go-asn1-ber/asn1-ber v1.5.1 // indirect + github.com/go-logr/zapr v0.4.0 // indirect + github.com/go-openapi/analysis v0.19.5 // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.19.5 // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/gobuffalo/flect v0.2.3 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang-jwt/jwt/v4 v4.0.0 // indirect + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/google/go-github/v33 v33.0.0 // indirect + github.com/google/go-querystring v1.1.0 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/googleapis/gax-go/v2 v2.1.0 // indirect + github.com/hashicorp/go-version v1.3.0 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/k14s/starlark-go v0.0.0-20200720175618-3a5c849cc368 // indirect + github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect + github.com/magiconair/properties v1.8.5 // indirect + github.com/mailru/easyjson v0.7.6 // indirect + github.com/mattn/go-colorable v0.1.11 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/mattn/go-runewidth v0.0.13 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/go-wordwrap v1.0.1 // indirect + github.com/mitchellh/mapstructure v1.4.2 // indirect + github.com/moby/spdystream v0.2.0 // indirect + github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.0.1 // indirect + github.com/pelletier/go-toml v1.9.4 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_golang v1.11.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.31.1 // indirect + github.com/prometheus/procfs v0.7.3 // indirect + github.com/rivo/uniseg v0.2.0 // indirect + github.com/russross/blackfriday v1.6.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522 // indirect + github.com/sirupsen/logrus v1.8.1 // indirect + github.com/spf13/cast v1.4.1 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/subosito/gotenv v1.2.0 // indirect + github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec // indirect + go.mongodb.org/mongo-driver v1.1.2 // indirect + go.opencensus.io v0.23.0 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/zap v1.19.0 // indirect + golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect + golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect + golang.org/x/tools v0.1.5 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20211005153810-c76a74d43a8e // indirect + google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/ini.v1 v1.63.2 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + k8s.io/apiserver v0.22.2 // indirect + k8s.io/cluster-bootstrap v0.22.2 // indirect + k8s.io/component-base v0.22.2 // indirect + k8s.io/kube-openapi v0.0.0-20210929172449-94abcedd1aa4 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect +) diff --git a/go.sum b/go.sum index e14d8313ed..e15fe4643a 100644 --- a/go.sum +++ b/go.sum @@ -2877,7 +2877,6 @@ sigs.k8s.io/cluster-api-provider-azure v1.0.0 h1:0/G8pNntUFekIZBSpiGQvYlv16R1Yn5 sigs.k8s.io/cluster-api-provider-azure v1.0.0/go.mod h1:fxvWxmTw58eQtFN5FKx9YrDsYotBkCoJyf48jsl5RUQ= sigs.k8s.io/cluster-api-provider-vsphere v1.0.2 h1:QOpyVJInjIqSaISnKBIVFWPGLDhVsvev4sDkEGqlg1o= sigs.k8s.io/cluster-api-provider-vsphere v1.0.2/go.mod h1:Z6MDQcZjX5DUcEFStotBptj2fMR4vgCVPAnw6inIY20= -sigs.k8s.io/cluster-api/test v1.0.0/go.mod h1:8WQozDv62x2qHkCB1wTUeFjuwawuHKUTh8IMH5hePQs= sigs.k8s.io/cluster-api/test v1.0.1 h1:bqyRhJ/Nc2Go+A7tl15QkCfNVyNOEPsTgJgZOiUwoJs= sigs.k8s.io/cluster-api/test v1.0.1/go.mod h1:D8eLfLrzKcPbm/TzYexoRJISaDleOGSpBrBvH0yVEuA= sigs.k8s.io/controller-runtime v0.6.3/go.mod h1:WlZNXcM0++oyaQt4B7C2lEE5JYRs8vJUzRP4N4JpdAY= diff --git a/hack/packages/kbld-image-replace/go.mod b/hack/packages/kbld-image-replace/go.mod index f1e3fdbb75..b58c494c7d 100644 --- a/hack/packages/kbld-image-replace/go.mod +++ b/hack/packages/kbld-image-replace/go.mod @@ -1,8 +1,30 @@ module github.com/vmware-tanzu/tanzu-framework/hack/packages -go 1.16 +go 1.17 require ( github.com/k14s/kbld v0.31.0 sigs.k8s.io/yaml v1.3.0 ) + +require ( + github.com/go-logr/logr v0.4.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/go-cmp v0.5.6 // indirect + github.com/google/go-containerregistry v0.6.0 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/hashicorp/go-version v1.3.0 // indirect + github.com/json-iterator/go v1.1.11 // indirect + github.com/k14s/imgpkg v0.17.0 // indirect + github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/vmware-tanzu/carvel-vendir v0.22.0 // indirect + golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect + golang.org/x/text v0.3.6 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + k8s.io/apimachinery v0.22.1 // indirect + k8s.io/klog/v2 v2.9.0 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect +) diff --git a/hack/tools/go.mod b/hack/tools/go.mod index 39093d65e4..47ca7db606 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -1,6 +1,6 @@ module github.com/vmware-tanzu/hack/tools -go 1.16 +go 1.17 require ( github.com/golangci/golangci-lint v1.43.0 @@ -9,3 +9,150 @@ require ( github.com/shuLhan/go-bindata v4.0.0+incompatible golang.org/x/tools v0.1.7 ) + +require ( + 4d63.com/gochecknoglobals v0.1.0 // indirect + github.com/Antonboom/errname v0.1.5 // indirect + github.com/Antonboom/nilnil v0.1.0 // indirect + github.com/BurntSushi/toml v0.4.1 // indirect + github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect + github.com/Masterminds/semver v1.5.0 // indirect + github.com/OpenPeeDeeP/depguard v1.0.1 // indirect + github.com/alexkohler/prealloc v1.0.0 // indirect + github.com/ashanbrown/forbidigo v1.2.0 // indirect + github.com/ashanbrown/makezero v0.0.0-20210520155254-b6261585ddde // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/bkielbasa/cyclop v1.2.0 // indirect + github.com/blizzy78/varnamelen v0.3.0 // indirect + github.com/bombsimon/wsl/v3 v3.3.0 // indirect + github.com/breml/bidichk v0.1.1 // indirect + github.com/butuzov/ireturn v0.1.1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/charithe/durationcheck v0.0.9 // indirect + github.com/chavacava/garif v0.0.0-20210405164556-e8a0a408d6af // indirect + github.com/daixiang0/gci v0.2.9 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/denis-tingajkin/go-header v0.4.2 // indirect + github.com/esimonov/ifshort v1.0.3 // indirect + github.com/ettle/strcase v0.1.1 // indirect + github.com/fatih/color v1.13.0 // indirect + github.com/fatih/structtag v1.2.0 // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/fzipp/gocyclo v0.3.1 // indirect + github.com/go-critic/go-critic v0.6.1 // indirect + github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect + github.com/go-toolsmith/astcast v1.0.0 // indirect + github.com/go-toolsmith/astcopy v1.0.0 // indirect + github.com/go-toolsmith/astequal v1.0.1 // indirect + github.com/go-toolsmith/astfmt v1.0.0 // indirect + github.com/go-toolsmith/astp v1.0.0 // indirect + github.com/go-toolsmith/strparse v1.0.0 // indirect + github.com/go-toolsmith/typep v1.0.2 // indirect + github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect + github.com/gobwas/glob v0.2.3 // indirect + github.com/gofrs/flock v0.8.1 // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect + github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect + github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613 // indirect + github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a // indirect + github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect + github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect + github.com/golangci/misspell v0.3.5 // indirect + github.com/golangci/revgrep v0.0.0-20210930125155-c22e5001d4f2 // indirect + github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect + github.com/google/go-cmp v0.5.6 // indirect + github.com/gordonklaus/ineffassign v0.0.0-20210225214923-2e10b2664254 // indirect + github.com/gostaticanalysis/analysisutil v0.7.1 // indirect + github.com/gostaticanalysis/comment v1.4.2 // indirect + github.com/gostaticanalysis/forcetypeassert v0.0.0-20200621232751-01d4955beaa5 // indirect + github.com/gostaticanalysis/nilerr v0.1.1 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jgautheron/goconst v1.5.1 // indirect + github.com/jingyugao/rowserrcheck v1.1.1 // indirect + github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect + github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d // indirect + github.com/kisielk/errcheck v1.6.0 // indirect + github.com/kisielk/gotool v1.0.0 // indirect + github.com/kulti/thelper v0.4.0 // indirect + github.com/kunwardeep/paralleltest v1.0.3 // indirect + github.com/kyoh86/exportloopref v0.1.8 // indirect + github.com/ldez/gomoddirectives v0.2.2 // indirect + github.com/ldez/tagliatelle v0.2.0 // indirect + github.com/magiconair/properties v1.8.5 // indirect + github.com/maratori/testpackage v1.0.1 // indirect + github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect + github.com/mattn/go-colorable v0.1.11 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/mattn/go-runewidth v0.0.9 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/mbilski/exhaustivestruct v1.2.0 // indirect + github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 // indirect + github.com/mgechev/revive v1.1.2 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/mapstructure v1.4.2 // indirect + github.com/moricho/tparallel v0.2.1 // indirect + github.com/nakabonne/nestif v0.3.1 // indirect + github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect + github.com/nishanths/exhaustive v0.2.3 // indirect + github.com/nishanths/predeclared v0.2.1 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/olekukonko/tablewriter v0.0.5 // indirect + github.com/pelletier/go-toml v1.9.4 // indirect + github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/polyfloyd/go-errorlint v0.0.0-20210722154253-910bb7978349 // indirect + github.com/prometheus/client_golang v1.7.1 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.10.0 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + github.com/quasilyte/go-ruleguard v0.3.13 // indirect + github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect + github.com/ryancurrah/gomodguard v1.2.3 // indirect + github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect + github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect + github.com/securego/gosec/v2 v2.9.1 // indirect + github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect + github.com/sirupsen/logrus v1.8.1 // indirect + github.com/sivchari/tenv v1.4.7 // indirect + github.com/sonatard/noctx v0.0.1 // indirect + github.com/sourcegraph/go-diff v0.6.1 // indirect + github.com/spf13/afero v1.6.0 // indirect + github.com/spf13/cast v1.4.1 // indirect + github.com/spf13/cobra v1.2.1 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/spf13/viper v1.9.0 // indirect + github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect + github.com/stretchr/objx v0.1.1 // indirect + github.com/stretchr/testify v1.7.0 // indirect + github.com/subosito/gotenv v1.2.0 // indirect + github.com/sylvia7788/contextcheck v1.0.4 // indirect + github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b // indirect + github.com/tetafro/godot v1.4.11 // indirect + github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94 // indirect + github.com/tomarrell/wrapcheck/v2 v2.4.0 // indirect + github.com/tommy-muehle/go-mnd/v2 v2.4.0 // indirect + github.com/ultraware/funlen v0.0.3 // indirect + github.com/ultraware/whitespace v0.0.4 // indirect + github.com/uudashr/gocognit v1.0.5 // indirect + github.com/yeya24/promlinter v0.1.0 // indirect + golang.org/x/mod v0.5.0 // indirect + golang.org/x/sys v0.0.0-20211013075003-97ac67df715c // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/ini.v1 v1.63.2 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + honnef.co/go/tools v0.2.1 // indirect + mvdan.cc/gofumpt v0.1.1 // indirect + mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect + mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect + mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 // indirect +) diff --git a/pkg/v1/providers/tests/go.mod b/pkg/v1/providers/tests/go.mod index 79b58cff62..93cf19387c 100644 --- a/pkg/v1/providers/tests/go.mod +++ b/pkg/v1/providers/tests/go.mod @@ -2,7 +2,7 @@ module github.com/vmware-tanzu/tanzu-framework/pkg/v1/providers/tests replace github.com/vmware-tanzu/tanzu-framework/ => ../../../.. -go 1.16 +go 1.17 require ( github.com/onsi/ginkgo v1.16.4 @@ -12,3 +12,57 @@ require ( k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b sigs.k8s.io/cluster-api v1.0.1 ) + +require ( + github.com/MakeNowJust/heredoc v1.0.0 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/blang/semver v3.5.1+incompatible // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960 // indirect + github.com/evanphx/json-patch v4.11.0+incompatible // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/go-logr/logr v0.4.0 // indirect + github.com/gobuffalo/flect v0.2.3 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.6 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/google/uuid v1.1.2 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/json-iterator/go v1.1.11 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/prometheus/client_golang v1.11.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.26.0 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect + golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect + golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // 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 + gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + k8s.io/api v0.22.2 // indirect + k8s.io/apiextensions-apiserver v0.22.2 // indirect + k8s.io/apimachinery v0.22.2 // indirect + k8s.io/client-go v0.22.2 // indirect + k8s.io/component-base v0.22.2 // indirect + k8s.io/klog/v2 v2.9.0 // indirect + k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect + sigs.k8s.io/controller-runtime v0.10.3 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect + sigs.k8s.io/yaml v1.3.0 // indirect +) diff --git a/pkg/v1/sdk/capabilities/Dockerfile b/pkg/v1/sdk/capabilities/Dockerfile index 46c5551d2d..a514bda868 100644 --- a/pkg/v1/sdk/capabilities/Dockerfile +++ b/pkg/v1/sdk/capabilities/Dockerfile @@ -3,7 +3,7 @@ # Build from publicly reachable source by default, but allow people to re-build images on # top of their own trusted images. -ARG BUILDER_BASE_IMAGE=mirror.gcr.io/library/golang:1.16 +ARG BUILDER_BASE_IMAGE=mirror.gcr.io/library/golang:1.17 # Build the manager binary FROM $BUILDER_BASE_IMAGE as builder diff --git a/pkg/v1/sdk/features/Dockerfile b/pkg/v1/sdk/features/Dockerfile index c7fde1c4cb..179b85cc9d 100644 --- a/pkg/v1/sdk/features/Dockerfile +++ b/pkg/v1/sdk/features/Dockerfile @@ -3,7 +3,7 @@ # Build from publicly reachable source by default, but allow people to re-build images on # top of their own trusted images. -ARG BUILDER_BASE_IMAGE=mirror.gcr.io/library/golang:1.16 +ARG BUILDER_BASE_IMAGE=mirror.gcr.io/library/golang:1.17 # Build the manager binary FROM $BUILDER_BASE_IMAGE as builder diff --git a/pkg/v1/tkr/Dockerfile b/pkg/v1/tkr/Dockerfile index 80c4bc5f04..ecdb817ef7 100644 --- a/pkg/v1/tkr/Dockerfile +++ b/pkg/v1/tkr/Dockerfile @@ -3,7 +3,7 @@ # Build from publicly reachable source by default, but allow people to re-build images on # top of their own trusted images. -ARG BUILDER_BASE_IMAGE=mirror.gcr.io/library/golang:1.16 +ARG BUILDER_BASE_IMAGE=mirror.gcr.io/library/golang:1.17 # Build the manager binary FROM $BUILDER_BASE_IMAGE as builder