From f845b533334feea1eb57c295a8a2f1afd36ae91d Mon Sep 17 00:00:00 2001 From: Fran Slot Date: Fri, 9 Feb 2024 17:29:52 +0100 Subject: [PATCH] #357: Refactor namespace in yaml --- deployment/kubernetes/base/rap/rap-deployment.yaml | 5 ++++- .../kubernetes/overlays/general/dev/rap/rap-deployment.yaml | 2 -- .../overlays/general/production/rap/rap-deployment.yaml | 2 -- .../overlays/general/staging/rap/rap-deployment.yaml | 2 -- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/deployment/kubernetes/base/rap/rap-deployment.yaml b/deployment/kubernetes/base/rap/rap-deployment.yaml index 1a1212ae..0f1cfccd 100644 --- 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 index 9ea1df76..a815fc3a 100644 --- 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 index 369e8ef3..6c93074d 100644 --- 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 index 2b27f1a0..ef7dc8a5 100644 --- 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