From b3588c9ba77f0622164244dde814a3989cf6822f Mon Sep 17 00:00:00 2001
From: Leah Tacke genannt Unterberg <leah.tgu@pads.rwth-aachen.de>
Date: Wed, 16 Apr 2025 14:08:10 +0200
Subject: [PATCH] de-hardcoded the namespace in the chart

---
 justfile                                             | 3 +++
 maed-exporter-app/Chart.yaml                         | 4 ++--
 maed-exporter-app/templates/app-config-map.yaml      | 1 +
 maed-exporter-app/templates/backend-deployment.yaml  | 4 +---
 maed-exporter-app/templates/backend-svc.yaml         | 4 +---
 maed-exporter-app/templates/frontend-deployment.yaml | 4 +---
 maed-exporter-app/templates/frontend-svc.yaml        | 4 +---
 maed-exporter-app/templates/nginx-config-map.yaml    | 1 +
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/justfile b/justfile
index 27d1589..ef02818 100644
--- a/justfile
+++ b/justfile
@@ -41,6 +41,9 @@ helm-push a: helm-package
     # helm registry login registry-1.docker.io -u leahtgu
     cd helm/ && helm push {{ a }} oci://registry-1.docker.io/leahtgu
 
+helm *args:
+    helm --kube-context c4c -n mdata {{args}}
+
 helm-install:
     helm --kube-context c4c -n mdata install maed-exporter-app maed-exporter-app
 
diff --git a/maed-exporter-app/Chart.yaml b/maed-exporter-app/Chart.yaml
index 38d7b97..412fbe7 100644
--- a/maed-exporter-app/Chart.yaml
+++ b/maed-exporter-app/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.1.0"
+appVersion: "0.1.0"
\ No newline at end of file
diff --git a/maed-exporter-app/templates/app-config-map.yaml b/maed-exporter-app/templates/app-config-map.yaml
index 4519608..a74c062 100644
--- a/maed-exporter-app/templates/app-config-map.yaml
+++ b/maed-exporter-app/templates/app-config-map.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: maed-exporter-env
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: maed-exporter-app
     {{- include "maed-exporter-app.labels" . | nindent 4 }}
diff --git a/maed-exporter-app/templates/backend-deployment.yaml b/maed-exporter-app/templates/backend-deployment.yaml
index dc23558..fdc37bc 100644
--- a/maed-exporter-app/templates/backend-deployment.yaml
+++ b/maed-exporter-app/templates/backend-deployment.yaml
@@ -2,9 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: maed-exporter-backend
-  {{- if .Values.namespace }}
-  namespace: {{.Values.namespace | quote }}
-  {{- end }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: maed-exporter-app
     app.kubernetes.io/component: backend
diff --git a/maed-exporter-app/templates/backend-svc.yaml b/maed-exporter-app/templates/backend-svc.yaml
index 98e8433..923a9cd 100644
--- a/maed-exporter-app/templates/backend-svc.yaml
+++ b/maed-exporter-app/templates/backend-svc.yaml
@@ -2,9 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: maed-exporter-backend-svc
-  {{- if .Values.namespace }}
-  namespace: {{.Values.namespace | quote }}
-  {{- end }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: maed-exporter-app
     {{- include "maed-exporter-app.labels" . | nindent 4 }}
diff --git a/maed-exporter-app/templates/frontend-deployment.yaml b/maed-exporter-app/templates/frontend-deployment.yaml
index eb62aea..83a298d 100644
--- a/maed-exporter-app/templates/frontend-deployment.yaml
+++ b/maed-exporter-app/templates/frontend-deployment.yaml
@@ -2,9 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: maed-exporter-frontend
-  {{- if .Values.namespace }}
-  namespace: {{.Values.namespace | quote }}
-  {{- end }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: maed-exporter-app
     app.kubernetes.io/component: frontend
diff --git a/maed-exporter-app/templates/frontend-svc.yaml b/maed-exporter-app/templates/frontend-svc.yaml
index 6c67200..656bdd4 100644
--- a/maed-exporter-app/templates/frontend-svc.yaml
+++ b/maed-exporter-app/templates/frontend-svc.yaml
@@ -2,9 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: maed-exporter-frontend-svc
-  {{- if .Values.namespace }}
-  namespace: {{.Values.namespace | quote }}
-  {{- end }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: maed-exporter-app
     {{- include "maed-exporter-app.labels" . | nindent 4 }}
diff --git a/maed-exporter-app/templates/nginx-config-map.yaml b/maed-exporter-app/templates/nginx-config-map.yaml
index 686a25d..c38fddc 100644
--- a/maed-exporter-app/templates/nginx-config-map.yaml
+++ b/maed-exporter-app/templates/nginx-config-map.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: nginx-cfg
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: maed-exporter-app
     {{- include "maed-exporter-app.labels" . | nindent 4 }}
-- 
GitLab