From bf8b1980538f7b00e3085e5f582ba277381b409e Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Mon, 28 Jun 2021 14:29:32 -0700 Subject: [PATCH] ci: use go 1.16 everywhere (#4528) --- .devcontainer.json | 2 +- .github/workflows/create-release-branch.yaml | 2 +- .github/workflows/nightly-build.yaml | 2 +- .github/workflows/release.yaml | 2 +- .go-version | 1 - .pipelines/pr-e2e.yaml | 2 +- .pipelines/vhd-builder-ubuntu-gen2.yaml | 2 +- .pipelines/vhd-builder.yaml | 2 +- Makefile | 2 +- go.mod | 2 +- hack/tools/go.mod | 2 +- makedev.ps1 | 2 +- test/e2e/go.mod | 2 +- test/e2e/kubernetes/workloads/large-container-daemonset.yaml | 2 +- 14 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 .go-version diff --git a/.devcontainer.json b/.devcontainer.json index aa62f6aa06..09e5e7f306 100644 --- a/.devcontainer.json +++ b/.devcontainer.json @@ -1,6 +1,6 @@ { "name": "Go for aks-engine", - "image": "mcr.microsoft.com/oss/azcu/go-dev:v1.32.1", + "image": "mcr.microsoft.com/oss/azcu/go-dev:v1.32.2", "extensions": [ "ms-vscode.go" ], diff --git a/.github/workflows/create-release-branch.yaml b/.github/workflows/create-release-branch.yaml index 45bd236e54..ad9753022e 100644 --- a/.github/workflows/create-release-branch.yaml +++ b/.github/workflows/create-release-branch.yaml @@ -29,7 +29,7 @@ jobs: - name: install go uses: actions/setup-go@v2 with: - go-version: '^1.15' + go-version: '^1.16' - name: Install helm run: | curl https://baltocdn.com/helm/signing.asc | sudo apt-key add - diff --git a/.github/workflows/nightly-build.yaml b/.github/workflows/nightly-build.yaml index 92c5c13a1d..85752ed48f 100644 --- a/.github/workflows/nightly-build.yaml +++ b/.github/workflows/nightly-build.yaml @@ -21,7 +21,7 @@ jobs: docker run --rm \ -v ${GITHUB_WORKSPACE}:/go/src/github.com/Azure/aks-engine \ -w /go/src/github.com/Azure/aks-engine \ - mcr.microsoft.com/oss/azcu/go-dev:v1.32.1 make dist + mcr.microsoft.com/oss/azcu/go-dev:v1.32.2 make dist - name: Rename outputs run: | diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cb304c2b2f..e8b131177c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -122,7 +122,7 @@ jobs: docker run --rm \ -v ${GITHUB_WORKSPACE}:/go/src/github.com/Azure/aks-engine \ -w /go/src/github.com/Azure/aks-engine \ - mcr.microsoft.com/oss/azcu/go-dev:v1.32.1 make dist + mcr.microsoft.com/oss/azcu/go-dev:v1.32.2 make dist - name: Remove local tag run: git tag -d ${{ env.RELEASE_VERSION }} - name: Publish Release diff --git a/.go-version b/.go-version deleted file mode 100644 index 4e00d0ac07..0000000000 --- a/.go-version +++ /dev/null @@ -1 +0,0 @@ -1.14.4 diff --git a/.pipelines/pr-e2e.yaml b/.pipelines/pr-e2e.yaml index edecb6dc23..ded6d41e72 100644 --- a/.pipelines/pr-e2e.yaml +++ b/.pipelines/pr-e2e.yaml @@ -17,7 +17,7 @@ pr: resources: containers: - container: dev1 - image: mcr.microsoft.com/oss/azcu/go-dev:v1.32.1 + image: mcr.microsoft.com/oss/azcu/go-dev:v1.32.2 jobs: - job: unit_tests diff --git a/.pipelines/vhd-builder-ubuntu-gen2.yaml b/.pipelines/vhd-builder-ubuntu-gen2.yaml index 154725ef2a..5a066bc3e4 100644 --- a/.pipelines/vhd-builder-ubuntu-gen2.yaml +++ b/.pipelines/vhd-builder-ubuntu-gen2.yaml @@ -7,7 +7,7 @@ trigger: none # - POST a new SKU to azure marketplace variables: - CONTAINER_IMAGE: 'mcr.microsoft.com/oss/azcu/go-dev:v1.32.1' + CONTAINER_IMAGE: 'mcr.microsoft.com/oss/azcu/go-dev:v1.32.2' phases: - phase: build_vhd diff --git a/.pipelines/vhd-builder.yaml b/.pipelines/vhd-builder.yaml index 619dc45a00..518af9a88a 100644 --- a/.pipelines/vhd-builder.yaml +++ b/.pipelines/vhd-builder.yaml @@ -7,7 +7,7 @@ trigger: none # - POST a new SKU to azure marketplace variables: - CONTAINER_IMAGE: 'mcr.microsoft.com/oss/azcu/go-dev:v1.32.1' + CONTAINER_IMAGE: 'mcr.microsoft.com/oss/azcu/go-dev:v1.32.2' phases: - phase: build_vhd diff --git a/Makefile b/Makefile index 15e65f61f1..b7fb7d80a4 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ ifeq ($(GITTAG),) GITTAG := $(VERSION_SHORT) endif -DEV_ENV_IMAGE := mcr.microsoft.com/oss/azcu/go-dev:v1.32.1 +DEV_ENV_IMAGE := mcr.microsoft.com/oss/azcu/go-dev:v1.32.2 DEV_ENV_WORK_DIR := /aks-engine DEV_ENV_OPTS := --rm -v $(GOPATH)/pkg/mod:/go/pkg/mod -v $(CURDIR):$(DEV_ENV_WORK_DIR) -w $(DEV_ENV_WORK_DIR) $(DEV_ENV_VARS) DEV_ENV_CMD := docker run $(DEV_ENV_OPTS) $(DEV_ENV_IMAGE) diff --git a/go.mod b/go.mod index 2946f5e761..f9970a1cad 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/Azure/aks-engine -go 1.15 +go 1.16 require ( github.com/Azure/azure-sdk-for-go v43.0.0+incompatible diff --git a/hack/tools/go.mod b/hack/tools/go.mod index 9f0394c3d4..c76aa97e6a 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -1,6 +1,6 @@ module github.com/Azure/aks-engine/hack/tools -go 1.14 +go 1.16 require ( contrib.go.opencensus.io/exporter/jaeger v0.2.0 // indirect diff --git a/makedev.ps1 b/makedev.ps1 index 56d9bac03b..8ad2701936 100644 --- a/makedev.ps1 +++ b/makedev.ps1 @@ -1,4 +1,4 @@ -$DEV_ENV_IMAGE = "mcr.microsoft.com/oss/azcu/go-dev:v1.32.1" +$DEV_ENV_IMAGE = "mcr.microsoft.com/oss/azcu/go-dev:v1.32.2" $DEV_ENV_WORK_DIR = "/aks-engine" # Ensure docker is configured for linux containers diff --git a/test/e2e/go.mod b/test/e2e/go.mod index 8607c0a07f..3efee64f80 100644 --- a/test/e2e/go.mod +++ b/test/e2e/go.mod @@ -1,6 +1,6 @@ module github.com/Azure/aks-engine/test/e2e -go 1.14 +go 1.16 require ( github.com/Azure/aks-engine v0.43.0 diff --git a/test/e2e/kubernetes/workloads/large-container-daemonset.yaml b/test/e2e/kubernetes/workloads/large-container-daemonset.yaml index 36323e6d77..2dee8154eb 100644 --- a/test/e2e/kubernetes/workloads/large-container-daemonset.yaml +++ b/test/e2e/kubernetes/workloads/large-container-daemonset.yaml @@ -25,7 +25,7 @@ spec: - linux containers: - name: large-container - image: mcr.microsoft.com/oss/azcu/go-dev:v1.32.1 + image: mcr.microsoft.com/oss/azcu/go-dev:v1.32.2 imagePullPolicy: IfNotPresent command: ["/bin/sh"] args: ["-c", "while true; do sleep 1000; done"]