From ded6ed9345e93e228606f8b3d112dfbe922b114a Mon Sep 17 00:00:00 2001 From: Ben Foster Date: Thu, 16 May 2024 07:47:33 -0400 Subject: [PATCH] Fix use of undefined variable --- bitnami/grafana-loki/templates/compactor/networkpolicy.yaml | 4 ++-- bitnami/grafana-loki/templates/distributor/networkpolicy.yaml | 4 ++-- bitnami/grafana-loki/templates/gateway/networkpolicy.yaml | 4 ++-- .../grafana-loki/templates/index-gateway/networkpolicy.yaml | 4 ++-- bitnami/grafana-loki/templates/ingester/networkpolicy.yaml | 4 ++-- bitnami/grafana-loki/templates/promtail/networkpolicy.yaml | 4 ++-- bitnami/grafana-loki/templates/querier/networkpolicy.yaml | 4 ++-- .../grafana-loki/templates/query-frontend/networkpolicy.yaml | 4 ++-- .../grafana-loki/templates/query-scheduler/networkpolicy.yaml | 4 ++-- bitnami/grafana-loki/templates/ruler/networkpolicy.yaml | 4 ++-- .../grafana-loki/templates/table-manager/networkpolicy.yaml | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/bitnami/grafana-loki/templates/compactor/networkpolicy.yaml b/bitnami/grafana-loki/templates/compactor/networkpolicy.yaml index 940c9b97a44834..766a178dc6bd8e 100644 --- a/bitnami/grafana-loki/templates/compactor/networkpolicy.yaml +++ b/bitnami/grafana-loki/templates/compactor/networkpolicy.yaml @@ -133,10 +133,10 @@ spec: {{- end }} {{- if .Values.compactor.networkPolicy.ingressNSMatchLabels }} - namespaceSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.compactor.networkPolicy.ingressNSMatchLabels "context" $ ) | nindent 14 }} {{- if .Values.compactor.networkPolicy.ingressNSPodMatchLabels }} podSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSPodMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.compactor.networkPolicy.ingressNSPodMatchLabels "context" $ ) | nindent 14 }} {{- end }} {{- end }} {{- end }} diff --git a/bitnami/grafana-loki/templates/distributor/networkpolicy.yaml b/bitnami/grafana-loki/templates/distributor/networkpolicy.yaml index 2f139b439a353d..eb1cfdf52e45ab 100644 --- a/bitnami/grafana-loki/templates/distributor/networkpolicy.yaml +++ b/bitnami/grafana-loki/templates/distributor/networkpolicy.yaml @@ -125,10 +125,10 @@ spec: {{- end }} {{- if .Values.distributor.networkPolicy.ingressNSMatchLabels }} - namespaceSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.distributor.networkPolicy.ingressNSMatchLabels "context" $ ) | nindent 14 }} {{- if .Values.distributor.networkPolicy.ingressNSPodMatchLabels }} podSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSPodMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.distributor.networkPolicy.ingressNSPodMatchLabels "context" $ ) | nindent 14 }} {{- end }} {{- end }} {{- end }} diff --git a/bitnami/grafana-loki/templates/gateway/networkpolicy.yaml b/bitnami/grafana-loki/templates/gateway/networkpolicy.yaml index 0890a5b908b8ab..ac5b9fefdd5b28 100644 --- a/bitnami/grafana-loki/templates/gateway/networkpolicy.yaml +++ b/bitnami/grafana-loki/templates/gateway/networkpolicy.yaml @@ -124,10 +124,10 @@ spec: {{- end }} {{- if .Values.gateway.networkPolicy.ingressNSMatchLabels }} - namespaceSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.gateway.networkPolicy.ingressNSMatchLabels "context" $ ) | nindent 14 }} {{- if .Values.gateway.networkPolicy.ingressNSPodMatchLabels }} podSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSPodMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.gateway.networkPolicy.ingressNSPodMatchLabels "context" $ ) | nindent 14 }} {{- end }} {{- end }} {{- end }} diff --git a/bitnami/grafana-loki/templates/index-gateway/networkpolicy.yaml b/bitnami/grafana-loki/templates/index-gateway/networkpolicy.yaml index 8f180c862dd3cb..78b45b31e62a76 100644 --- a/bitnami/grafana-loki/templates/index-gateway/networkpolicy.yaml +++ b/bitnami/grafana-loki/templates/index-gateway/networkpolicy.yaml @@ -125,10 +125,10 @@ spec: {{- end }} {{- if .Values.indexGateway.networkPolicy.ingressNSMatchLabels }} - namespaceSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.indexGateway.networkPolicy.ingressNSMatchLabels "context" $ ) | nindent 14 }} {{- if .Values.indexGateway.networkPolicy.ingressNSPodMatchLabels }} podSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSPodMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.indexGateway.networkPolicy.ingressNSPodMatchLabels "context" $ ) | nindent 14 }} {{- end }} {{- end }} {{- end }} diff --git a/bitnami/grafana-loki/templates/ingester/networkpolicy.yaml b/bitnami/grafana-loki/templates/ingester/networkpolicy.yaml index b540aa5a9b52e0..7dfbb74c85acfb 100644 --- a/bitnami/grafana-loki/templates/ingester/networkpolicy.yaml +++ b/bitnami/grafana-loki/templates/ingester/networkpolicy.yaml @@ -125,10 +125,10 @@ spec: {{- end }} {{- if .Values.ingester.networkPolicy.ingressNSMatchLabels }} - namespaceSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.networkPolicy.ingressNSMatchLabels "context" $ ) | nindent 14 }} {{- if .Values.ingester.networkPolicy.ingressNSPodMatchLabels }} podSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSPodMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.networkPolicy.ingressNSPodMatchLabels "context" $ ) | nindent 14 }} {{- end }} {{- end }} {{- end }} diff --git a/bitnami/grafana-loki/templates/promtail/networkpolicy.yaml b/bitnami/grafana-loki/templates/promtail/networkpolicy.yaml index c4ba73a44e1e54..54b5d803920c5a 100644 --- a/bitnami/grafana-loki/templates/promtail/networkpolicy.yaml +++ b/bitnami/grafana-loki/templates/promtail/networkpolicy.yaml @@ -127,10 +127,10 @@ spec: {{- end }} {{- if .Values.promtail.networkPolicy.ingressNSMatchLabels }} - namespaceSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.promtail.networkPolicy.ingressNSMatchLabels "context" $ ) | nindent 14 }} {{- if .Values.promtail.networkPolicy.ingressNSPodMatchLabels }} podSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSPodMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.promtail.networkPolicy.ingressNSPodMatchLabels "context" $ ) | nindent 14 }} {{- end }} {{- end }} {{- end }} diff --git a/bitnami/grafana-loki/templates/querier/networkpolicy.yaml b/bitnami/grafana-loki/templates/querier/networkpolicy.yaml index 6facba6ed148fd..5c513ef076354e 100644 --- a/bitnami/grafana-loki/templates/querier/networkpolicy.yaml +++ b/bitnami/grafana-loki/templates/querier/networkpolicy.yaml @@ -125,10 +125,10 @@ spec: {{- end }} {{- if .Values.querier.networkPolicy.ingressNSMatchLabels }} - namespaceSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.querier.networkPolicy.ingressNSMatchLabels "context" $ ) | nindent 14 }} {{- if .Values.querier.networkPolicy.ingressNSPodMatchLabels }} podSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSPodMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.querier.networkPolicy.ingressNSPodMatchLabels "context" $ ) | nindent 14 }} {{- end }} {{- end }} {{- end }} diff --git a/bitnami/grafana-loki/templates/query-frontend/networkpolicy.yaml b/bitnami/grafana-loki/templates/query-frontend/networkpolicy.yaml index ac4acf35425289..51554bf463cf56 100644 --- a/bitnami/grafana-loki/templates/query-frontend/networkpolicy.yaml +++ b/bitnami/grafana-loki/templates/query-frontend/networkpolicy.yaml @@ -125,10 +125,10 @@ spec: {{- end }} {{- if .Values.queryFrontend.networkPolicy.ingressNSMatchLabels }} - namespaceSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.networkPolicy.ingressNSMatchLabels "context" $ ) | nindent 14 }} {{- if .Values.queryFrontend.networkPolicy.ingressNSPodMatchLabels }} podSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSPodMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.networkPolicy.ingressNSPodMatchLabels "context" $ ) | nindent 14 }} {{- end }} {{- end }} {{- end }} diff --git a/bitnami/grafana-loki/templates/query-scheduler/networkpolicy.yaml b/bitnami/grafana-loki/templates/query-scheduler/networkpolicy.yaml index ba15a22a2c69b6..ff7ae035069637 100644 --- a/bitnami/grafana-loki/templates/query-scheduler/networkpolicy.yaml +++ b/bitnami/grafana-loki/templates/query-scheduler/networkpolicy.yaml @@ -125,10 +125,10 @@ spec: {{- end }} {{- if .Values.queryScheduler.networkPolicy.ingressNSMatchLabels }} - namespaceSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.queryScheduler.networkPolicy.ingressNSMatchLabels "context" $ ) | nindent 14 }} {{- if .Values.queryScheduler.networkPolicy.ingressNSPodMatchLabels }} podSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSPodMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.queryScheduler.networkPolicy.ingressNSPodMatchLabels "context" $ ) | nindent 14 }} {{- end }} {{- end }} {{- end }} diff --git a/bitnami/grafana-loki/templates/ruler/networkpolicy.yaml b/bitnami/grafana-loki/templates/ruler/networkpolicy.yaml index 50120cd6c0f523..93464eff81ce56 100644 --- a/bitnami/grafana-loki/templates/ruler/networkpolicy.yaml +++ b/bitnami/grafana-loki/templates/ruler/networkpolicy.yaml @@ -125,10 +125,10 @@ spec: {{- end }} {{- if .Values.ruler.networkPolicy.ingressNSMatchLabels }} - namespaceSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.ruler.networkPolicy.ingressNSMatchLabels "context" $ ) | nindent 14 }} {{- if .Values.ruler.networkPolicy.ingressNSPodMatchLabels }} podSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSPodMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.ruler.networkPolicy.ingressNSPodMatchLabels "context" $ ) | nindent 14 }} {{- end }} {{- end }} {{- end }} diff --git a/bitnami/grafana-loki/templates/table-manager/networkpolicy.yaml b/bitnami/grafana-loki/templates/table-manager/networkpolicy.yaml index 568b2b288477f4..135d4234fd00b4 100644 --- a/bitnami/grafana-loki/templates/table-manager/networkpolicy.yaml +++ b/bitnami/grafana-loki/templates/table-manager/networkpolicy.yaml @@ -125,10 +125,10 @@ spec: {{- end }} {{- if .Values.tableManager.networkPolicy.ingressNSMatchLabels }} - namespaceSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.tableManager.networkPolicy.ingressNSMatchLabels "context" $ ) | nindent 14 }} {{- if .Values.tableManager.networkPolicy.ingressNSPodMatchLabels }} podSelector: - matchLabels: {{- include "common.tplvalues.render" (dict "value" $ingressNSPodMatchLabels "context" $ ) | nindent 14 }} + matchLabels: {{- include "common.tplvalues.render" (dict "value" .Values.tableManager.networkPolicy.ingressNSPodMatchLabels "context" $ ) | nindent 14 }} {{- end }} {{- end }} {{- end }}