From cd3d7c8bf3f14e671966278ac9ca32ef08a6b08e Mon Sep 17 00:00:00 2001 From: Fabio Bertinatto Date: Tue, 1 Nov 2022 14:10:25 -0300 Subject: [PATCH 1/2] UPSTREAM: 379: Fix gofmt for go 1.19 --- pkg/controller/util_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/controller/util_test.go b/pkg/controller/util_test.go index fa9c4802e..b5a23dfc0 100644 --- a/pkg/controller/util_test.go +++ b/pkg/controller/util_test.go @@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ + package controller import ( From 4cbf253dddde4105e7db0e11d7845a8b1f4764c8 Mon Sep 17 00:00:00 2001 From: Fabio Bertinatto Date: Tue, 1 Nov 2022 14:15:04 -0300 Subject: [PATCH 2/2] Update to go v1.19 --- .ci-operator.yaml | 2 +- Dockerfile.openshift.rhel7 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index a4eb6d965..65f229622 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-8-release-golang-1.18-openshift-4.12 + tag: rhel-8-release-golang-1.19-openshift-4.12 diff --git a/Dockerfile.openshift.rhel7 b/Dockerfile.openshift.rhel7 index 48c3f6060..d46fb1943 100644 --- a/Dockerfile.openshift.rhel7 +++ b/Dockerfile.openshift.rhel7 @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.12 AS builder WORKDIR /go/src/github.com/kubernetes-csi/external-attacher COPY . . RUN make build