From 61e9919d6e9da5307ba27e82affffed42dc777a1 Mon Sep 17 00:00:00 2001 From: subhamkrai Date: Mon, 15 Dec 2025 14:25:36 +0530 Subject: [PATCH] build: remove obsolete operator-sdk form makefile Since we removed the csv from rook,we don't need this tool anymore. Let's just remove all traces of the operator SDK from Rook Signed-off-by: subhamkrai (cherry picked from commit 4bbdb7cfc1c1b863867b2879d5e65a774b001d0d) --- .../rook-ceph/templates/clusterrolebinding.yaml | 2 -- deploy/examples/common.yaml | 2 -- images/ceph/Makefile | 17 ++--------------- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/deploy/charts/rook-ceph/templates/clusterrolebinding.yaml b/deploy/charts/rook-ceph/templates/clusterrolebinding.yaml index 360b5ba41..10c32fdd7 100644 --- a/deploy/charts/rook-ceph/templates/clusterrolebinding.yaml +++ b/deploy/charts/rook-ceph/templates/clusterrolebinding.yaml @@ -77,8 +77,6 @@ roleRef: name: cephfs-external-provisioner-runner apiGroup: rbac.authorization.k8s.io --- -# This is required by operator-sdk to map the cluster/clusterrolebindings with SA -# otherwise operator-sdk will create a individual file for these. kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/deploy/examples/common.yaml b/deploy/examples/common.yaml index defa9688e..b9a6ea194 100644 --- a/deploy/examples/common.yaml +++ b/deploy/examples/common.yaml @@ -671,8 +671,6 @@ rules: resources: ["drivers"] verbs: ["create", "delete", "get", "list", "update", "watch"] --- -# This is required by operator-sdk to map the cluster/clusterrolebindings with SA -# otherwise operator-sdk will create a individual file for these. kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/images/ceph/Makefile b/images/ceph/Makefile index 2716f153e..f21497d8e 100755 --- a/images/ceph/Makefile +++ b/images/ceph/Makefile @@ -21,7 +21,6 @@ CEPH_VERSION ?= v20.2.0-20251104 REGISTRY_NAME = quay.io BASEIMAGE = $(REGISTRY_NAME)/ceph/ceph:$(CEPH_VERSION) CEPH_IMAGE = $(BUILD_REGISTRY)/ceph-$(GOARCH) -OPERATOR_SDK_VERSION = v1.25.0 # TODO: update to yq v4 - v3 end of life in Aug 2021 ; v4 removes the 'yq delete' cmd and changes syntax YQv3_VERSION = 3.4.1 GOHOST := GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) go @@ -41,12 +40,8 @@ endif # s5cmd's version S5CMD_VERSION = 2.3.0 -# Note: as of version 1.3 of operator-sdk, the url format changed to: -# ${OPERATOR_SDK_DL_URL}/operator-sdk_${OS}_${ARCH} -# (see: https://sdk.operatorframework.io/docs/installation/) -OPERATOR_SDK := $(TOOLS_HOST_DIR)/operator-sdk-$(OPERATOR_SDK_VERSION) YQv3 := $(TOOLS_HOST_DIR)/yq-$(YQv3_VERSION) -export OPERATOR_SDK YQv3 +export YQv3 # ==================================================================================== # Build Rook @@ -75,7 +70,7 @@ do.build: # call this before building multiple arches in parallel to prevent parallel build processes from # conflicting -prerequisites: $(OPERATOR_SDK) $(YQv3) +prerequisites: $(YQv3) $(YQv3): @echo === installing yq $(YQv3_VERSION) $(REAL_HOST_PLATFORM) @@ -83,14 +78,6 @@ $(YQv3): @curl -JL https://github.com/mikefarah/yq/releases/download/$(YQv3_VERSION)/yq_$(REAL_HOST_PLATFORM) -o $(YQv3) @chmod +x $(YQv3) -$(OPERATOR_SDK): - @echo === installing operator-sdk $(REAL_HOST_PLATFORM) - @mkdir -p $(TOOLS_HOST_DIR) - @curl -JL -o $(TOOLS_HOST_DIR)/operator-sdk-$(OPERATOR_SDK_VERSION) \ - https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk_$(REAL_HOST_PLATFORM) - @chmod +x $(OPERATOR_SDK) - @$(OPERATOR_SDK) version - # reading from a file and outputting to the same file can have undefined results, so use this intermediate IMAGE_TMP="/tmp/rook-ceph-image-list" list-image: ## Create a list of images for offline installation