Move crds to templates folder (#19)

* Move crds to templates folder * Add parameter to control if qdrantversions CRD is included - Update makefile to add a conditional block to the qdrantversions template - Add parameter to the chart values - Remove duplicated qdrantversions.yaml file * Make bot management and regional CRDs configurable * Add CI to ensure make gen was run --------- Co-authored-by: Bastian Hofmann <[email protected]>
qdrant · Sep 26, 2024 · 62c73e0 · 62c73e0
1 parent b9025d4
commit 62c73e0
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 106 deletions.
diff --git a/.github/workflows/pr-workflow.yaml b/.github/workflows/pr-workflow.yaml
@@ -31,3 +31,12 @@ jobs:
         with:
           version: v1.59.1 # Specify the golangci-lint version, so we are stable
           args: --timeout 10m # Increase the timeout to 10 minutes
+
+      - name: Run make gen
+        run: |
+          make gen
+
+      - name: Ensure that make gen did not result in changes
+        uses: CatChen/check-git-status-action@v1
+        with:
+          fail-if-not-clean: true
diff --git a/Makefile b/Makefile
@@ -20,8 +20,20 @@ gen: manifests generate format vet ## Generate code containing DeepCopy, DeepCop
 
 .PHONY: manifests
 manifests: controller-gen ## Generate CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) crd paths="./..." output:crd:artifacts:config=charts/qdrant-operator-crds/crds
-	cp charts/qdrant-operator-crds/crds/qdrant.io_qdrantversions.yaml charts/qdrant-operator-crds/crds-for-cluster-api/qdrant.io_qdrantversions.yaml
+	rm charts/qdrant-operator-crds/templates/management-crds/*.yaml
+	rm charts/qdrant-operator-crds/templates/region-crds/*.yaml
+	$(CONTROLLER_GEN) crd paths="./..." output:crd:artifacts:config=charts/qdrant-operator-crds/templates
+	mv charts/qdrant-operator-crds/templates/qdrant.io_qdrantversions.yaml charts/qdrant-operator-crds/templates/management-crds/
+	mv charts/qdrant-operator-crds/templates/qdrant*.yaml charts/qdrant-operator-crds/templates/region-crds/
+	for file in charts/qdrant-operator-crds/templates/management-crds/*.yaml; do \
+		echo "{{ if .Values.includeManagementCRDs }}" | cat - $$file > temp && mv temp $$file; \
+		echo "{{ end }}" >> $$file; \
+	done
+	for file in charts/qdrant-operator-crds/templates/region-crds/*.yaml; do \
+		echo "{{ if .Values.includeRegionCRDs }}" | cat - $$file > temp && mv temp $$file; \
+		echo "{{ end }}" >> $$file; \
+	done
+	helm lint charts/qdrant-operator-crds
 
 .PHONY: generate
 generate: controller-gen crd-ref-docs ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.

diff --git a/charts/qdrant-operator-crds/crds/qdrant.io_qdrantversions.yaml b/charts/qdrant-operator-crds/crds/qdrant.io_qdrantversions.yaml
diff --git a/...cluster-api/qdrant.io_qdrantversions.yaml → ...gement-crds/qdrant.io_qdrantversions.yaml b/...cluster-api/qdrant.io_qdrantversions.yaml → ...gement-crds/qdrant.io_qdrantversions.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.includeManagementCRDs }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -102,3 +103,4 @@ spec:
     served: true
     storage: true
     subresources: {}
+{{ end }}
diff --git a/...ds/crds/qdrant.io_qdrantcloudregions.yaml → ...on-crds/qdrant.io_qdrantcloudregions.yaml b/...ds/crds/qdrant.io_qdrantcloudregions.yaml → ...on-crds/qdrant.io_qdrantcloudregions.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.includeRegionCRDs }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -1727,3 +1728,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{ end }}
diff --git a/...crds/qdrant.io_qdrantclusterrestores.yaml → ...crds/qdrant.io_qdrantclusterrestores.yaml b/...crds/qdrant.io_qdrantclusterrestores.yaml → ...crds/qdrant.io_qdrantclusterrestores.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.includeRegionCRDs }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -105,3 +106,4 @@ spec:
     served: true
     storage: true
     subresources: {}
+{{ end }}
diff --git a/...r-crds/crds/qdrant.io_qdrantclusters.yaml → ...region-crds/qdrant.io_qdrantclusters.yaml b/...r-crds/crds/qdrant.io_qdrantclusters.yaml → ...region-crds/qdrant.io_qdrantclusters.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.includeRegionCRDs }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -1096,3 +1097,4 @@ spec:
     served: true
     storage: true
     subresources: {}
+{{ end }}
diff --git a/...t.io_qdrantclusterscheduledsnapshots.yaml → ...t.io_qdrantclusterscheduledsnapshots.yaml b/...t.io_qdrantclusterscheduledsnapshots.yaml → ...t.io_qdrantclusterscheduledsnapshots.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.includeRegionCRDs }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -111,3 +112,4 @@ spec:
     served: true
     storage: true
     subresources: {}
+{{ end }}
diff --git a/...rds/qdrant.io_qdrantclustersnapshots.yaml → ...rds/qdrant.io_qdrantclustersnapshots.yaml b/...rds/qdrant.io_qdrantclustersnapshots.yaml → ...rds/qdrant.io_qdrantclustersnapshots.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.includeRegionCRDs }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -125,3 +126,4 @@ spec:
     served: true
     storage: true
     subresources: {}
+{{ end }}
diff --git a/charts/qdrant-operator-crds/values.yaml b/charts/qdrant-operator-crds/values.yaml
@@ -0,0 +1,4 @@
+# Include management-crds in the deployment
+includeManagementCRDs: false
+# Include region-crds in the deployment
+includeRegionCRDs: true