From 4e12ac4371cc0aaf36f46bb7dc29ca7bd352f7ab Mon Sep 17 00:00:00 2001 From: Eric Shen Date: Mon, 20 Nov 2023 16:38:46 +0800 Subject: [PATCH] chore: bump go to 1.20 to fix CVE-2023-39323 and CVE-2023-44487 (#172) * chore: bump go to 1.20 to fix CVE Signed-off-by: ericsyh * fix ci: missing license header Signed-off-by: ericsyh * fix ci Signed-off-by: ericsyh --------- Signed-off-by: ericsyh --- .github/workflows/e2e_test.yml | 4 ++-- .github/workflows/release-operator.yml | 4 ++-- .github/workflows/style.yml | 4 ++-- Dockerfile | 2 +- api/v1alpha1/zz_generated.deepcopy.go | 2 +- go.mod | 2 +- redhat.Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/e2e_test.yml b/.github/workflows/e2e_test.yml index 5632c5a6..6bcbe1dc 100644 --- a/.github/workflows/e2e_test.yml +++ b/.github/workflows/e2e_test.yml @@ -40,10 +40,10 @@ jobs: docker rmi $(docker images -q) -f df -h - - name: Set up Go 1.19 + - name: Set up Go 1.20 uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: '1.20' id: go - name: Set up Git token diff --git a/.github/workflows/release-operator.yml b/.github/workflows/release-operator.yml index b61e2be1..9512d36d 100644 --- a/.github/workflows/release-operator.yml +++ b/.github/workflows/release-operator.yml @@ -35,10 +35,10 @@ jobs: default_channel: ${{ steps.redhat.outputs.default_channel }} steps: - - name: Set up Go 1.19 + - name: Set up Go 1.20 uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: '1.20' id: go - name: Set up Git token diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index b8f857e3..241ec80c 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -31,10 +31,10 @@ jobs: ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }} GOPRIVATE: github.com/streamnative steps: - - name: Set up Go 1.19 + - name: Set up Go 1.20 uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: '1.20' id: go - name: Set up git token diff --git a/Dockerfile b/Dockerfile index a43ff3aa..486dd883 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Build the manager binary -FROM golang:1.19-alpine as builder +FROM golang:1.20-alpine as builder ARG ACCESS_TOKEN="none" diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index a694324b..2797a8f1 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -1,4 +1,4 @@ -// Copyright 2023 StreamNative +// Copyright 2022 StreamNative // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/go.mod b/go.mod index 7016909c..bb6dc5a8 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/streamnative/pulsar-resources-operator -go 1.19 +go 1.20 require ( github.com/apache/pulsar-client-go v0.9.1-0.20230925013839-ac9c1a639933 diff --git a/redhat.Dockerfile b/redhat.Dockerfile index 1c60a804..349d575c 100644 --- a/redhat.Dockerfile +++ b/redhat.Dockerfile @@ -27,7 +27,7 @@ # limitations under the License. # Build the manager binary -FROM golang:1.19-alpine as builder +FROM golang:1.20-alpine as builder ARG ACCESS_TOKEN="none"