From 964fd85920b6d46a6dda218f9d43a68948894864 Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Thu, 18 Jan 2024 07:58:13 -0700 Subject: [PATCH] use go 1.20 and sdk 1.31 (#141) --- .github/workflows/operator.yaml | 4 +-- Dockerfile | 2 +- config/scorecard/patches/basic.config.yaml | 6 ++--- config/scorecard/patches/olm.config.yaml | 30 +++++++++++----------- go.mod | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/operator.yaml b/.github/workflows/operator.yaml index 00cd135..27360b5 100644 --- a/.github/workflows/operator.yaml +++ b/.github/workflows/operator.yaml @@ -14,8 +14,8 @@ concurrency: cancel-in-progress: true env: - OPERATOR_OCP_VERSION: "4.13.0" - OPERATOR_SDK_VERSION: "v1.28.0" + OPERATOR_OCP_VERSION: "4.14.0" + OPERATOR_SDK_VERSION: "v1.31.0" SUPPORTED_OCP_VERSIONS: "v4.12-v4.14" jobs: diff --git a/Dockerfile b/Dockerfile index 4f98a88..9b049e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.19 as builder +FROM golang:1.20 as builder ARG TARGETOS ARG TARGETARCH diff --git a/config/scorecard/patches/basic.config.yaml b/config/scorecard/patches/basic.config.yaml index 2f27744..373c7fc 100644 --- a/config/scorecard/patches/basic.config.yaml +++ b/config/scorecard/patches/basic.config.yaml @@ -2,9 +2,9 @@ path: /stages/0/tests/- value: entrypoint: - - scorecard-test - - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.28.0 + - scorecard-test + - basic-check-spec + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: basic test: basic-check-spec-test diff --git a/config/scorecard/patches/olm.config.yaml b/config/scorecard/patches/olm.config.yaml index ace0a1a..e74e2a5 100644 --- a/config/scorecard/patches/olm.config.yaml +++ b/config/scorecard/patches/olm.config.yaml @@ -2,9 +2,9 @@ path: /stages/0/tests/- value: entrypoint: - - scorecard-test - - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.28.0 + - scorecard-test + - olm-bundle-validation + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-bundle-validation-test @@ -12,9 +12,9 @@ path: /stages/0/tests/- value: entrypoint: - - scorecard-test - - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.28.0 + - scorecard-test + - olm-crds-have-validation + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-validation-test @@ -22,9 +22,9 @@ path: /stages/0/tests/- value: entrypoint: - - scorecard-test - - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.28.0 + - scorecard-test + - olm-crds-have-resources + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-resources-test @@ -32,9 +32,9 @@ path: /stages/0/tests/- value: entrypoint: - - scorecard-test - - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.28.0 + - scorecard-test + - olm-spec-descriptors + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-spec-descriptors-test @@ -42,9 +42,9 @@ path: /stages/0/tests/- value: entrypoint: - - scorecard-test - - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.28.0 + - scorecard-test + - olm-status-descriptors + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/go.mod b/go.mod index bf845da..0996d3e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/RHsyseng/cluster-relocation-operator -go 1.19 +go 1.20 require ( github.com/onsi/ginkgo/v2 v2.14.0