From fd5dc037be49a8c4473e25881865fb1ae2267d43 Mon Sep 17 00:00:00 2001
From: Antoine Toulme <atoulme@splunk.com>
Date: Fri, 10 Jan 2025 15:10:22 -0800
Subject: [PATCH] disable installing CRDs by default

---
 .../testdata/values/aks_test_values.yaml.tmpl          |  3 ++-
 .../testdata/values/autopilot_test_values.yaml.tmpl    |  3 ++-
 functional_tests/testdata/values/test_values.yaml.tmpl |  2 ++
 helm-charts/splunk-otel-collector/Chart.yaml           |  3 +--
 .../charts/opentelemetry-operator-crds/Chart.yaml      |  2 +-
 helm-charts/splunk-otel-collector/values.yaml          | 10 +++++-----
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/functional_tests/testdata/values/aks_test_values.yaml.tmpl b/functional_tests/testdata/values/aks_test_values.yaml.tmpl
index 1dd0b0177a..01ff9683f6 100644
--- a/functional_tests/testdata/values/aks_test_values.yaml.tmpl
+++ b/functional_tests/testdata/values/aks_test_values.yaml.tmpl
@@ -67,7 +67,8 @@ readinessProbe:
   initialDelaySeconds: 60
 livenessProbe:
   initialDelaySeconds: 60
-
+operatorcrds:
+  install: true
 operator:
   enabled: true
   admissionWebhooks:
diff --git a/functional_tests/testdata/values/autopilot_test_values.yaml.tmpl b/functional_tests/testdata/values/autopilot_test_values.yaml.tmpl
index acf197d8b5..a898ff6750 100644
--- a/functional_tests/testdata/values/autopilot_test_values.yaml.tmpl
+++ b/functional_tests/testdata/values/autopilot_test_values.yaml.tmpl
@@ -59,7 +59,8 @@ clusterName: test
 environment: test
 cloudProvider: gcp
 distribution: gke/autopilot
-
+operatorcrds:
+  install: true
 operator:
   enabled: true
   admissionWebhooks:
diff --git a/functional_tests/testdata/values/test_values.yaml.tmpl b/functional_tests/testdata/values/test_values.yaml.tmpl
index 15eed00c1a..9228de48d3 100644
--- a/functional_tests/testdata/values/test_values.yaml.tmpl
+++ b/functional_tests/testdata/values/test_values.yaml.tmpl
@@ -69,6 +69,8 @@ extraAttributes:
      value: "customvalue2"
 
 environment: dev
+operatorcrds:
+  install: true
 operator:
   enabled: true
 targetAllocator:
diff --git a/helm-charts/splunk-otel-collector/Chart.yaml b/helm-charts/splunk-otel-collector/Chart.yaml
index 2e437ce1f6..9a9bd97dd3 100644
--- a/helm-charts/splunk-otel-collector/Chart.yaml
+++ b/helm-charts/splunk-otel-collector/Chart.yaml
@@ -28,9 +28,8 @@ dependencies:
     repository: https://charts.jetstack.io
     condition: certmanager.enabled
   - name: opentelemetry-operator-crds
-    version: "0.0.0"
+    version: "0.0.1"
     alias: operatorcrds
-    # TODO: See if we can improve this conditional more
     condition: operatorcrds.install
   - name: opentelemetry-operator
     version: 0.71.2
diff --git a/helm-charts/splunk-otel-collector/charts/opentelemetry-operator-crds/Chart.yaml b/helm-charts/splunk-otel-collector/charts/opentelemetry-operator-crds/Chart.yaml
index f03ec667ab..8598d8edbe 100644
--- a/helm-charts/splunk-otel-collector/charts/opentelemetry-operator-crds/Chart.yaml
+++ b/helm-charts/splunk-otel-collector/charts/opentelemetry-operator-crds/Chart.yaml
@@ -1,3 +1,3 @@
 apiVersion: v2
 name: opentelemetry-operator-crds
-version: 0.0.0
+version: 0.0.1
diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml
index 8f6fdc0487..97d3d98584 100644
--- a/helm-charts/splunk-otel-collector/values.yaml
+++ b/helm-charts/splunk-otel-collector/values.yaml
@@ -1174,6 +1174,11 @@ service:
 # Full list of Helm value configurations: https://artifacthub.io/packages/helm/opentelemetry-helm/opentelemetry-operator?modal=values
 ################################################################################
 
+# Should the CRDs be installed by a chart's crd/ directory or by using templates.
+operatorcrds:
+  # Should the CRDs be installed
+  install: false
+
 operator:
   enabled: false
   # This is disabled by default in favor of using `operatorcrds.install=true`, as doing so creates
@@ -1200,11 +1205,6 @@ operator:
     collectorImage:
       repository: quay.io/signalfx/splunk-otel-collector
 
-# Should the CRDs be installed by a chart's crd/ directory or by using templates.
-operatorcrds:
-  # Should the CRDs be installed
-  install: true
-
 # The default Splunk Instrumentation object deployed when operator.enabled=true.
 # For more details see:
 # - Splunk Documentation: https://docs.splunk.com/observability/en/gdi/opentelemetry/automatic-discovery/k8s/k8s-backend.html#optional-configure-the-instrumentation