sync: rc-2023-11-07.3 to stage (#1450)

sync-branches: New code has just landed in rc-2023-11-07.3, so let's bring stage up to speed!
stackrox · Nov 7, 2023 · bddfe95 · bddfe95
2 parents dfdff12 + eafa424
commit bddfe95
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/...form/helm/rhacs-terraform/charts/observability/templates/01-operator-05-subscription.yaml b/...form/helm/rhacs-terraform/charts/observability/templates/01-operator-05-subscription.yaml
@@ -13,10 +13,8 @@ spec:
   sourceNamespace: {{ include "observability.namespace" . }}
   startingCSV: observability-operator.{{ .Values.observabilityOperatorVersion }}
   config:
+    # set the resources if they are provided
+    {{- if ((.Values.observabilityOperator).resources) }}
     resources:
-      requests:
-        cpu: {{ .Values.observabilityOperator.resources.requests.cpu | quote }}
-        memory: {{ .Values.observabilityOperator.resources.requests.memory | quote }}
-      limits:
-        cpu: {{ .Values.observabilityOperator.resources.limits.cpu | quote }}
-        memory: {{ .Values.observabilityOperator.resources.limits.memory | quote }}
+      {{ .Values.observabilityOperator.resources | toYaml | nindent 6 }}
+    {{- end }}