From 41ec8e41e7988577c2e11e0e08fe26e61b652a50 Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Mon, 17 Jun 2024 09:15:25 +0200 Subject: [PATCH] chore: update toolbox sdk version and remove duplicated addtoschema (#1061) Signed-off-by: Wen Zhou (cherry picked from commit 1b23c9fdcb5fb5daa915e9ed533dc15a553165b1) --- Dockerfiles/toolbox.Dockerfile | 2 +- Makefile | 3 +-- bundle/tests/scorecard/config.yaml | 2 +- config/scorecard/patches/basic.config.yaml | 2 +- main.go | 1 - 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Dockerfiles/toolbox.Dockerfile b/Dockerfiles/toolbox.Dockerfile index 2dc7b17f6df..19492f45f18 100644 --- a/Dockerfiles/toolbox.Dockerfile +++ b/Dockerfiles/toolbox.Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora-toolbox:38 ARG GOLANG_VERSION=1.20 -ARG OPERATOR_SDK_VERSION=1.24.1 +ARG OPERATOR_SDK_VERSION=1.31.0 ENV GOLANG_VERSION=$GOLANG_VERSION \ OPERATOR_SDK_VERSION=$OPERATOR_SDK_VERSION diff --git a/Makefile b/Makefile index 1b2a777f7d9..96df2563fad 100644 --- a/Makefile +++ b/Makefile @@ -341,14 +341,13 @@ catalog-push: ## Push a catalog image. $(MAKE) image-push IMG=$(CATALOG_IMG) TOOLBOX_GOLANG_VERSION := 1.20 -TOOLBOX_OPERATOR_SDK_VERSION := 1.24.1 # Generate a Toolbox container for locally testing changes easily .PHONY: toolbox toolbox: ## Create a toolbox instance with the proper Golang and Operator SDK versions $(IMAGE_BUILDER) build \ --build-arg GOLANG_VERSION=$(TOOLBOX_GOLANG_VERSION) \ - --build-arg OPERATOR_SDK_VERSION=$(TOOLBOX_OPERATOR_SDK_VERSION) \ + --build-arg OPERATOR_SDK_VERSION=$(OPERATOR_SDK_VERSION) \ -f Dockerfiles/toolbox.Dockerfile -t opendatahub-toolbox . $(IMAGE_BUILDER) stop opendatahub-toolbox ||: toolbox rm opendatahub-toolbox ||: diff --git a/bundle/tests/scorecard/config.yaml b/bundle/tests/scorecard/config.yaml index 7bc6d0b5afe..df8ca940938 100644 --- a/bundle/tests/scorecard/config.yaml +++ b/bundle/tests/scorecard/config.yaml @@ -8,7 +8,7 @@ stages: - entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.24.1 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: basic test: basic-check-spec-test diff --git a/config/scorecard/patches/basic.config.yaml b/config/scorecard/patches/basic.config.yaml index 4af198312f2..04b59f3a912 100644 --- a/config/scorecard/patches/basic.config.yaml +++ b/config/scorecard/patches/basic.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.24.1 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: basic test: basic-check-spec-test diff --git a/main.go b/main.go index 0297f84da9f..35bddee5ff5 100644 --- a/main.go +++ b/main.go @@ -89,7 +89,6 @@ func init() { //nolint:gochecknoinits utilruntime.Must(ocappsv1.AddToScheme(scheme)) utilruntime.Must(ocbuildv1.AddToScheme(scheme)) utilruntime.Must(ocimgv1.AddToScheme(scheme)) - utilruntime.Must(apiextv1.AddToScheme(scheme)) utilruntime.Must(admv1.AddToScheme(scheme)) utilruntime.Must(apiregistrationv1.AddToScheme(scheme)) utilruntime.Must(monitoringv1.AddToScheme(scheme))