@@ -113,7 +113,7 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform
113113.PHONY : manifests
114114manifests : gowork controller-gen # # Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
115115 $(CONTROLLER_GEN ) rbac:roleName=manager-role crd webhook paths=" ./..." output:crd:artifacts:config=config/crd/bases && \
116- rm -f api /bases/* && cp -a config/crd/bases api /
116+ rm -f apis /bases/* && cp -a config/crd/bases apis /
117117
118118.PHONY : generate
119119generate : controller-gen # # Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -126,13 +126,13 @@ fmt: ## Run go fmt against code.
126126.PHONY : vet
127127vet : gowork # # Run go vet against code.
128128 go vet ./...
129- go vet ./api /...
129+ go vet ./apis /...
130130
131131
132132.PHONY : tidy
133133tidy : # # Run go mod tidy on every mod file in the repo
134134 go mod tidy
135- cd ./api && go mod tidy
135+ cd ./apis && go mod tidy
136136
137137.PHONY : golangci-lint
138138golangci-lint :
@@ -147,7 +147,7 @@ PROC_CMD = --procs ${PROCS}
147147test : manifests generate fmt vet envtest ginkgo # # Run tests.
148148 KUBEBUILDER_ASSETS=" $( shell $( ENVTEST) -v debug --bin-dir $( LOCALBIN) use $( ENVTEST_K8S_VERSION) -p path) " \
149149 OPERATOR_TEMPLATES=" $( PWD) /templates" \
150- $(GINKGO ) --trace --cover --coverpkg=../../pkg/...,../../controllers,../../api /v1beta1 --coverprofile cover.out --covermode=atomic --randomize-all ${PROC_CMD} $(GINKGO_ARGS ) ./test/...
150+ $(GINKGO ) --trace --cover --coverpkg=../../pkg/...,../../controllers,../../apis/nova /v1beta1 --coverprofile cover.out --covermode=atomic --randomize-all ${PROC_CMD} $(GINKGO_ARGS ) ./test/...
151151
152152# #@ Build
153153
@@ -333,36 +333,36 @@ get-ci-tools:
333333# Run go fmt against code
334334gofmt : get-ci-tools
335335 $(CI_TOOLS_REPO_DIR ) /test-runner/gofmt.sh
336- $(CI_TOOLS_REPO_DIR ) /test-runner/gofmt.sh ./api
336+ $(CI_TOOLS_REPO_DIR ) /test-runner/gofmt.sh ./apis
337337
338338# Run go vet against code
339339govet : get-ci-tools
340340 GOWORK=off $(CI_TOOLS_REPO_DIR ) /test-runner/govet.sh
341- GOWORK=off $(CI_TOOLS_REPO_DIR ) /test-runner/govet.sh ./api
341+ GOWORK=off $(CI_TOOLS_REPO_DIR ) /test-runner/govet.sh ./apis
342342
343343# Run go test against code
344344gotest : test
345345
346346# Run golangci-lint test against code
347347golangci : get-ci-tools
348348 GOWORK=off $(CI_TOOLS_REPO_DIR ) /test-runner/golangci.sh
349- GOWORK=off $(CI_TOOLS_REPO_DIR ) /test-runner/golangci.sh ./api
349+ GOWORK=off $(CI_TOOLS_REPO_DIR ) /test-runner/golangci.sh ./apis
350350
351351# Run go lint against code
352352golint : get-ci-tools
353353 export GOWORK=off && PATH=$(GOBIN ) :$(PATH ) ; $(CI_TOOLS_REPO_DIR ) /test-runner/golint.sh
354- export GOWORK=off && PATH=$(GOBIN ) :$(PATH ) ; $(CI_TOOLS_REPO_DIR ) /test-runner/golint.sh ./api
354+ export GOWORK=off && PATH=$(GOBIN ) :$(PATH ) ; $(CI_TOOLS_REPO_DIR ) /test-runner/golint.sh ./apis
355355
356356.PHONY : operator-lint
357357operator-lint : $(LOCALBIN ) gowork # # Runs operator-lint
358358 GOBIN=
$(LOCALBIN ) go install github.com/gibizer/
[email protected] 359- go vet -vettool=$(LOCALBIN ) /operator-lint ./... ./api /...
359+ go vet -vettool=$(LOCALBIN ) /operator-lint ./... ./apis /...
360360
361361.PHONY : gowork
362362gowork : # # Generate go.work file
363363 test -f go.work || GOTOOLCHAIN=$(GOTOOLCHAIN_VERSION ) go work init
364364 go work use .
365- go work use ./api
365+ go work use ./apis
366366 go work sync
367367
368368OPERATOR_NAMESPACE ?= openstack-operators
@@ -431,8 +431,8 @@ force-bump: ## Force bump operator and lib-common dependencies
431431 for dep in $$ (cat go.mod | grep openstack-k8s-operators | grep -vE -- ' indirect|nova-operator|^replace' | awk ' {print $$1}' ); do \
432432 go get $$ dep@$(BRANCH ) ; \
433433 done
434- for dep in $$ (cat api /go.mod | grep openstack-k8s-operators | grep -vE -- ' indirect|nova-operator|^replace' | awk ' {print $$1}' ); do \
435- cd ./api && go get $$ dep@$(BRANCH ) && cd .. ; \
434+ for dep in $$ (cat apis /go.mod | grep openstack-k8s-operators | grep -vE -- ' indirect|nova-operator|^replace' | awk ' {print $$1}' ); do \
435+ cd ./apis && go get $$ dep@$(BRANCH ) && cd .. ; \
436436 done
437437
438438PHONY : crd-schema-check
0 commit comments