Merge pull request noobaa#1806 from shirady/revert-separate-noobaa-api

Revert "Separate Module for NooBaa API"

Author: shirady

Makefile

@@ -77,16 +77,8 @@ dev-image: $(docker) gen
 	@echo "✅ dev image"
 .PHONY: dev-image
 
-deps-update:
-	@set -e; \
-	echo "Running go mod tidy on root module"; \
-	cd . && go mod tidy; \
-	echo "Running go mod tidy on api module"; \
-	cd pkg/apis/noobaa && go mod tidy; \
-	echo "✅ deps-update"
-.PHONY: deps-update
-
-vendor: deps-update
+vendor:
+	go mod tidy
 	go mod vendor
 	@echo "✅ vendor"
 .PHONY: vendor
@@ -136,8 +128,8 @@ pkg/bundle/deploy.go: pkg/bundler/bundler.go version/version.go $(shell find dep
 	go run pkg/bundler/bundler.go deploy/ pkg/bundle/deploy.go
 
 gen-api: controller-gen deepcopy-gen gen
-	cd pkg/apis/noobaa && $(TIME) $(DEEPCOPY_GEN) --go-header-file="$(MK_PATH)build/hack/boilerplate.go.txt" --input-dirs="./v1alpha1/..." --output-file-base="zz_generated.deepcopy"
-	$(TIME) $(CONTROLLER_GEN) paths={./...,./pkg/apis/noobaa/...} crd:generateEmbeddedObjectMeta=true output:crd:artifacts:config=deploy/crds/
+	$(TIME) $(DEEPCOPY_GEN) --go-header-file="build/hack/boilerplate.go.txt" --input-dirs="./pkg/apis/noobaa/v1alpha1/..." --output-file-base="zz_generated.deepcopy"
+	$(TIME) $(CONTROLLER_GEN) paths=./... crd:generateEmbeddedObjectMeta=true output:crd:artifacts:config=deploy/crds/
 	@echo "✅ gen-api"
 .PHONY: gen-api
 

go.mod

@@ -5,8 +5,6 @@ go 1.24.7
 replace (
 	// TODO: remove this replace once https://github.com/libopenstorage/secrets/pull/83 is merged
 	github.com/libopenstorage/secrets => github.com/rook/secrets v0.0.0-20240315053144-3195f6906937
-	// Use local API module so the root build uses ./pkg/apis/noobaa
-	github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa => ./pkg/apis/noobaa
 	github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3
 )
 
@@ -31,7 +29,6 @@ require (
 	github.com/kubernetes-csi/external-snapshotter/client/v8 v8.4.0
 	github.com/libopenstorage/secrets v0.0.0-20240416031220-a17cf7f72c6c
 	github.com/marstr/randname v0.0.0-20200428202425-99aca53a2176
-	github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa v0.0.0-00010101000000-000000000000
 	github.com/onsi/ginkgo/v2 v2.27.2
 	github.com/onsi/gomega v1.38.2
 	github.com/openshift/api v0.0.0-20251120040117-916c7003ed78