update

bitnami · Jan 19, 2025 · 31e46cd · 31e46cd
1 parent 3523936
commit 31e46cd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/bitnami/grafana-tempo/templates/scaling-monolithic/networkpolicy.yaml b/bitnami/grafana-tempo/templates/scaling-monolithic/networkpolicy.yaml
@@ -3,8 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if eq .Values.tempo.deploymentMode "scalingMonolithic" }}
-{{- if .Values.scalingMonolithic.networkPolicy.enabled }}
+{{- if and (eq .Values.tempo.deploymentMode "scalingMonolithic") .Values.scalingMonolithic.networkPolicy.enabled }}
 kind: NetworkPolicy
 apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
 metadata:
@@ -123,4 +122,3 @@ spec:
     {{- include "common.tplvalues.render" ( dict "value" .Values.scalingMonolithic.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}
 {{- end }}
-{{- end }}
diff --git a/bitnami/grafana-tempo/templates/scaling-monolithic/pdb.yaml b/bitnami/grafana-tempo/templates/scaling-monolithic/pdb.yaml
@@ -3,8 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if eq .Values.tempo.deploymentMode "scalingMonolithic" }}
-{{- if .Values.scalingMonolithic.pdb.create }}
+{{- if and (eq .Values.tempo.deploymentMode "scalingMonolithic") .Values.scalingMonolithic.pdb.create }}
 apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
@@ -27,4 +26,3 @@ spec:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
       app.kubernetes.io/component: scaling-monolithic
 {{- end }}
-{{- end }}
diff --git a/bitnami/grafana-tempo/templates/scaling-monolithic/servicemonitor.yaml b/bitnami/grafana-tempo/templates/scaling-monolithic/servicemonitor.yaml
@@ -3,8 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if eq .Values.tempo.deploymentMode "scalingMonolithic" }}
-{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
+{{- if and (eq .Values.tempo.deploymentMode "scalingMonolithic") .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -47,4 +46,3 @@ spec:
     matchNames:
       - {{ include "common.names.namespace" . }}
 {{- end }}
-{{- end }}