From eb75a46972f1e1d929a8419fabdd4821e88b7243 Mon Sep 17 00:00:00 2001
From: Cedric Verstraeten <cverstraeten@uug.ai>
Date: Mon, 2 Dec 2024 11:02:56 +0100
Subject: [PATCH] replace with other variable (official helm variable)

---
 charts/hub/templates/kerberos-hub/hub-api.yaml                  | 2 +-
 charts/hub/templates/kerberos-hub/hub-cleanup.yaml              | 2 +-
 charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml        | 2 +-
 charts/hub/templates/kerberos-hub/hub-frontend.yaml             | 2 +-
 charts/hub/templates/kerberos-hub/hub-monitor-device.yaml       | 2 +-
 .../hub/templates/kerberos-hub/hub-reactivate-subscription.yaml | 2 +-
 charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml       | 2 +-
 charts/hub/templates/kerberos-pipeline/pipe-counting.yaml       | 2 +-
 charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml  | 2 +-
 charts/hub/templates/kerberos-pipeline/pipe-event.yaml          | 2 +-
 charts/hub/templates/kerberos-pipeline/pipe-export.yaml         | 2 +-
 charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml        | 2 +-
 charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml    | 2 +-
 charts/hub/templates/kerberos-pipeline/pipe-notify.yaml         | 2 +-
 charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml       | 2 +-
 charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml         | 2 +-
 charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml      | 2 +-
 charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml      | 2 +-
 charts/hub/templates/kerberos-pipeline/servicemonitor.yaml      | 2 +-
 charts/hub/templates/kerberos-vault/vault-forwarder.yaml        | 2 +-
 charts/hub/templates/kerberos-vault/vault-proxy.yaml            | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/charts/hub/templates/kerberos-hub/hub-api.yaml b/charts/hub/templates/kerberos-hub/hub-api.yaml
index f1443ad..4f2d0ef 100644
--- a/charts/hub/templates/kerberos-hub/hub-api.yaml
+++ b/charts/hub/templates/kerberos-hub/hub-api.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: hub-api-svc
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: hub-api-svc
 spec:
diff --git a/charts/hub/templates/kerberos-hub/hub-cleanup.yaml b/charts/hub/templates/kerberos-hub/hub-cleanup.yaml
index 2d99ed9..001fc54 100644
--- a/charts/hub/templates/kerberos-hub/hub-cleanup.yaml
+++ b/charts/hub/templates/kerberos-hub/hub-cleanup.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: hub-cleanup
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
diff --git a/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml b/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml
index 87b9349..48ca196 100644
--- a/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml
+++ b/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: hub-frontend-demo-svc
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: hub-frontend-demo-svc
 spec:
diff --git a/charts/hub/templates/kerberos-hub/hub-frontend.yaml b/charts/hub/templates/kerberos-hub/hub-frontend.yaml
index 9a306c7..cb48f56 100644
--- a/charts/hub/templates/kerberos-hub/hub-frontend.yaml
+++ b/charts/hub/templates/kerberos-hub/hub-frontend.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: hub-frontend-svc
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: hub-frontend-svc
 spec:
diff --git a/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml b/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml
index d03e7c9..525a73c 100644
--- a/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml
+++ b/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: hub-monitor-device
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
diff --git a/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml b/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml
index 40f5722..4cab869 100644
--- a/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml
+++ b/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: hub-reactivate-subscription
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
diff --git a/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml b/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml
index e7bdd71..385326e 100644
--- a/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml
+++ b/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: pipe-analysis
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.kerberospipeline.analysis.replicas }}
   selector:
diff --git a/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml b/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml
index 62e76fe..1b36b38 100644
--- a/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml
+++ b/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: pipe-counting
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.kerberospipeline.counting.replicas }}
   selector:
diff --git a/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml b/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml
index e214d55..46d99c3 100644
--- a/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml
+++ b/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: pipe-dominantcolor
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.kerberospipeline.dominantColor.replicas }}
   selector:
diff --git a/charts/hub/templates/kerberos-pipeline/pipe-event.yaml b/charts/hub/templates/kerberos-pipeline/pipe-event.yaml
index b29d236..dcc037e 100644
--- a/charts/hub/templates/kerberos-pipeline/pipe-event.yaml
+++ b/charts/hub/templates/kerberos-pipeline/pipe-event.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: pipe-event
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.kerberospipeline.event.replicas }}
   selector:
diff --git a/charts/hub/templates/kerberos-pipeline/pipe-export.yaml b/charts/hub/templates/kerberos-pipeline/pipe-export.yaml
index 227d5b9..0e3a9ab 100644
--- a/charts/hub/templates/kerberos-pipeline/pipe-export.yaml
+++ b/charts/hub/templates/kerberos-pipeline/pipe-export.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: pipe-export
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.kerberospipeline.export.replicas }}
   selector:
diff --git a/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml b/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml
index 9f33897..58e5bb0 100644
--- a/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml
+++ b/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: pipe-monitor
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.kerberospipeline.monitor.replicas }}
   selector:
diff --git a/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml b/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml
index 1c8db6a..234482a 100644
--- a/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml
+++ b/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: pipe-notify-test
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.kerberospipeline.notifyTest.replicas }}
   selector:
diff --git a/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml b/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml
index c3c916d..8bd8cb1 100644
--- a/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml
+++ b/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: pipe-notify
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.kerberospipeline.notify.replicas }}
   selector:
diff --git a/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml b/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml
index 3bfbbde..4cd457a 100644
--- a/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml
+++ b/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: pipe-sequence
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.kerberospipeline.sequence.replicas }}
   selector:
diff --git a/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml b/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml
index 6ff095b..58ffd19 100644
--- a/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml
+++ b/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: pipe-sprite
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.kerberospipeline.sprite.replicas }}
   selector:
diff --git a/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml b/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml
index 0104fae..6c09663 100644
--- a/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml
+++ b/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: pipe-throttler
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.kerberospipeline.throttler.replicas }}
   selector:
diff --git a/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml b/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml
index 9bce513..5bb44a4 100644
--- a/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml
+++ b/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: pipe-thumbnail
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.kerberospipeline.thumbnail.replicas }}
   selector:
diff --git a/charts/hub/templates/kerberos-pipeline/servicemonitor.yaml b/charts/hub/templates/kerberos-pipeline/servicemonitor.yaml
index 75e07eb..4269677 100644
--- a/charts/hub/templates/kerberos-pipeline/servicemonitor.yaml
+++ b/charts/hub/templates/kerberos-pipeline/servicemonitor.yaml
@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: hub-metrics-servicemonitor
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: { { .Release.Namespace } }
   labels:
     service: pipe
     release: prometheus
diff --git a/charts/hub/templates/kerberos-vault/vault-forwarder.yaml b/charts/hub/templates/kerberos-vault/vault-forwarder.yaml
index 6314b49..4480b15 100644
--- a/charts/hub/templates/kerberos-vault/vault-forwarder.yaml
+++ b/charts/hub/templates/kerberos-vault/vault-forwarder.yaml
@@ -4,7 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: vault-forwarder
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
diff --git a/charts/hub/templates/kerberos-vault/vault-proxy.yaml b/charts/hub/templates/kerberos-vault/vault-proxy.yaml
index 5df553c..8728003 100644
--- a/charts/hub/templates/kerberos-vault/vault-proxy.yaml
+++ b/charts/hub/templates/kerberos-vault/vault-proxy.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: vault-proxy
-  namespace: {{ include "common.names.namespace" . | quote }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 3
   selector: