Skip to content

Commit fa52ae3

Browse files
committed
Revert "Separate Module for NooBaa API"
This reverts commit a6abec6. Signed-off-by: shirady <57721533+shirady@users.noreply.github.com>
1 parent f9c40a9 commit fa52ae3

6 files changed

Lines changed: 7 additions & 1051 deletions

File tree

Makefile

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,8 @@ dev-image: $(docker) gen
7777
@echo "✅ dev image"
7878
.PHONY: dev-image
7979

80-
deps-update:
81-
@set -e; \
82-
echo "Running go mod tidy on root module"; \
83-
cd . && go mod tidy; \
84-
echo "Running go mod tidy on api module"; \
85-
cd pkg/apis/noobaa && go mod tidy; \
86-
echo "✅ deps-update"
87-
.PHONY: deps-update
88-
89-
vendor: deps-update
80+
vendor:
81+
go mod tidy
9082
go mod vendor
9183
@echo "✅ vendor"
9284
.PHONY: vendor
@@ -136,8 +128,8 @@ pkg/bundle/deploy.go: pkg/bundler/bundler.go version/version.go $(shell find dep
136128
go run pkg/bundler/bundler.go deploy/ pkg/bundle/deploy.go
137129

138130
gen-api: controller-gen deepcopy-gen gen
139-
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"
140-
$(TIME) $(CONTROLLER_GEN) paths={./...,./pkg/apis/noobaa/...} crd:generateEmbeddedObjectMeta=true output:crd:artifacts:config=deploy/crds/
131+
$(TIME) $(DEEPCOPY_GEN) --go-header-file="build/hack/boilerplate.go.txt" --input-dirs="./pkg/apis/noobaa/v1alpha1/..." --output-file-base="zz_generated.deepcopy"
132+
$(TIME) $(CONTROLLER_GEN) paths=./... crd:generateEmbeddedObjectMeta=true output:crd:artifacts:config=deploy/crds/
141133
@echo "✅ gen-api"
142134
.PHONY: gen-api
143135

go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ go 1.24.7
55
replace (
66
// TODO: remove this replace once https://github.com/libopenstorage/secrets/pull/83 is merged
77
github.com/libopenstorage/secrets => github.com/rook/secrets v0.0.0-20240315053144-3195f6906937
8-
// Use local API module so the root build uses ./pkg/apis/noobaa
9-
github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa => ./pkg/apis/noobaa
108
github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3
119
)
1210

@@ -31,7 +29,6 @@ require (
3129
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.4.0
3230
github.com/libopenstorage/secrets v0.0.0-20240416031220-a17cf7f72c6c
3331
github.com/marstr/randname v0.0.0-20200428202425-99aca53a2176
34-
github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa v0.0.0-00010101000000-000000000000
3532
github.com/onsi/ginkgo/v2 v2.27.2
3633
github.com/onsi/gomega v1.38.2
3734
github.com/openshift/api v0.0.0-20251120040117-916c7003ed78

pkg/apis/noobaa/go.mod

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)