kubevirt · kubevirt-bot · May 13, 2022 · Apr 27, 2022
diff --git a/.github/workflows/build-push-images.yaml b/.github/workflows/build-push-images.yaml
@@ -27,7 +27,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.18'
       - name: Get latest version
         run: |
           PACKAGE_DIR="./deploy/olm-catalog/community-kubevirt-hyperconverged"

diff --git a/.github/workflows/digester_bot.yml b/.github/workflows/digester_bot.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/setup-go@v2
         if: ${{ env.NEW_PR }}
         with:
-          go-version: '1.17' # The Go version to download (if necessary) and use.
+          go-version: '1.18' # The Go version to download (if necessary) and use.
 
       - name: Get dependencies
         if: ${{ env.NEW_PR }}

diff --git a/.github/workflows/pr-sanity.yaml b/.github/workflows/pr-sanity.yaml
@@ -26,7 +26,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-         go-version: '1.17' # The Go version to download (if necessary) and use.
+         go-version: '1.18' # The Go version to download (if necessary) and use.
 
       - name: Do sanity checks
         run: make sanity

diff --git a/.github/workflows/publish-community-operators.yaml b/.github/workflows/publish-community-operators.yaml
@@ -31,7 +31,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.18'
       - name: Checkout the latest code of ${{ env.TARGET_BRANCH }} branch
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/rebase-bot.yml b/.github/workflows/rebase-bot.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.18'
 
       - name: Rebase and rebuild manifests
         id: rebase_rebuild

diff --git a/.github/workflows/release-bumper.yml b/.github/workflows/release-bumper.yml
@@ -43,7 +43,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.17' # The Go version to download (if necessary) and use.
+          go-version: '1.18' # The Go version to download (if necessary) and use.
 
       - name: Check for new releases and update
         env:

diff --git a/automation/nightly/test-nightly-build.sh b/automation/nightly/test-nightly-build.sh
@@ -6,7 +6,7 @@ source "hack/cri-bin.sh"
 
 # Get golang
 $CRI_BIN login --username "$(cat "${QUAY_USER}")" --password-stdin quay.io < "${QUAY_PASSWORD}"
-wget -q https://dl.google.com/go/go1.17.3.linux-amd64.tar.gz
+wget -q https://dl.google.com/go/go1.18.1.linux-amd64.tar.gz
 tar -C /usr/local -xf go*.tar.gz
 export PATH=/usr/local/go/bin:$PATH
 

diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17.0 AS builder
+FROM golang:1.18.1 AS builder
 
 WORKDIR /go/src/github.com/kubevirt/hyperconverged-cluster-operator/
 COPY . .

diff --git a/build/Dockerfile.functest b/build/Dockerfile.functest
@@ -1,4 +1,4 @@
-FROM golang:1.17.0 AS builder
+FROM golang:1.18.1 AS builder
 
 WORKDIR /go/src/github.com/kubevirt/hyperconverged-cluster-operator/
 COPY . .

diff --git a/build/Dockerfile.functest.ci b/build/Dockerfile.functest.ci
@@ -1,6 +1,5 @@
-# TODO: replace with golang 1.17 and OCP 4.10 once ready
 # registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
-FROM registry.ci.openshift.org/open-cluster-management/builder:go1.17-linux AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11 AS builder
 
 WORKDIR /go/src/github.com/kubevirt/hyperconverged-cluster-operator/
 COPY . .

diff --git a/build/Dockerfile.webhook b/build/Dockerfile.webhook
@@ -1,4 +1,4 @@
-FROM golang:1.17.0 AS builder
+FROM golang:1.18.1 AS builder
 
 WORKDIR /go/src/github.com/kubevirt/hyperconverged-cluster-operator/
 COPY . .

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/kubevirt/hyperconverged-cluster-operator
 
-go 1.17
+go 1.18
 
 require (
 	github.com/blang/semver/v4 v4.0.0

diff --git a/go.sum b/go.sum
diff --git a/hack/build-tests.sh b/hack/build-tests.sh
@@ -18,9 +18,8 @@ if [ "${JOB_TYPE}" == "travis" ]; then
     ginkgo -cover -output-dir=./coverprofiles -coverprofile=cover.coverprofile -r ${PKG_PACKAGE_PATH} -r ${CONTROLLERS_PACKAGE_PATH}
 else
     test_path="tests/func-tests"
-    (cd $test_path; go install github.com/onsi/ginkgo/v2/ginkgo@latest)
-    (cd $test_path; GOFLAGS= go get github.com/onsi/gomega)
-    (cd $test_path; go mod  tidy; go mod vendor)
+    (cd $test_path; GOFLAGS='' go install github.com/onsi/ginkgo/v2/ginkgo@latest)
+    (cd $test_path; go mod tidy; go mod vendor)
     test_out_path=${test_path}/_out
     mkdir -p ${test_out_path}
     (cd $test_path; ginkgo build .)

diff --git a/hack/in-docker.sh b/hack/in-docker.sh
@@ -9,7 +9,7 @@ HCO_DIR="$(readlink -f $(dirname $0)/../)"
 WORK_DIR="/go/src/github.com/kubevirt/hyperconverged-cluster-operator"
 REGISTRY=${REGISTRY:-quay.io/kubevirtci}
 REPOSITORY=${REPOSITORY:-hco-test-build}
-TAG=${TAG:-v20211109-01bbb11}
+TAG=${TAG:-v20220510-9ff67b2}
 BUILD_TAG="${REGISTRY}/${REPOSITORY}:${TAG}"
 
 # Execute the build

diff --git a/tests/build/Dockerfile b/tests/build/Dockerfile
@@ -7,7 +7,7 @@ RUN echo "diskspacecheck=0" >> /etc/dnf/dnf.conf && dnf update -y && dnf install
 
 RUN pip3 install j2cli && pip3 install operator-courier
 
-ENV GO_VERSION=1.17.3 \
+ENV GO_VERSION=1.18.1 \
     KUBEBUILDER_VERSION="3.2.0" \
     ARCH="amd64" \
     GOPATH="/go" \
@@ -21,16 +21,14 @@ RUN \
     rm -rf go${GO_VERSION}.linux-amd64.tar.gz && \
     export PATH=${GOPATH}/bin:$PATH && \
     eval $(go env) && \
-    go install github.com/onsi/ginkgo/ginkgo@latest && \
-    go get github.com/onsi/gomega && \
+    go install github.com/onsi/ginkgo/v2/ginkgo@latest && \
     go install golang.org/x/tools/cmd/goimports@latest && \
-    go get -u -d golang.org/x/lint/golint && \
+    go install golang.org/x/lint/golint@latest && \
     go install github.com/rmohr/go-swagger-utils/swagger-doc@latest && \
     go install github.com/mattn/goveralls@latest && \
-    go get -u -d mvdan.cc/sh/v3/cmd/shfmt && \
-    go get -u -d k8s.io/code-generator/cmd/deepcopy-gen && \
-    go get -u -d k8s.io/kube-openapi/cmd/openapi-gen && \
-    go get -u -d github.com/Masterminds/glide && \
+    go install mvdan.cc/sh/v3/cmd/shfmt@latest && \
+    go install k8s.io/code-generator/cmd/deepcopy-gen@latest && \
+    go install k8s.io/kube-openapi/cmd/openapi-gen@latest && \
     (curl -L -O "https://github.com/kubernetes-sigs/kubebuilder/releases/download/v${KUBEBUILDER_VERSION}/kubebuilder_${KUBEBUILDER_VERSION}_linux_${ARCH}" && \
      mv kubebuilder_${KUBEBUILDER_VERSION}_linux_${ARCH} /usr/local/kubebuilder )
 

diff --git a/tests/go.mod b/tests/go.mod
@@ -1,6 +1,6 @@
 module github.com/kubevirt/hyperconverged-cluster-operator/tests
 
-go 1.17
+go 1.18
 
 require (
 	github.com/kubevirt/cluster-network-addons-operator v0.73.0

diff --git a/tools/digester/go.mod b/tools/digester/go.mod
@@ -1,6 +1,6 @@
 module github.com/kubevirt/hyperconverged-cluster-operator/tools/digester
 
-go 1.17
+go 1.18
 
 require github.com/containers/image/v5 v5.19.2
 

diff --git a/tools/release-notes/go.mod b/tools/release-notes/go.mod
@@ -1,6 +1,6 @@
 module github.com/kubevirt/hyperconverged-cluster-operator/automation/releasenotes
 
-go 1.17
+go 1.18
 
 require (
 	github.com/Masterminds/semver v1.5.0