chart: Add crds.create flag (#420)

assafad1 · web-flow · commit a27d03937ce3 · 2025-08-10T14:25:27.000+03:00
diff --git a/charts/coralogix-operator/README.md b/charts/coralogix-operator/README.md
@@ -36,6 +36,7 @@ Kubernetes: `>=1.16.0-0`
 | coralogixOperator.region | string | `""` | Coralogix Account Region |
 | coralogixOperator.resources | object | `{}` | resource config for Coralogix operator |
 | coralogixOperator.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true}` | Security context for Coralogix operator container |
+| crds.create | bool | `true` | Specifies whether the CRDs should be created. |
 | deployment.replicas | int | `1` | How many coralogix-operator pods to run |
 | fullnameOverride | string | `""` | Provide a name to substitute for the full names of resources |
 | imagePullSecrets | list | `[]` |  |
diff --git a/charts/coralogix-operator/templates/certificate.yaml b/charts/coralogix-operator/templates/certificate.yaml
@@ -11,6 +11,6 @@ spec:
     - {{ include "coralogixOperator.fullname" . }}-webhook-service.{{ .Release.Namespace }}.svc.cluster.local
   issuerRef:
     kind: Issuer
-    name: selfsigned-issuer
+    name: {{ include "coralogixOperator.fullname" . }}-selfsigned-issuer
   secretName: {{ include "coralogixOperator.fullname" . }}-webhook-cert
 {{- end }}
diff --git a/charts/coralogix-operator/templates/crds/coralogix.com_alerts.yaml b/charts/coralogix-operator/templates/crds/coralogix.com_alerts.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -3057,3 +3058,4 @@ spec:
       storage: true
       subresources:
         status: {}
+{{- end }}
diff --git a/charts/coralogix-operator/templates/crds/coralogix.com_alertschedulers.yaml b/charts/coralogix-operator/templates/crds/coralogix.com_alertschedulers.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -350,3 +351,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/charts/coralogix-operator/templates/crds/coralogix.com_apikeys.yaml b/charts/coralogix-operator/templates/crds/coralogix.com_apikeys.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -141,3 +142,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/charts/coralogix-operator/templates/crds/coralogix.com_customroles.yaml b/charts/coralogix-operator/templates/crds/coralogix.com_customroles.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -129,3 +130,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/charts/coralogix-operator/templates/crds/coralogix.com_dashboards.yaml b/charts/coralogix-operator/templates/crds/coralogix.com_dashboards.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -173,3 +174,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/charts/coralogix-operator/templates/crds/coralogix.com_dashboardsfolders.yaml b/charts/coralogix-operator/templates/crds/coralogix.com_dashboardsfolders.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -138,3 +139,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/charts/coralogix-operator/templates/crds/coralogix.com_groups.yaml b/charts/coralogix-operator/templates/crds/coralogix.com_groups.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -170,3 +171,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/charts/coralogix-operator/templates/crds/coralogix.com_integrations.yaml b/charts/coralogix-operator/templates/crds/coralogix.com_integrations.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -125,3 +126,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/charts/coralogix-operator/templates/crds/coralogix.com_outboundwebhooks.yaml b/charts/coralogix-operator/templates/crds/coralogix.com_outboundwebhooks.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -293,3 +294,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/charts/coralogix-operator/templates/crds/coralogix.com_recordingrulegroupsets.yaml b/charts/coralogix-operator/templates/crds/coralogix.com_recordingrulegroupsets.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -157,3 +158,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/charts/coralogix-operator/templates/crds/coralogix.com_rulegroups.yaml b/charts/coralogix-operator/templates/crds/coralogix.com_rulegroups.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -392,3 +393,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/charts/coralogix-operator/templates/crds/coralogix.com_scopes.yaml b/charts/coralogix-operator/templates/crds/coralogix.com_scopes.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -149,3 +150,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/charts/coralogix-operator/templates/crds/coralogix.com_tcologspolicies.yaml b/charts/coralogix-operator/templates/crds/coralogix.com_tcologspolicies.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -208,3 +209,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/charts/coralogix-operator/templates/crds/coralogix.com_tcotracespolicies.yaml b/charts/coralogix-operator/templates/crds/coralogix.com_tcotracespolicies.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -265,3 +266,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/charts/coralogix-operator/templates/crds/coralogix.com_viewfolders.yaml b/charts/coralogix-operator/templates/crds/coralogix.com_viewfolders.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -112,3 +113,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/charts/coralogix-operator/templates/crds/coralogix.com_views.yaml b/charts/coralogix-operator/templates/crds/coralogix.com_views.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -202,3 +203,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/charts/coralogix-operator/templates/issuer.yaml b/charts/coralogix-operator/templates/issuer.yaml
@@ -4,7 +4,7 @@ kind: Issuer
 metadata:
   labels:
     {{- include "coralogixOperator.labels" . | nindent 4 }}
-  name: selfsigned-issuer
+  name: {{ include "coralogixOperator.fullname" . }}-selfsigned-issuer
 spec:
   selfSigned: {}
 {{- end }}
diff --git a/charts/coralogix-operator/values.yaml b/charts/coralogix-operator/values.yaml
@@ -10,6 +10,10 @@ deployment:
   # -- How many coralogix-operator pods to run
   replicas: 1
 
+crds:
+  # -- Specifies whether the CRDs should be created.
+  create: true
+
 # -- Service account for Coralogix operator to use.
 # -- ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
 serviceAccount:
diff --git a/scripts/helm-sync-check.sh b/scripts/helm-sync-check.sh
@@ -28,10 +28,27 @@ for crd_file in $crds_files; do
     chart_crd_file="$chart_crds_path/$crd_filename"
 
     if [ -f "$chart_crd_file" ]; then
-        if ! cmp -s "$crd_file" "$chart_crd_file"; then
+        # Ensure the CRD file contains the necessary Helm templating blocks
+        if ! grep -q '{{- *if .*\.Values\.crds\.create *}}' "$chart_crd_file"; then
+            echo "CRD file $chart_crd_file is missing the '{{- if .Values.crds.create }}' block."
+            errors_found=$((errors_found + 1))
+        fi
+
+        if ! grep -q '{{- *end *}}' "$chart_crd_file"; then
+            echo "CRD file $chart_crd_file is missing the '{{- end }}' block."
+            errors_found=$((errors_found + 1))
+        fi
+
+        # Strip Helm templating lines before comparing
+        cleaned_chart_crd=$(mktemp)
+        grep -v '{{- *if .*}}' "$chart_crd_file" | grep -v '{{- *end *}}' > "$cleaned_chart_crd"
+
+        if ! cmp -s "$crd_file" "$cleaned_chart_crd"; then
             echo "CRD file $chart_crd_file is outdated, please run make helm-update-crds"
             errors_found=$((errors_found + 1))
         fi
+
+        rm -f "$cleaned_chart_crd"
     else
         echo "CRD file $chart_crd_file is missing in the Helm chart. Please run make helm-update-crds"
         errors_found=$((errors_found + 1))
diff --git a/scripts/helm-update-crds.sh b/scripts/helm-update-crds.sh
@@ -12,11 +12,17 @@ echo "Updating Helm CRDs from $bases_path to $crds_path..."
 # Ensure the target CRDs directory exists
 mkdir -p "$crds_path"
 
-# Copy all files from config/crd/bases to the chart directory
+# Copy and wrap each CRD from bases into Helm chart directory
 for base_file in "$bases_path"/*.yaml; do
     crd_file="$crds_path/$(basename "$base_file")"
-    cp "$base_file" "$crd_file"
-    echo "Copied or updated CRD file: $crd_file"
+
+    {
+        echo "{{- if .Values.crds.create }}"
+        cat "$base_file"
+        echo "{{- end }}"
+    } > "$crd_file"
+
+    echo "Wrapped and wrote CRD file: $crd_file"
 done
 
 # Cleanup: Remove files in the chart directory that no longer exist in config/crd/bases
