#357: Refactor namespace in yaml

AmpersandTarski · Feb 9, 2024 · f845b53 · f845b53
1 parent 580adf0
commit f845b53
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/deployment/kubernetes/base/rap/rap-deployment.yaml b/deployment/kubernetes/base/rap/rap-deployment.yaml
@@ -30,9 +30,12 @@ spec:
               value: https://localhost
             - name: RAP_DEPLOYMENT
               value: Kubernetes
-
             - name: RAP_STUDENT_PROTO_LOG_CONFIG
               value: logging.yaml
+            - name: RAP_KUBERNETES_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
           envFrom:
             - configMapRef:
                 name: administration-configmap

diff --git a/deployment/kubernetes/overlays/general/dev/rap/rap-deployment.yaml b/deployment/kubernetes/overlays/general/dev/rap/rap-deployment.yaml
@@ -12,7 +12,5 @@ spec:
               value: rap-db-dev
             - name: RAP_HOST_NAME
               value: dev.rap.tarski.nl
-            - name: RAP_KUBERNETES_NAMESPACE
-              value: rap-dev
             - name: RAP_STUDENT_PROTO_IMAGE
               value: ampersandtarski/rap4-student-prototype:dev-latest
diff --git a/deployment/kubernetes/overlays/general/production/rap/rap-deployment.yaml b/deployment/kubernetes/overlays/general/production/rap/rap-deployment.yaml
@@ -10,7 +10,5 @@ spec:
           env:
             - name: AMPERSAND_DBHOST
               value: rap-db-production
-            - name: RAP_KUBERNETES_NAMESPACE
-              value: rap-production
             - name: RAP_STUDENT_PROTO_IMAGE
               value: ampersandtarski/rap4-student-prototype:production-latest
diff --git a/deployment/kubernetes/overlays/general/staging/rap/rap-deployment.yaml b/deployment/kubernetes/overlays/general/staging/rap/rap-deployment.yaml
@@ -12,7 +12,5 @@ spec:
               value: rap-db-staging
             - name: RAP_HOST_NAME
               value: staging.rap.tarski.nl
-            - name: RAP_KUBERNETES_NAMESPACE
-              value: rap-staging
             - name: RAP_STUDENT_PROTO_IMAGE
               value: ampersandtarski/rap4-student-prototype:staging-latest