From f0a2f81cfdbb65c5c96d039160d5ca9053a5ae51 Mon Sep 17 00:00:00 2001 From: "anisha.kj" Date: Mon, 11 Dec 2023 00:05:01 -0800 Subject: [PATCH 1/3] Issue 240: Updating go version Signed-off-by: anisha.kj --- Dockerfile | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 04ac7c4..bdac891 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 # ARG DOCKER_REGISTRY -ARG GO_VERSION=1.20 +ARG GO_VERSION=1.21 ARG ALPINE_VERSION=3.18 FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}golang:${GO_VERSION}-alpine${ALPINE_VERSION} as go-builder diff --git a/go.mod b/go.mod index c16c55a..5700eb7 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/pravega/bookkeeper-operator -go 1.20 +go 1.21 require ( github.com/google/go-cmp v0.5.6 // indirect From 19bceb9ae3af1245c47fdb46e2ee29ec3975c75e Mon Sep 17 00:00:00 2001 From: "anisha.kj" Date: Mon, 11 Dec 2023 02:05:04 -0800 Subject: [PATCH 2/3] updating go version in ci yaml Signed-off-by: anisha.kj --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c2b5671..560ba48 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,10 +18,10 @@ jobs: check: runs-on: ubuntu-latest steps: - - name: Set up Go 1.20 + - name: Set up Go 1.21 uses: actions/setup-go@v2 with: - go-version: "1.20" + go-version: "1.21" id: go - name: Set up Go for root run: | @@ -109,7 +109,7 @@ jobs: ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "helm repo update" ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "kubectl create namespace cert-manager;helm install cert-manager jetstack/cert-manager --namespace cert-manager --version v1.7.0 --wait" ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "kubectl -n default create secret docker-registry regcred --docker-server=https://index.docker.io/v1/ --docker-username=testbkop --docker-password=08d50da6-61bd-4953-a2ce-7d7a0e3835bc --docker-email=testbkop@gmail.com" - ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer);source /root/.gvm/scripts/gvm;gvm install go1.20 --binary;gvm use go1.20 --default;git config --global --add safe.directory /root/bookkeeper-operator" + ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer);source /root/.gvm/scripts/gvm;gvm install go1.21.0 --binary;gvm use go1.21.0 --default;git config --global --add safe.directory /root/bookkeeper-operator" - name: Running e2e run: | ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "cd /root/bookkeeper-operator;source /root/.gvm/scripts/gvm;make test-e2e" From b6b45054c81b58676314d1f73e591d438c32d936 Mon Sep 17 00:00:00 2001 From: "anisha.kj" Date: Mon, 11 Dec 2023 06:09:56 -0800 Subject: [PATCH 3/3] Updating go.sum Signed-off-by: anisha.kj --- go.sum | 1 + 1 file changed, 1 insertion(+) diff --git a/go.sum b/go.sum index 4db523e..f244305 100644 --- a/go.sum +++ b/go.sum @@ -576,6 +576,7 @@ go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=