Reverse preventing deploying operator crds via helm templates (operat…

…or.crds.create)
signalfx · Jan 17, 2025 · 82adc99 · 82adc99
1 parent f2cf017
commit 82adc99
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 27 deletions.
diff --git a/helm-charts/splunk-otel-collector/values.schema.json b/helm-charts/splunk-otel-collector/values.schema.json
@@ -1445,36 +1445,12 @@
     "operator": {
       "description": "OpenTelemetry Operator configuration. A subchart that is used to install the operator, see https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-operator/values.schema.json for more info.",
       "type": "object",
-      "additionalProperties": true,
-      "properties": {
-        "crds": {
-          "type": "object",
-          "properties": {
-            "create": {
-              "description": "This value must always be false to avoid race condition errors during Helm deployments.",
-              "type": "boolean",
-              "const": false
-            }
-          }
-        }
-      }
+      "additionalProperties": true
     },
     "opentelemetry-operator": {
       "description": "OpenTelemetry Operator configuration (legacy). Prefer using 'operator' for new installations. This field is provided for backward compatibility with older Helm versions or custom distributions. A subchart that is used to install the operator, see https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-operator/values.schema.json for more info.",
       "type": "object",
-      "additionalProperties": true,
-      "properties": {
-        "crds": {
-          "type": "object",
-          "properties": {
-            "create": {
-              "description": "This value must always be false to avoid race condition errors during Helm deployments.",
-              "type": "boolean",
-              "const": false
-            }
-          }
-        }
-      }
+      "additionalProperties": true
     },
     "instrumentation": {
       "type": "object",

diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml
@@ -1182,8 +1182,14 @@ operatorcrds:
 
 operator:
   enabled: false
+  # This is disabled by default in favor of using `operatorcrds.install=true`, as doing so creates
+  # a race condition with helm.
+  # See: https://github.com/open-telemetry/opentelemetry-helm-charts/issues/677
+  # Users of this chart should _never_ set this to be true. If a user wishes
+  # to install the CRDs through the opentelemetry-operator chart, it is recommended
+  # to install the opentelemetry-operator chart separately and prior to the installation
+  # of this chart.
   crds:
-    # This value is set to false and cannot be changed; use `operatorcrds.install` instead.
     create: false
   admissionWebhooks:
     certManager: