From ca141d7b8d329058faa74063c3e3fefefe23a8c6 Mon Sep 17 00:00:00 2001
From: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
Date: Mon, 18 Sep 2023 15:06:34 +1000
Subject: [PATCH] fix: variable scope in templates

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
---
 charts/hedera-network/templates/configmaps/envoy-cm.yaml    | 2 +-
 charts/hedera-network/templates/configmaps/haproxy-cm.yaml  | 2 +-
 .../templates/configmaps/otel-collector-cm.yaml             | 2 +-
 charts/hedera-network/templates/configmaps/test-cm.yaml     | 2 +-
 .../templates/gateway-api/envoy-grpc-web-routes.yaml        | 2 +-
 charts/hedera-network/templates/gateway-api/gateway.yaml    | 4 ++--
 .../templates/gateway-api/haproxy-grpc-routes.yaml          | 2 +-
 .../templates/gateway-api/network-node-grpc-routes.yaml     | 2 +-
 .../hedera-network/templates/network-node-statefulset.yaml  | 2 +-
 charts/hedera-network/templates/proxy/envoy-deployment.yaml | 2 +-
 .../hedera-network/templates/proxy/haproxy-deployment.yaml  | 2 +-
 charts/hedera-network/templates/rbac/pod-monitor-role.yaml  | 6 +++---
 charts/hedera-network/templates/rbac/service-accounts.yaml  | 2 +-
 .../templates/secrets/backup-uploder-secrets.yaml           | 2 +-
 .../templates/secrets/otel-collector-secrets.yaml           | 2 +-
 .../templates/secrets/uploder-mirror-secrets.yaml           | 2 +-
 charts/hedera-network/templates/services/envoy-svc.yaml     | 2 +-
 charts/hedera-network/templates/services/haproxy-svc.yaml   | 2 +-
 .../hedera-network/templates/services/network-node-svc.yaml | 2 +-
 .../templates/telemetry/prometheus-svc-monitor.yaml         | 2 +-
 20 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/charts/hedera-network/templates/configmaps/envoy-cm.yaml b/charts/hedera-network/templates/configmaps/envoy-cm.yaml
index c9ccc7cd3..e584f4579 100644
--- a/charts/hedera-network/templates/configmaps/envoy-cm.yaml
+++ b/charts/hedera-network/templates/configmaps/envoy-cm.yaml
@@ -5,7 +5,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: envoy-proxy-cm-{{ $node.name }}
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
 data:
   envoy.yaml: |
     {{- tpl ($.Files.Get "config-files/envoy.yaml") (dict "nodeConfig" $node "Template" $.Template) | nindent 4 }}
diff --git a/charts/hedera-network/templates/configmaps/haproxy-cm.yaml b/charts/hedera-network/templates/configmaps/haproxy-cm.yaml
index ecd39ebc9..3b63a756d 100644
--- a/charts/hedera-network/templates/configmaps/haproxy-cm.yaml
+++ b/charts/hedera-network/templates/configmaps/haproxy-cm.yaml
@@ -5,7 +5,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: haproxy-cm-{{ $node.name }}
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
 data:
   haproxy.cfg: |
     {{- tpl ($.Files.Get "config-files/haproxy.cfg") (dict "nodeConfig" $node "Template" $.Template) | nindent 4 }}
diff --git a/charts/hedera-network/templates/configmaps/otel-collector-cm.yaml b/charts/hedera-network/templates/configmaps/otel-collector-cm.yaml
index 6a1e634d2..726c9bc81 100644
--- a/charts/hedera-network/templates/configmaps/otel-collector-cm.yaml
+++ b/charts/hedera-network/templates/configmaps/otel-collector-cm.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: otel-collector-cm
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
 data:
   config.yaml: |
   {{- tpl (.Files.Get "config-files/otel-collector-config.yaml") ( dict "otelDefaults" $.Values.defaults.sidecars.otelCollector "Template" $.Template )  | nindent 4 }}
diff --git a/charts/hedera-network/templates/configmaps/test-cm.yaml b/charts/hedera-network/templates/configmaps/test-cm.yaml
index 67e8d9f73..3c004543b 100644
--- a/charts/hedera-network/templates/configmaps/test-cm.yaml
+++ b/charts/hedera-network/templates/configmaps/test-cm.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: test-cm
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
 data:
   {{- $total_nodes := len $.Values.hedera.nodes -}}
   {{- range $path, $_ :=  .Files.Glob  "tests/*.*" }}
diff --git a/charts/hedera-network/templates/gateway-api/envoy-grpc-web-routes.yaml b/charts/hedera-network/templates/gateway-api/envoy-grpc-web-routes.yaml
index 750d2eef4..7485037f8 100644
--- a/charts/hedera-network/templates/gateway-api/envoy-grpc-web-routes.yaml
+++ b/charts/hedera-network/templates/gateway-api/envoy-grpc-web-routes.yaml
@@ -7,7 +7,7 @@ apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: envoy-grpc-web-route-{{ $node.name }}
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
   labels:
     fullstack.hedera.com/type: http-route
 spec:
diff --git a/charts/hedera-network/templates/gateway-api/gateway.yaml b/charts/hedera-network/templates/gateway-api/gateway.yaml
index 378b297e2..a041c1cac 100644
--- a/charts/hedera-network/templates/gateway-api/gateway.yaml
+++ b/charts/hedera-network/templates/gateway-api/gateway.yaml
@@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1beta1
 kind: GatewayClass
 metadata:
   name: {{ $.Values.gatewayApi.gatewayClass.name }}
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
   labels:
     fullstack.hedera.com/type: gateway-class
 spec:
@@ -15,7 +15,7 @@ apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway
 metadata:
   name: {{ $.Values.gatewayApi.gateway.name }}
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
   labels:
     fullstack.hedera.com/type: gateway
 spec:
diff --git a/charts/hedera-network/templates/gateway-api/haproxy-grpc-routes.yaml b/charts/hedera-network/templates/gateway-api/haproxy-grpc-routes.yaml
index 7e3800011..ae775bbf5 100644
--- a/charts/hedera-network/templates/gateway-api/haproxy-grpc-routes.yaml
+++ b/charts/hedera-network/templates/gateway-api/haproxy-grpc-routes.yaml
@@ -7,7 +7,7 @@ apiVersion: gateway.networking.k8s.io/v1alpha2
 kind: TCPRoute
 metadata:
   name: haproxy-grpc-route-{{ $node.name }}
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
   labels:
     fullstack.hedera.com/type: tcp-route
     fullstack.hedera.com/nodeName: {{ $node.name }}
diff --git a/charts/hedera-network/templates/gateway-api/network-node-grpc-routes.yaml b/charts/hedera-network/templates/gateway-api/network-node-grpc-routes.yaml
index aae30d6d6..214997dc2 100644
--- a/charts/hedera-network/templates/gateway-api/network-node-grpc-routes.yaml
+++ b/charts/hedera-network/templates/gateway-api/network-node-grpc-routes.yaml
@@ -7,7 +7,7 @@ apiVersion: gateway.networking.k8s.io/v1alpha2
 kind: TCPRoute
 metadata:
   name: node-grpc-route-{{ $node.name }}
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
   labels:
     fullstack.hedera.com/type: tcp-route
     fullstack.hedera.com/nodeName: {{ $node.name }}
diff --git a/charts/hedera-network/templates/network-node-statefulset.yaml b/charts/hedera-network/templates/network-node-statefulset.yaml
index 1d45ddcb3..50f00ef4d 100644
--- a/charts/hedera-network/templates/network-node-statefulset.yaml
+++ b/charts/hedera-network/templates/network-node-statefulset.yaml
@@ -14,7 +14,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: network-{{ $node.name }}
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
   labels:
     app: network-{{ $node.name }}
 spec:
diff --git a/charts/hedera-network/templates/proxy/envoy-deployment.yaml b/charts/hedera-network/templates/proxy/envoy-deployment.yaml
index 38d6b6259..022ef4272 100644
--- a/charts/hedera-network/templates/proxy/envoy-deployment.yaml
+++ b/charts/hedera-network/templates/proxy/envoy-deployment.yaml
@@ -7,7 +7,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: envoy-proxy-{{ $node.name }}
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
 spec:
   replicas: 1
   selector:
diff --git a/charts/hedera-network/templates/proxy/haproxy-deployment.yaml b/charts/hedera-network/templates/proxy/haproxy-deployment.yaml
index 1ba018ec0..a4edf92c4 100644
--- a/charts/hedera-network/templates/proxy/haproxy-deployment.yaml
+++ b/charts/hedera-network/templates/proxy/haproxy-deployment.yaml
@@ -7,7 +7,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: haproxy-{{ $node.name }}
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
 spec:
   replicas: 1
   selector:
diff --git a/charts/hedera-network/templates/rbac/pod-monitor-role.yaml b/charts/hedera-network/templates/rbac/pod-monitor-role.yaml
index ca71a23ca..dd8ccbd8e 100644
--- a/charts/hedera-network/templates/rbac/pod-monitor-role.yaml
+++ b/charts/hedera-network/templates/rbac/pod-monitor-role.yaml
@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: pod-monitoring-role
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
 rules:
   - apiGroups: [ "" ]
     resources:
@@ -31,11 +31,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: pod-monitoring-role-binding
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
 subjects:
   - kind: ServiceAccount
     name: pod-monitor
-    namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+    namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
 roleRef:
   kind: ClusterRole
   name: pod-monitoring-role
diff --git a/charts/hedera-network/templates/rbac/service-accounts.yaml b/charts/hedera-network/templates/rbac/service-accounts.yaml
index 1e8e41c88..0e4b26311 100644
--- a/charts/hedera-network/templates/rbac/service-accounts.yaml
+++ b/charts/hedera-network/templates/rbac/service-accounts.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: pod-monitor
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
diff --git a/charts/hedera-network/templates/secrets/backup-uploder-secrets.yaml b/charts/hedera-network/templates/secrets/backup-uploder-secrets.yaml
index 54e8670c0..04f14dae7 100644
--- a/charts/hedera-network/templates/secrets/backup-uploder-secrets.yaml
+++ b/charts/hedera-network/templates/secrets/backup-uploder-secrets.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: backup-uploader-secrets
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
 type: Opaque
 data:
   S3_ACCESS_KEY: ""
diff --git a/charts/hedera-network/templates/secrets/otel-collector-secrets.yaml b/charts/hedera-network/templates/secrets/otel-collector-secrets.yaml
index bb3d2b91b..13e65c2f2 100644
--- a/charts/hedera-network/templates/secrets/otel-collector-secrets.yaml
+++ b/charts/hedera-network/templates/secrets/otel-collector-secrets.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: otel-collector-secrets
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
 type: Opaque
 data:
   S3_ACCESS_KEY: ""
diff --git a/charts/hedera-network/templates/secrets/uploder-mirror-secrets.yaml b/charts/hedera-network/templates/secrets/uploder-mirror-secrets.yaml
index 2aa0834f3..cc6c11371 100644
--- a/charts/hedera-network/templates/secrets/uploder-mirror-secrets.yaml
+++ b/charts/hedera-network/templates/secrets/uploder-mirror-secrets.yaml
@@ -7,7 +7,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: minio-secrets
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
 type: Opaque
 data:
   config.env: {{ $minio_config_env | b64enc }}
diff --git a/charts/hedera-network/templates/services/envoy-svc.yaml b/charts/hedera-network/templates/services/envoy-svc.yaml
index 91e9680a7..082103dda 100644
--- a/charts/hedera-network/templates/services/envoy-svc.yaml
+++ b/charts/hedera-network/templates/services/envoy-svc.yaml
@@ -7,7 +7,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: envoy-proxy-{{ $node.name }}-svc
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
   labels:
     fullstack.hedera.com/type: envoy-proxy-svc
     fullstack.hedera.com/node-name: {{ $node.name }}
diff --git a/charts/hedera-network/templates/services/haproxy-svc.yaml b/charts/hedera-network/templates/services/haproxy-svc.yaml
index b610d2793..248083a6b 100644
--- a/charts/hedera-network/templates/services/haproxy-svc.yaml
+++ b/charts/hedera-network/templates/services/haproxy-svc.yaml
@@ -7,7 +7,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: haproxy-{{ $node.name }}-svc
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
   labels:
     fullstack.hedera.com/type: haproxy-svc
     fullstack.hedera.com/node-name: {{ $node.name }}
diff --git a/charts/hedera-network/templates/services/network-node-svc.yaml b/charts/hedera-network/templates/services/network-node-svc.yaml
index f16218dc1..4fa908d2f 100644
--- a/charts/hedera-network/templates/services/network-node-svc.yaml
+++ b/charts/hedera-network/templates/services/network-node-svc.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: network-{{ $nodeConfig.name }}-svc
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
   labels:
     fullstack.hedera.com/type: network-node-svc
     fullstack.hedera.com/node-name: {{ $nodeConfig.name }}
diff --git a/charts/hedera-network/templates/telemetry/prometheus-svc-monitor.yaml b/charts/hedera-network/templates/telemetry/prometheus-svc-monitor.yaml
index 8e044a463..f990545ea 100644
--- a/charts/hedera-network/templates/telemetry/prometheus-svc-monitor.yaml
+++ b/charts/hedera-network/templates/telemetry/prometheus-svc-monitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: network-node-monitor
-  namespace: {{ default .Release.Namespace .Values.global.namespaceOverride }}
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
   labels:
     fullstack.hedera.com/type: network-node-svc-monitor
 spec: