Only provide SCC name flag when openshift.enabled, update docs

hashicorp · Aug 7, 2023 · 61fb592 · 61fb592
1 parent 3bf704f
commit 61fb592
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/charts/consul/templates/gateway-resources-job.yaml b/charts/consul/templates/gateway-resources-job.yaml
@@ -99,7 +99,9 @@ spec:
             - {{- toYaml .Values.connectInject.apiGateway.managedGatewayClass.copyAnnotations.service.annotations | nindent 14 -}}
             {{- end }}
             - -service-type={{ .Values.connectInject.apiGateway.managedGatewayClass.serviceType }}
+            {{- if .Values.global.openshift.enabled  }}
             - -openshift-scc-name={{ .Values.connectInject.apiGateway.managedGatewayClass.openshiftSCCName }}
+            {{- end }}
             {{- end}}
           resources:
             requests:

diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml
@@ -2201,7 +2201,8 @@ connectInject:
         maxInstances: 1
         minInstances: 1
 
-      # The name of the Openshift SecurityContextConstraints resource to use for Gateways
+      # The name of the OpenShift SecurityContextConstraints resource to use for Gateways.
+      # Only applicable if `global.openshift.enabled` is true.
       # @type: string
       openshiftSCCName: "restricted-v2"