From 434a48e8f3fbf363eb79e0d962fa344fe35de484 Mon Sep 17 00:00:00 2001 From: Brendan Shephard Date: Tue, 6 Feb 2024 15:58:04 +1000 Subject: [PATCH] Update to Go 1.21 Signed-off-by: Brendan Shephard --- .ci-operator.yaml | 2 +- .../build-openstack-baremetal-operator.yaml | 2 +- .github/workflows/golangci-lint.yaml | 4 ++-- Dockerfile | 16 ++++++++-------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 71ef616..810dbb5 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: tools namespace: openstack-k8s-operators - tag: ci-build-root-golang-1.19-sdk-1.31 + tag: ci-build-root-golang-1.21-sdk-1.31 diff --git a/.github/workflows/build-openstack-baremetal-operator.yaml b/.github/workflows/build-openstack-baremetal-operator.yaml index c614646..6f8c0c2 100644 --- a/.github/workflows/build-openstack-baremetal-operator.yaml +++ b/.github/workflows/build-openstack-baremetal-operator.yaml @@ -15,7 +15,7 @@ jobs: uses: openstack-k8s-operators/openstack-k8s-operators-ci/.github/workflows/reusable-build-operator.yaml@main with: operator_name: openstack-baremetal - go_version: 1.19.x + go_version: 1.21.x operator_sdk_version: 1.31.0 secrets: IMAGENAMESPACE: ${{ secrets.IMAGENAMESPACE }} diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml index eda28e4..9e4f4f6 100644 --- a/.github/workflows/golangci-lint.yaml +++ b/.github/workflows/golangci-lint.yaml @@ -10,7 +10,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.19.x + go-version: 1.21.x - name: Checkout project code uses: actions/checkout@v2 - name: Checkout openstack-k8s-operators-ci project @@ -32,7 +32,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.19.x + go-version: 1.21.x - name: Checkout project code uses: actions/checkout@v2 - name: Run golangci lint diff --git a/Dockerfile b/Dockerfile index babea98..e127ec6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.19 +ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.21 ARG OPERATOR_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:latest # Build the manager binary @@ -51,16 +51,16 @@ ARG IMAGE_TAGS="cn-openstack openstack" # Labels required by upstream and osbs build system LABEL com.redhat.component="${IMAGE_COMPONENT}" \ - name="${IMAGE_NAME}" \ - version="${IMAGE_VERSION}" \ - summary="${IMAGE_SUMMARY}" \ - io.k8s.name="${IMAGE_NAME}" \ - io.k8s.description="${IMAGE_DESC}" \ - io.openshift.tags="${IMAGE_TAGS}" + name="${IMAGE_NAME}" \ + version="${IMAGE_VERSION}" \ + summary="${IMAGE_SUMMARY}" \ + io.k8s.name="${IMAGE_NAME}" \ + io.k8s.description="${IMAGE_DESC}" \ + io.openshift.tags="${IMAGE_TAGS}" ### DO NOT EDIT LINES ABOVE ENV USER_UID=$USER_ID \ - OPERATOR_TEMPLATES=/usr/share/openstack-baremetal-operator/templates/ + OPERATOR_TEMPLATES=/usr/share/openstack-baremetal-operator/templates/ WORKDIR /