chore: update toolbox sdk version and remove duplicated addtoschema (o…

…pendatahub-io#1061) Signed-off-by: Wen Zhou <[email protected]> (cherry picked from commit 1b23c9f)
VaishnaviHire · Jun 18, 2024 · c2ca9c6 · c2ca9c6
1 parent e3f0352
commit c2ca9c6
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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))