Skip to content

Commit

Permalink
Update Go to 1.17 (#3189)
Browse files Browse the repository at this point in the history
We update the Go version for the Antrea v1.2 release train, which is
still maintained.
See #3181

This is a combination of several commits from the Antrea main branch:
* 7f448b0
* 2626ad0
* d44b838
* ecef57f
* 7211166

Signed-off-by: Antonin Bas <abas@vmware.com>
  • Loading branch information
antoninbas committed Jan 28, 2022
1 parent 8df6730 commit 5ce54f3
Show file tree
Hide file tree
Showing 121 changed files with 539 additions and 165 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Expand Up @@ -2,3 +2,4 @@
bin/antctl-darwin
bin/antctl-linux
bin/antctl-windows.exe
test/e2e/infra
2 changes: 1 addition & 1 deletion .github/workflows/clair.yml
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v1
with:
go-version: 1.15
go-version: 1.17
- name: Scan Antrea Docker image for vulnerabilities
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_SES }}
Expand Down
71 changes: 26 additions & 45 deletions .github/workflows/go.yml
Expand Up @@ -18,12 +18,10 @@ jobs:
os: [ubuntu-latest, windows-2019]
runs-on: ${{ matrix.os }}
steps:

- name: Set up Go 1.15
uses: actions/setup-go@v1
- name: Set up Go 1.17
uses: actions/setup-go@v2
with:
go-version: 1.15

go-version: 1.17
- name: Check-out code
uses: actions/checkout@v2

Expand All @@ -46,10 +44,10 @@ jobs:
platform: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.platform }}
steps:
- name: Set up Go 1.15
uses: actions/setup-go@v1
- name: Set up Go 1.17
uses: actions/setup-go@v2
with:
go-version: 1.15
go-version: 1.17
- name: Check-out code
uses: actions/checkout@v2
- name: Run golangci-lint
Expand All @@ -60,10 +58,10 @@ jobs:
name: Golangci-lint for netpol code
runs-on: [ubuntu-latest]
steps:
- name: Set up Go 1.15
- name: Set up Go 1.17
uses: actions/setup-go@v1
with:
go-version: 1.15
go-version: 1.17
- name: Check-out code
uses: actions/checkout@v2
- name: Run golangci-lint
Expand All @@ -78,12 +76,10 @@ jobs:
matrix:
arch: [amd64, arm64, arm]
steps:

- name: Set up Go 1.15
uses: actions/setup-go@v1
- name: Set up Go 1.17
uses: actions/setup-go@v2
with:
go-version: 1.15

go-version: 1.17
- name: Check-out code
uses: actions/checkout@v2

Expand All @@ -94,12 +90,10 @@ jobs:
name: Build Antrea Windows binaries
runs-on: [ubuntu-latest]
steps:

- name: Set up Go 1.15
uses: actions/setup-go@v1
- name: Set up Go 1.17
uses: actions/setup-go@v2
with:
go-version: 1.15

go-version: 1.17
- name: Check-out code
uses: actions/checkout@v2

Expand All @@ -110,15 +104,12 @@ jobs:
name: Build antctl for macOS, Linux and Windows
runs-on: [ubuntu-latest]
steps:

- name: Set up Go 1.15
- name: Set up Go 1.17
uses: actions/setup-go@v1
with:
go-version: 1.15

go-version: 1.17
- name: Check-out code
uses: actions/checkout@v2

- name: Build antctl binaries
run: make antctl

Expand All @@ -127,12 +118,10 @@ jobs:
name: Check code generation
runs-on: [ubuntu-latest]
steps:

- name: Set up Go 1.15
uses: actions/setup-go@v1
- name: Set up Go 1.17
uses: actions/setup-go@v2
with:
go-version: 1.15

go-version: 1.17
- name: Check-out code
uses: actions/checkout@v2

Expand All @@ -144,15 +133,12 @@ jobs:
name: Check manifest
runs-on: [ubuntu-latest]
steps:

- name: Set up Go 1.15
- name: Set up Go 1.17
uses: actions/setup-go@v1
with:
go-version: 1.15

go-version: 1.17
- name: Check-out code
uses: actions/checkout@v2

- name: Check manifest
run: ./ci/check-manifest.sh

Expand All @@ -161,28 +147,23 @@ jobs:
name: Check go.mod tidy
runs-on: [ubuntu-latest]
steps:

- name: Set up Go 1.15
- name: Set up Go 1.17
uses: actions/setup-go@v1
with:
go-version: 1.15

go-version: 1.17
- name: Check-out code
uses: actions/checkout@v2

- name: Check tidy
run: make test-tidy

verify:
name: Verify docs and spelling
runs-on: [ubuntu-latest]
steps:

- name: Set up Go 1.15
uses: actions/setup-go@v1
- name: Set up Go 1.17
uses: actions/setup-go@v2
with:
go-version: 1.15

go-version: 1.17
- name: Check-out code
uses: actions/checkout@v2

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/golicense.yml
Expand Up @@ -32,10 +32,10 @@ jobs:
if: ${{ needs.check-changes.outputs.has_changes == 'yes' || github.event_name != 'pull_request' }}
runs-on: [ubuntu-latest]
steps:
- name: Set up Go 1.15
uses: actions/setup-go@v1
- name: Set up Go 1.17
uses: actions/setup-go@v2
with:
go-version: 1.15
go-version: 1.17
- uses: actions/checkout@v2
- name: Cache licensing information for dependencies
uses: actions/cache@v2
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/kind.yml
Expand Up @@ -76,7 +76,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v1
with:
go-version: 1.15
go-version: 1.17
- name: Download Antrea image from previous job
uses: actions/download-artifact@v1
with:
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v1
with:
go-version: 1.15
go-version: 1.17
- name: Download Antrea image from previous job
uses: actions/download-artifact@v1
with:
Expand Down Expand Up @@ -204,7 +204,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v1
with:
go-version: 1.15
go-version: 1.17
- name: Download Antrea image from previous job
uses: actions/download-artifact@v1
with:
Expand Down Expand Up @@ -267,7 +267,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v1
with:
go-version: 1.15
go-version: 1.17
- name: Download Antrea image from previous job
uses: actions/download-artifact@v1
with:
Expand Down Expand Up @@ -333,7 +333,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v1
with:
go-version: 1.15
go-version: 1.17
- name: Download Antrea image from previous job
uses: actions/download-artifact@v1
with:
Expand Down Expand Up @@ -415,7 +415,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v1
with:
go-version: 1.15
go-version: 1.17
- name: Download Antrea image from previous job
uses: actions/download-artifact@v1
with:
Expand Down Expand Up @@ -447,7 +447,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v1
with:
go-version: 1.15
go-version: 1.17
- name: Download Antrea image from previous job
uses: actions/download-artifact@v1
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/kind_upgrade.yml
Expand Up @@ -61,7 +61,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v1
with:
go-version: 1.15
go-version: 1.17
- name: Download Antrea image from previous job
uses: actions/download-artifact@v1
with:
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v1
with:
go-version: 1.15
go-version: 1.17
- name: Download Antrea image from previous job
uses: actions/download-artifact@v1
with:
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v1
with:
go-version: 1.15
go-version: 1.17
- name: Download Antrea image from previous job
uses: actions/download-artifact@v1
with:
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v1
with:
go-version: 1.15
go-version: 1.17
- name: Download Antrea image from previous job
uses: actions/download-artifact@v1
with:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/upload_release_assets.yml
Expand Up @@ -9,6 +9,10 @@ jobs:
build:
runs-on: [ubuntu-latest]
steps:
- name: Set up Go 1.17
uses: actions/setup-go@v2
with:
go-version: 1.17
- uses: actions/checkout@v2
- name: Build assets
env:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Expand Up @@ -177,7 +177,7 @@ the `$GOPATH`.

To develop locally, you can follow these steps:

1. [Install Go 1.15](https://golang.org/doc/install)
1. [Install Go 1.17](https://golang.org/doc/install)
2. Checkout your feature branch and `cd` into it.
3. To build all Go files and install them under `bin`, run `make bin`
4. To run all Go unit tests, run `make test-unit`
Expand Down

0 comments on commit 5ce54f3

Please sign in to comment.