Skip to content

Commit

Permalink
Bump Go version to 1.17 (vmware-tanzu#1446)
Browse files Browse the repository at this point in the history
* Bump Go version to 1.17

* Updates all go.mod files to include go 1.17
* Prunes module graph by running `go mod tidy -go=1.17`
* Use Go 1.17 in GitHub actions
* Generate files using go 1.17 built controller-gen
* Use Go 1.17 in Dockerfiles and update docs
* Make consuming tanzu-framework easier by Go 1.17 modules
Adds `sigs.k8s.io/cluster-api/test` in the `replace` section to avoid
Go 1.17 modules consuming tanzu-framework erroring out.
  • Loading branch information
rajathagasthya committed Jan 11, 2022
1 parent 01a04eb commit b2816e1
Show file tree
Hide file tree
Showing 26 changed files with 465 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/plugin_tests.yaml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/providers.yaml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_staging.yaml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security_codeql.yaml
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tkg_integration_tests.yaml
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tkgpackage_integration_test.yaml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion addons/Dockerfile
Expand Up @@ -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
Expand Down
59 changes: 58 additions & 1 deletion 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 => ../
Expand All @@ -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
)
2 changes: 1 addition & 1 deletion addons/pinniped/post-deploy/Dockerfile
Expand Up @@ -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
Expand Down
37 changes: 36 additions & 1 deletion 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
Expand All @@ -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
//
Expand Down
1 change: 1 addition & 0 deletions apis/cli/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apis/config/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apis/run/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apis/run/v1alpha2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/cli/getting-started.md
Expand Up @@ -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.
Expand Down
10 changes: 2 additions & 8 deletions docs/release/release-notes-gathering-process.md
Expand Up @@ -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
Expand Down

0 comments on commit b2816e1

Please sign in to comment.