Add option to disable ocp scc (signalfx#843)

VihasMakwana · Aug 22, 2023 · 08be4e5 · 08be4e5
1 parent 68b189e
commit 08be4e5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
 
+### Added
+
+- Add option to disable Openshift SecurityContextConstraint resource [#843](https://github.com/signalfx/splunk-otel-collector-chart/pull/843)
+
 ## [0.83.0] - 2023-08-18
 
 This Splunk OpenTelemetry Collector for Kubernetes release adopts the [Splunk OpenTelemetry Collector v0.83.0](https://github.com/signalfx/splunk-otel-collector/releases/tag/v0.83.0).

diff --git a/helm-charts/splunk-otel-collector/templates/securityContextConstraints.yaml b/helm-charts/splunk-otel-collector/templates/securityContextConstraints.yaml
@@ -37,7 +37,7 @@ requiredDropCapabilities:
 - ALL
 {{- end -}}
 
-{{- if eq (include "splunk-otel-collector.distribution" .) "openshift" }}
+{{- if and (eq (include "splunk-otel-collector.distribution" .) "openshift") .Values.securityContextConstraints.create  }}
 kind: SecurityContextConstraints
 apiVersion: security.openshift.io/v1
 metadata:

diff --git a/helm-charts/splunk-otel-collector/values.schema.json b/helm-charts/splunk-otel-collector/values.schema.json
@@ -1153,6 +1153,15 @@
       "description": "Apply for k8s cluster with windows worker node.",
       "type": "boolean"
     },
+    "securityContextConstraints": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "create": {
+          "type": "boolean"
+        }
+      }
+    },
     "securityContextConstraintsOverwrite": {
       "description": "Openshift SecurityContextConstraints can be overriden in this field.",
       "type": "object"

diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml
@@ -988,6 +988,11 @@ livenessProbe:
 # Specifies whether to apply for k8s cluster with windows worker node.
 isWindows: false
 
+# Whether to automatically create Openshift SCC or to create it manually.
+# NOTE: This config will only be used when distribution=openshift
+securityContextConstraints:
+  create: true
+
 # Openshift SecurityContextConstraints can be overriden in this field.
 # This fields will be merged into the default config that can be found at
 # https://github.com/signalfx/splunk-otel-collector-chart/blob/main/helm-charts/splunk-otel-collector/templates/securityContextConstraints.yaml