Bump go to v1.17 (#922)

This commit updates the operator-registry's go version
to v1.17.

Signed-off-by: Alexander Greene <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: c970d617ce2d77c096102e2d881a15ef680bacf9
Signed-off-by: perdasilva <[email protected]>

Author: awgreene

base.Dockerfile

@@ -1,6 +1,6 @@
 # Dockerfile to bootstrap build and test in openshift-ci
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.8
 
 ARG KUBEBUILDER_RELEASE=2.3.1
 # Install test dependencies

go.sum

@@ -114,6 +114,7 @@ github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:H
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
+github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
@@ -268,9 +269,9 @@ github.com/dhui/dktest v0.3.0/go.mod h1:cyzIUfGsBEbZ6BT7tnXqAShHSXCZhSNmFl70sZ7c
 github.com/distribution/distribution v2.7.1+incompatible h1:aGFx4EvJWKEh//lHPLwFhFgwFHKH06TzNVPamrMn04M=
 github.com/distribution/distribution v2.7.1+incompatible/go.mod h1:EgLm2NgWtdKgzF9NpMzUKgzmR7AMmb0VQi2B+ZzDRjc=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
-github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/cli v20.10.5+incompatible h1:bjflayQbWg+xOkF2WPEAOi4Y7zWhR7ptoPhV/VqLVDE=
 github.com/docker/cli v20.10.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli v20.10.12+incompatible h1:lZlz0uzG+GH+c0plStMUdF/qk3ppmgnswpR5EbqzVGA=
+github.com/docker/cli v20.10.12+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v0.0.0-20191216044856-a8371794149d h1:jC8tT/S0OGx2cswpeUTn4gOIea8P08lD3VFQT0cOZ50=
 github.com/docker/distribution v0.0.0-20191216044856-a8371794149d/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
 github.com/docker/docker v0.7.3-0.20190103212154-2b7e084dc98b/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
@@ -1439,8 +1440,9 @@ golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e h1:XMgFehsDnnLGtjvjOfqWSUzt0alpTR1RSEuznObga2c=
 golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 h1:2B5p2L5IfGiD7+b9BOoRMC6DgObAVZV+Fsp050NqXik=
+golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=

operator-lifecycle-manager.Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 AS builder
 
 ENV GO111MODULE auto
 ENV GOPATH /go

operator-registry.Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 AS builder
 
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH

staging/operator-registry/.github/workflows/build.yaml

@@ -15,5 +15,5 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '~1.16'
+          go-version: '~1.17'
       - run: make build

staging/operator-registry/.github/workflows/go-apidiff.yaml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go
       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
       uses: actions/checkout@v2

staging/operator-registry/.github/workflows/goreleaser.yaml

@@ -10,63 +10,105 @@ defaults:
   run:
     shell: bash
 jobs:
-  goreleaser:
+  release:
+    needs:
+      - build-windows
+      - build-darwin
+      - build-linux
+
     runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/download-artifact@v2
+
+      - run: |
+          for dist in dist-*; do
+            tar -C "${dist}" -xf "${dist}/${dist}.tar"
+          done
+      - name: Create assets
+        run: |
+          set -xe
+          mkdir -p assets
+          cat dist-*/dist/checksums.txt > assets/checksums.txt
+          for asset in dist-*/dist/*_*/*; do
+            base=$(basename "${asset}")
+            variant=$(basename $(dirname "${asset}") | cut -d_ -f1)
+            cp "${asset}" "assets/${variant}-${base}"
+          done
+          find assets -ls
+          cat assets/checksums.txt
+      - name: Upload Release Assets
+        if: github.ref_type == 'tag'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh release create "${{ github.ref_name }}" --generate-notes ./assets/*
+
+  build-windows:
+    runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
         with:
-          # GoReleaser requires fetch-depth: 0 for
-          # changelog generation to work correctly.
+          # GoReleaser requires fetch-depth: 0 to correctly
+          # run git describe
           fetch-depth: 0
-
       - uses: actions/setup-go@v2
         with:
-          go-version: '~1.16'
+          go-version: '~1.17'
 
-      - name: "Download osxcross cross-compiler for macOS builds"
-        run: |
-          git clone https://github.com/tpoechtrager/osxcross /tmp/osxcross
-          cd /tmp/osxcross
-          wget -P tarballs '<REPLACE_ME_WITH_SECRET_PATH_TO_MACOS_SDK>'
-          echo "/tmp/osxcross/target/bin" >> $GITHUB_PATH
+      - name: "Run GoReleaser"
+        run: make release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RELEASE_ARGS: release --rm-dist -f release/goreleaser.windows.yaml --skip-validate ${{ github.event_name == 'pull_request' && '--snapshot' || '' }}
 
-      - name: "Cache the osxcross + tarball build output"
-        id: cache-osxcross
-        uses: actions/cache@v2
+      - run: tar -cvf dist-windows.tar dist
+      - uses: actions/upload-artifact@v2
         with:
-          path: /tmp/osxcross/target
-          key: ${{ runner.os }}-osxcross-${{ hashFiles('/tmp/osxcross/**/*') }}
-          restore-keys: |
-            ${{ runner.os }}-osxcross-
+          name: dist-windows
+          path: dist-windows.tar
 
-      - name: "Build osxcross"
-        if: steps.cache-osxcross.outputs.cache-hit != 'true'
-        run: |
-          cd /tmp/osxcross
-          sudo ./tools/get_dependencies.sh
-          UNATTENDED=1 ./build.sh
+  build-darwin:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          # GoReleaser requires fetch-depth: 0 to correctly
+          # run git describe
+          fetch-depth: 0
 
-      - name: "Install linux cross-compilers"
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gcc-aarch64-linux-gnu gcc-s390x-linux-gnu gcc-powerpc64le-linux-gnu gcc-mingw-w64-x86-64
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '~1.17'
 
-      - name: "Install yq"
-        run: |
-          sudo wget https://github.com/mikefarah/yq/releases/download/v4.10.0/yq_linux_amd64 -O /usr/local/bin/yq
-          sudo chmod +x /usr/local/bin/yq
+      - name: "Run GoReleaser"
+        run: make release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RELEASE_ARGS: release --rm-dist -f release/goreleaser.darwin.yaml --skip-validate ${{ github.event_name == 'pull_request' && '--snapshot' || '' }}
 
-      - name: "Disable image pushes for pull requests"
-        if: github.event_name == 'pull_request'
-        run: |
-          yq eval '.dockers[].skip_push=true' -i .goreleaser.yaml
-          yq eval '.docker_manifests[].skip_push=true' -i .goreleaser.yaml
+      - run: gtar -cvf dist-darwin.tar dist
+      - uses: actions/upload-artifact@v2
+        with:
+          name: dist-darwin
+          path: dist-darwin.tar
 
-      - name: "Disable the Github release upload for non-tag builds"
-        if: startsWith(github.ref, 'refs/tags') != true
-        run: |
-          yq eval '.release.disable=true' -i .goreleaser.yaml
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          # GoReleaser requires fetch-depth: 0 to correctly
+          # run git describe
+          fetch-depth: 0
+
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '~1.17'
 
+      - name: "Install linux cross-compilers"
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y gcc-aarch64-linux-gnu gcc-s390x-linux-gnu gcc-powerpc64le-linux-gnu
       - name: "Set the image tag"
         run: |
           if [[ $GITHUB_REF == refs/tags/* ]]; then
@@ -81,7 +123,6 @@ jobs:
           else
             echo IMAGE_TAG="$(git describe --tags --always)" >> $GITHUB_ENV
           fi
-
       - name: "Login to Quay"
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v1
@@ -97,4 +138,10 @@ jobs:
         run: make release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RELEASE_ARGS: release --rm-dist ${{ !startsWith(github.ref, 'refs/tags') && '--skip-validate' || '' }}
+          RELEASE_ARGS: release --rm-dist -f release/goreleaser.linux.yaml --skip-validate ${{ github.event_name == 'pull_request' && '--snapshot' || '' }}
+
+      - run: tar -cvf dist-linux.tar dist
+      - uses: actions/upload-artifact@v2
+        with:
+          name: dist-linux
+          path: dist-linux.tar

staging/operator-registry/.github/workflows/sanity.yaml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '~1.16'
+          go-version: '~1.17'
       - name: Install goimports
         run: go install golang.org/x/tools/cmd/goimports@latest
       - name: Run sanity checks

staging/operator-registry/.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '~1.16'
+          go-version: '~1.17'
       - name: Install podman
         run: |
           . /etc/os-release

staging/operator-registry/.github/workflows/unit.yaml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '~1.16'
+          go-version: '~1.17'
       - run: make unit
       - run: sed -i'' "s:^github.com/$GITHUB_REPOSITORY/::" coverage.out
       - run: .github/workflows/codecov.sh -Z -f coverage.out

staging/operator-registry/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.8 AS builder
 
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH

staging/operator-registry/codegen.Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.16-alpine
+FROM golang:1.17-alpine
 
 RUN apk update && \
     apk add make git protobuf