rename crd base directory

GreptimeTeam · Dec 14, 2023 · 4783333 · 4783333
1 parent adb3de7
commit 4783333
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -88,7 +88,7 @@ jobs:
 
       - name: Rename crd file
         run: |
-          cp ./config/crd/bases/greptime.io_greptimedbclusters.yaml ./greptimedbcluster.yaml
+          cp ./config/crd/resources/greptime.io_greptimedbclusters.yaml ./greptimedbcluster.yaml
 
       - name: Publish release
         uses: softprops/action-gh-release@v1

diff --git a/Makefile b/Makefile
@@ -66,7 +66,7 @@ help: ## Display this help.
 
 .PHONY: manifests
 manifests: kustomize controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) rbac:roleName=greptimedb-operator-role crd:maxDescLen=0 webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) rbac:roleName=greptimedb-operator-role crd:maxDescLen=0 webhook paths="./..." output:crd:artifacts:config=config/crd/resources
 	$(KUSTOMIZE) build config/crd > ${MANIFESTS_DIR}/greptimedb-operator-crd.yaml
 	$(KUSTOMIZE) build config/default > ${MANIFESTS_DIR}/greptimedb-operator-deployment.yaml
 

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -16,7 +16,7 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- bases/greptime.io_greptimedbclusters.yaml
+- resources/greptime.io_greptimedbclusters.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:

diff --git a/...bases/greptime.io_greptimedbclusters.yaml → ...urces/greptime.io_greptimedbclusters.yaml b/...bases/greptime.io_greptimedbclusters.yaml → ...urces/greptime.io_greptimedbclusters.yaml
diff --git a/controllers/greptimedbcluster/suite_test.go b/controllers/greptimedbcluster/suite_test.go
@@ -61,7 +61,7 @@ var _ = BeforeSuite(func() {
 	By("bootstrapping test environment")
 	useExistingCluster := false
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "config", "crd", "bases")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "config", "crd", "resources")},
 		ErrorIfCRDPathMissing: true,
 		UseExistingCluster:    &useExistingCluster,
 	}

diff --git a/tests/e2e/suite_test.go b/tests/e2e/suite_test.go
@@ -55,7 +55,7 @@ var _ = BeforeSuite(func() {
 	By("bootstrapping test environment")
 	useExistingCluster := true
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:  []string{filepath.Join("..", "..", "config", "crd", "bases")},
+		CRDDirectoryPaths:  []string{filepath.Join("..", "..", "config", "crd", "resources")},
 		Config:             cfg,
 		UseExistingCluster: &useExistingCluster,
 	}