From 1cc88f212a001ebfc738c118fe7d8d5e9b795625 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Mon, 24 Feb 2025 13:56:46 +0100
Subject: [PATCH] add namespace to all Helm managed k8s resources
---
deployment/helm/ditto/Chart.yaml | 2 +-
deployment/helm/ditto/templates/connectivity-configmap.yaml | 1 +
deployment/helm/ditto/templates/connectivity-deployment.yaml | 1 +
deployment/helm/ditto/templates/connectivity-pdb.yaml | 1 +
deployment/helm/ditto/templates/connectivity-podmonitor.yaml | 1 +
deployment/helm/ditto/templates/dittoui-config.yaml | 1 +
deployment/helm/ditto/templates/dittoui-deployment.yaml | 1 +
deployment/helm/ditto/templates/dittoui-pdb.yaml | 1 +
deployment/helm/ditto/templates/dittoui-service.yaml | 1 +
deployment/helm/ditto/templates/gateway-configmap.yaml | 1 +
deployment/helm/ditto/templates/gateway-deployment.yaml | 1 +
deployment/helm/ditto/templates/gateway-pdb.yaml | 1 +
deployment/helm/ditto/templates/gateway-podmonitor.yaml | 1 +
deployment/helm/ditto/templates/gateway-secret.yaml | 1 +
deployment/helm/ditto/templates/gateway-service.yaml | 1 +
.../helm/ditto/templates/hooks/pod-deletion-cost-cron-job.yaml | 1 +
deployment/helm/ditto/templates/hooks/pre-upgrade-job.yaml | 1 +
deployment/helm/ditto/templates/hooks/scripts-configmap.yaml | 1 +
deployment/helm/ditto/templates/logback-config.yaml | 1 +
deployment/helm/ditto/templates/mongodb-secret.yaml | 1 +
deployment/helm/ditto/templates/nginx-auth.yaml | 1 +
deployment/helm/ditto/templates/nginx-config.yaml | 1 +
deployment/helm/ditto/templates/nginx-configmap.yaml | 3 ++-
deployment/helm/ditto/templates/nginx-deployment.yaml | 1 +
deployment/helm/ditto/templates/nginx-ingress-api.yaml | 1 +
deployment/helm/ditto/templates/nginx-ingress-auth.yaml | 1 +
deployment/helm/ditto/templates/nginx-ingress-devops.yaml | 1 +
deployment/helm/ditto/templates/nginx-ingress-root.yaml | 1 +
deployment/helm/ditto/templates/nginx-ingress-ui.yaml | 1 +
deployment/helm/ditto/templates/nginx-ingress-ws.yaml | 1 +
deployment/helm/ditto/templates/nginx-route.yaml | 1 +
deployment/helm/ditto/templates/nginx-service.yaml | 1 +
deployment/helm/ditto/templates/policies-configmap.yaml | 1 +
deployment/helm/ditto/templates/policies-deployment.yaml | 1 +
deployment/helm/ditto/templates/policies-pdb.yaml | 1 +
deployment/helm/ditto/templates/policies-podmonitor.yaml | 1 +
deployment/helm/ditto/templates/role.yaml | 1 +
deployment/helm/ditto/templates/rolebinding.yaml | 1 +
deployment/helm/ditto/templates/serviceaccount.yaml | 1 +
deployment/helm/ditto/templates/swaggerui-config.yaml | 1 +
deployment/helm/ditto/templates/swaggerui-deployment.yaml | 1 +
deployment/helm/ditto/templates/swaggerui-pdb.yaml | 1 +
deployment/helm/ditto/templates/swaggerui-service.yaml | 1 +
deployment/helm/ditto/templates/things-configmap.yaml | 1 +
deployment/helm/ditto/templates/things-deployment.yaml | 1 +
deployment/helm/ditto/templates/things-pdb.yaml | 1 +
deployment/helm/ditto/templates/things-podmonitor.yaml | 1 +
deployment/helm/ditto/templates/thingssearch-configmap.yaml | 1 +
deployment/helm/ditto/templates/thingssearch-deployment.yaml | 1 +
deployment/helm/ditto/templates/thingssearch-pdb.yaml | 1 +
deployment/helm/ditto/templates/thingssearch-podmonitor.yaml | 1 +
51 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index eef11785ba..bda2d5e35c 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -16,7 +16,7 @@ description: |
A digital twin is a virtual, cloud based, representation of his real world counterpart
(real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
type: application
-version: 3.6.12 # chart version is effectively set by release-job
+version: 3.7.0 # chart version is effectively set by release-job
appVersion: 3.6.11
keywords:
- iot-chart
diff --git a/deployment/helm/ditto/templates/connectivity-configmap.yaml b/deployment/helm/ditto/templates/connectivity-configmap.yaml
index 32bd80972c..8e1bc39219 100644
--- a/deployment/helm/ditto/templates/connectivity-configmap.yaml
+++ b/deployment/helm/ditto/templates/connectivity-configmap.yaml
@@ -17,6 +17,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ $releaseName }}-service-config-connectivity-extension-conf
+ namespace: {{ $root.Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-service-config-connectivity-extension-conf
{{ $labels | indent 4 }}
diff --git a/deployment/helm/ditto/templates/connectivity-deployment.yaml b/deployment/helm/ditto/templates/connectivity-deployment.yaml
index 986e2f2bd4..a871c7c485 100644
--- a/deployment/helm/ditto/templates/connectivity-deployment.yaml
+++ b/deployment/helm/ditto/templates/connectivity-deployment.yaml
@@ -15,6 +15,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "ditto.fullname" . }}-connectivity
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-connectivity
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/connectivity-pdb.yaml b/deployment/helm/ditto/templates/connectivity-pdb.yaml
index c33ebbdee5..a2a87752ff 100644
--- a/deployment/helm/ditto/templates/connectivity-pdb.yaml
+++ b/deployment/helm/ditto/templates/connectivity-pdb.yaml
@@ -14,6 +14,7 @@ apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: {{ include "ditto.fullname" . }}-connectivity
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-connectivity
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/connectivity-podmonitor.yaml b/deployment/helm/ditto/templates/connectivity-podmonitor.yaml
index d133f13821..7c68e13936 100644
--- a/deployment/helm/ditto/templates/connectivity-podmonitor.yaml
+++ b/deployment/helm/ditto/templates/connectivity-podmonitor.yaml
@@ -15,6 +15,7 @@ kind: PodMonitor
apiVersion: monitoring.coreos.com/v1
metadata:
name: {{ include "ditto.fullname" . }}-connectivity
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-connectivity
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/dittoui-config.yaml b/deployment/helm/ditto/templates/dittoui-config.yaml
index bfba14c9b7..b490761a7a 100644
--- a/deployment/helm/ditto/templates/dittoui-config.yaml
+++ b/deployment/helm/ditto/templates/dittoui-config.yaml
@@ -19,6 +19,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ $releaseName }}-{{ $path | replace "/" "-" | replace "." "-" }}
+ namespace: {{ $root.Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-dittoui-config
{{ $labels | indent 4 }}
diff --git a/deployment/helm/ditto/templates/dittoui-deployment.yaml b/deployment/helm/ditto/templates/dittoui-deployment.yaml
index cfed6f4a44..b06cd2df86 100644
--- a/deployment/helm/ditto/templates/dittoui-deployment.yaml
+++ b/deployment/helm/ditto/templates/dittoui-deployment.yaml
@@ -15,6 +15,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "ditto.fullname" . }}-dittoui
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-dittoui
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/dittoui-pdb.yaml b/deployment/helm/ditto/templates/dittoui-pdb.yaml
index e3a5a6e52b..eb41d0b2c3 100644
--- a/deployment/helm/ditto/templates/dittoui-pdb.yaml
+++ b/deployment/helm/ditto/templates/dittoui-pdb.yaml
@@ -14,6 +14,7 @@ apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: {{ include "ditto.fullname" . }}-dittoui
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-dittoui
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/dittoui-service.yaml b/deployment/helm/ditto/templates/dittoui-service.yaml
index f640c4a8c1..59000f7136 100644
--- a/deployment/helm/ditto/templates/dittoui-service.yaml
+++ b/deployment/helm/ditto/templates/dittoui-service.yaml
@@ -14,6 +14,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ include "ditto.fullname" . }}-dittoui
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-dittoui
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/gateway-configmap.yaml b/deployment/helm/ditto/templates/gateway-configmap.yaml
index 55c8d9e2b7..978cdeec30 100644
--- a/deployment/helm/ditto/templates/gateway-configmap.yaml
+++ b/deployment/helm/ditto/templates/gateway-configmap.yaml
@@ -17,6 +17,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ $releaseName }}-service-config-gateway-extension-conf
+ namespace: {{ $root.Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-service-config-gateway-extension-conf
{{ $labels | indent 4 }}
diff --git a/deployment/helm/ditto/templates/gateway-deployment.yaml b/deployment/helm/ditto/templates/gateway-deployment.yaml
index ae90113e2f..251d8e7f7c 100644
--- a/deployment/helm/ditto/templates/gateway-deployment.yaml
+++ b/deployment/helm/ditto/templates/gateway-deployment.yaml
@@ -15,6 +15,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "ditto.fullname" . }}-gateway
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-gateway
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/gateway-pdb.yaml b/deployment/helm/ditto/templates/gateway-pdb.yaml
index 1be894d9e5..8de47b9cdb 100644
--- a/deployment/helm/ditto/templates/gateway-pdb.yaml
+++ b/deployment/helm/ditto/templates/gateway-pdb.yaml
@@ -14,6 +14,7 @@ apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: {{ include "ditto.fullname" . }}-gateway
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/gateway-podmonitor.yaml b/deployment/helm/ditto/templates/gateway-podmonitor.yaml
index b57a9b65de..a4b500da6d 100644
--- a/deployment/helm/ditto/templates/gateway-podmonitor.yaml
+++ b/deployment/helm/ditto/templates/gateway-podmonitor.yaml
@@ -15,6 +15,7 @@ kind: PodMonitor
apiVersion: monitoring.coreos.com/v1
metadata:
name: {{ include "ditto.fullname" . }}-gateway
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/gateway-secret.yaml b/deployment/helm/ditto/templates/gateway-secret.yaml
index 45e9a42c6a..5def023082 100644
--- a/deployment/helm/ditto/templates/gateway-secret.yaml
+++ b/deployment/helm/ditto/templates/gateway-secret.yaml
@@ -14,6 +14,7 @@ apiVersion: v1
kind: Secret
metadata:
name: {{ include "ditto.fullname" . }}-gateway-secret
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway-secret
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/gateway-service.yaml b/deployment/helm/ditto/templates/gateway-service.yaml
index c4549ee7c0..cd2cdaf6c3 100644
--- a/deployment/helm/ditto/templates/gateway-service.yaml
+++ b/deployment/helm/ditto/templates/gateway-service.yaml
@@ -14,6 +14,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ include "ditto.fullname" . }}-gateway
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/hooks/pod-deletion-cost-cron-job.yaml b/deployment/helm/ditto/templates/hooks/pod-deletion-cost-cron-job.yaml
index 3cd248dc0e..151ab7e102 100644
--- a/deployment/helm/ditto/templates/hooks/pod-deletion-cost-cron-job.yaml
+++ b/deployment/helm/ditto/templates/hooks/pod-deletion-cost-cron-job.yaml
@@ -14,6 +14,7 @@ apiVersion: batch/v1
kind: CronJob
metadata:
name: {{ include "ditto.fullname" . }}-pod-deletion-cron-job
+ namespace: {{ .Release.Namespace }}
labels:
{{ include "ditto.labels" . | indent 4 }}
spec:
diff --git a/deployment/helm/ditto/templates/hooks/pre-upgrade-job.yaml b/deployment/helm/ditto/templates/hooks/pre-upgrade-job.yaml
index f4c2bed282..85c0651140 100644
--- a/deployment/helm/ditto/templates/hooks/pre-upgrade-job.yaml
+++ b/deployment/helm/ditto/templates/hooks/pre-upgrade-job.yaml
@@ -14,6 +14,7 @@ apiVersion: batch/v1
kind: Job
metadata:
name: {{ include "ditto.fullname" . }}-pre-update
+ namespace: {{ .Release.Namespace }}
labels:
{{ include "ditto.labels" . | indent 4 }}
annotations:
diff --git a/deployment/helm/ditto/templates/hooks/scripts-configmap.yaml b/deployment/helm/ditto/templates/hooks/scripts-configmap.yaml
index bced4ba026..96a7a30f58 100644
--- a/deployment/helm/ditto/templates/hooks/scripts-configmap.yaml
+++ b/deployment/helm/ditto/templates/hooks/scripts-configmap.yaml
@@ -18,6 +18,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "ditto.fullname" . }}-hook-scripts
+ namespace: {{ $root.Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-hook-scripts
annotations:
diff --git a/deployment/helm/ditto/templates/logback-config.yaml b/deployment/helm/ditto/templates/logback-config.yaml
index 029cf98467..da8dacd40b 100644
--- a/deployment/helm/ditto/templates/logback-config.yaml
+++ b/deployment/helm/ditto/templates/logback-config.yaml
@@ -20,6 +20,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ $releaseName }}-{{ $path | replace "/" "-" | replace "." "-" }}
+ namespace: {{ $root.Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-logback-config
{{ $labels | indent 4 }}
diff --git a/deployment/helm/ditto/templates/mongodb-secret.yaml b/deployment/helm/ditto/templates/mongodb-secret.yaml
index 06584e605e..94f7577bdd 100644
--- a/deployment/helm/ditto/templates/mongodb-secret.yaml
+++ b/deployment/helm/ditto/templates/mongodb-secret.yaml
@@ -15,6 +15,7 @@ apiVersion: v1
kind: Secret
metadata:
name: {{ include "ditto.fullname" . }}-mongodb-secret
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-mongodb-secret
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/nginx-auth.yaml b/deployment/helm/ditto/templates/nginx-auth.yaml
index b4165500d1..46c172ad5c 100644
--- a/deployment/helm/ditto/templates/nginx-auth.yaml
+++ b/deployment/helm/ditto/templates/nginx-auth.yaml
@@ -17,6 +17,7 @@ apiVersion: v1
kind: Secret
metadata:
name: {{ $releaseName }}-nginx-config-nginx-htpasswd
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-nginx-config
{{ $labels | indent 4 }}
diff --git a/deployment/helm/ditto/templates/nginx-config.yaml b/deployment/helm/ditto/templates/nginx-config.yaml
index fea8f843d8..d2ffa594b7 100644
--- a/deployment/helm/ditto/templates/nginx-config.yaml
+++ b/deployment/helm/ditto/templates/nginx-config.yaml
@@ -19,6 +19,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ $releaseName }}-{{ $path | replace "/" "-" | replace "." "-" }}
+ namespace: {{ $root.Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-nginx-config
{{ $labels | indent 4 }}
diff --git a/deployment/helm/ditto/templates/nginx-configmap.yaml b/deployment/helm/ditto/templates/nginx-configmap.yaml
index e9cc9ed209..7f83a57c3d 100644
--- a/deployment/helm/ditto/templates/nginx-configmap.yaml
+++ b/deployment/helm/ditto/templates/nginx-configmap.yaml
@@ -14,6 +14,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Release.Name }}-nginx-conf
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx-conf
{{ include "ditto.labels" . | indent 4 }}
@@ -30,7 +31,7 @@ data:
default_type application/json;
include mime.types;
server_tokens off;
-
+
proxy_connect_timeout {{ .Values.nginx.config.timeout }}; # seconds, default: 60
proxy_send_timeout {{ .Values.nginx.config.timeout }}; # seconds, default: 60
proxy_read_timeout {{ .Values.nginx.config.timeout }}; # seconds, default: 60
diff --git a/deployment/helm/ditto/templates/nginx-deployment.yaml b/deployment/helm/ditto/templates/nginx-deployment.yaml
index 52cc59ba86..64d3a74c51 100644
--- a/deployment/helm/ditto/templates/nginx-deployment.yaml
+++ b/deployment/helm/ditto/templates/nginx-deployment.yaml
@@ -15,6 +15,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "ditto.fullname" . }}-nginx
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-nginx
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/nginx-ingress-api.yaml b/deployment/helm/ditto/templates/nginx-ingress-api.yaml
index 4dde89e5be..96394c2fd7 100644
--- a/deployment/helm/ditto/templates/nginx-ingress-api.yaml
+++ b/deployment/helm/ditto/templates/nginx-ingress-api.yaml
@@ -15,6 +15,7 @@ apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ $fullName }}-api
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/nginx-ingress-auth.yaml b/deployment/helm/ditto/templates/nginx-ingress-auth.yaml
index 209c394f82..6d2adeb77f 100644
--- a/deployment/helm/ditto/templates/nginx-ingress-auth.yaml
+++ b/deployment/helm/ditto/templates/nginx-ingress-auth.yaml
@@ -17,6 +17,7 @@ apiVersion: v1
kind: Secret
metadata:
name: {{ $releaseName }}-nginx-ingress-htpasswd
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-nginx-ingress-config
{{ $labels | indent 4 }}
diff --git a/deployment/helm/ditto/templates/nginx-ingress-devops.yaml b/deployment/helm/ditto/templates/nginx-ingress-devops.yaml
index 36a76d03a6..d01c7ea901 100644
--- a/deployment/helm/ditto/templates/nginx-ingress-devops.yaml
+++ b/deployment/helm/ditto/templates/nginx-ingress-devops.yaml
@@ -15,6 +15,7 @@ apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ $fullName }}-devops
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/nginx-ingress-root.yaml b/deployment/helm/ditto/templates/nginx-ingress-root.yaml
index 655af5a616..ef292c2409 100644
--- a/deployment/helm/ditto/templates/nginx-ingress-root.yaml
+++ b/deployment/helm/ditto/templates/nginx-ingress-root.yaml
@@ -15,6 +15,7 @@ apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ $fullName }}-root
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/nginx-ingress-ui.yaml b/deployment/helm/ditto/templates/nginx-ingress-ui.yaml
index b16d6b324a..e1d7b99960 100644
--- a/deployment/helm/ditto/templates/nginx-ingress-ui.yaml
+++ b/deployment/helm/ditto/templates/nginx-ingress-ui.yaml
@@ -15,6 +15,7 @@ apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ $fullName }}-ui
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/nginx-ingress-ws.yaml b/deployment/helm/ditto/templates/nginx-ingress-ws.yaml
index c9a6e7c499..02d1656d75 100644
--- a/deployment/helm/ditto/templates/nginx-ingress-ws.yaml
+++ b/deployment/helm/ditto/templates/nginx-ingress-ws.yaml
@@ -15,6 +15,7 @@ apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ $fullName }}-ws
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/nginx-route.yaml b/deployment/helm/ditto/templates/nginx-route.yaml
index dff36831c6..2d31653fa2 100644
--- a/deployment/helm/ditto/templates/nginx-route.yaml
+++ b/deployment/helm/ditto/templates/nginx-route.yaml
@@ -14,6 +14,7 @@ kind: Route
apiVersion: route.openshift.io/v1
metadata:
name: {{ include "ditto.fullname" . }}
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/nginx-service.yaml b/deployment/helm/ditto/templates/nginx-service.yaml
index 7e71105631..56c4cbef40 100644
--- a/deployment/helm/ditto/templates/nginx-service.yaml
+++ b/deployment/helm/ditto/templates/nginx-service.yaml
@@ -14,6 +14,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ include "ditto.fullname" . }}-nginx
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/policies-configmap.yaml b/deployment/helm/ditto/templates/policies-configmap.yaml
index f1a2fb0e52..e32163d9c3 100644
--- a/deployment/helm/ditto/templates/policies-configmap.yaml
+++ b/deployment/helm/ditto/templates/policies-configmap.yaml
@@ -17,6 +17,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ $releaseName }}-service-config-policies-extension-conf
+ namespace: {{ $root.Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-service-config-policies-extension-conf
{{ $labels | indent 4 }}
diff --git a/deployment/helm/ditto/templates/policies-deployment.yaml b/deployment/helm/ditto/templates/policies-deployment.yaml
index b1caf4ff56..2de970b5f0 100644
--- a/deployment/helm/ditto/templates/policies-deployment.yaml
+++ b/deployment/helm/ditto/templates/policies-deployment.yaml
@@ -15,6 +15,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "ditto.fullname" . }}-policies
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-policies
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/policies-pdb.yaml b/deployment/helm/ditto/templates/policies-pdb.yaml
index e15dd6bd5a..d8cf7c566a 100644
--- a/deployment/helm/ditto/templates/policies-pdb.yaml
+++ b/deployment/helm/ditto/templates/policies-pdb.yaml
@@ -14,6 +14,7 @@ apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: {{ include "ditto.fullname" . }}-policies
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-policies
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/policies-podmonitor.yaml b/deployment/helm/ditto/templates/policies-podmonitor.yaml
index 0069a61731..9e8adda18d 100644
--- a/deployment/helm/ditto/templates/policies-podmonitor.yaml
+++ b/deployment/helm/ditto/templates/policies-podmonitor.yaml
@@ -15,6 +15,7 @@ kind: PodMonitor
apiVersion: monitoring.coreos.com/v1
metadata:
name: {{ include "ditto.fullname" . }}-policies
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-policies
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/role.yaml b/deployment/helm/ditto/templates/role.yaml
index 9c8c5f40cd..a293bc1660 100644
--- a/deployment/helm/ditto/templates/role.yaml
+++ b/deployment/helm/ditto/templates/role.yaml
@@ -14,6 +14,7 @@ kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ include "ditto.fullname" . }}
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/rolebinding.yaml b/deployment/helm/ditto/templates/rolebinding.yaml
index 3fdece1eb9..c77ad24e56 100644
--- a/deployment/helm/ditto/templates/rolebinding.yaml
+++ b/deployment/helm/ditto/templates/rolebinding.yaml
@@ -14,6 +14,7 @@ kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ include "ditto.fullname" . }}
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/serviceaccount.yaml b/deployment/helm/ditto/templates/serviceaccount.yaml
index 8d7c6736ba..f49f6dad3b 100644
--- a/deployment/helm/ditto/templates/serviceaccount.yaml
+++ b/deployment/helm/ditto/templates/serviceaccount.yaml
@@ -14,6 +14,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ template "ditto.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}
annotations:
diff --git a/deployment/helm/ditto/templates/swaggerui-config.yaml b/deployment/helm/ditto/templates/swaggerui-config.yaml
index 3f035ae4a7..4055214e38 100644
--- a/deployment/helm/ditto/templates/swaggerui-config.yaml
+++ b/deployment/helm/ditto/templates/swaggerui-config.yaml
@@ -19,6 +19,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ $releaseName }}-{{ $path | replace "/" "-" | replace "." "-" }}
+ namespace: {{ $root.Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-swaggerui-config
{{ $labels | indent 4 }}
diff --git a/deployment/helm/ditto/templates/swaggerui-deployment.yaml b/deployment/helm/ditto/templates/swaggerui-deployment.yaml
index 083fa50a1e..29677545c8 100644
--- a/deployment/helm/ditto/templates/swaggerui-deployment.yaml
+++ b/deployment/helm/ditto/templates/swaggerui-deployment.yaml
@@ -15,6 +15,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "ditto.fullname" . }}-swaggerui
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-swaggerui
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/swaggerui-pdb.yaml b/deployment/helm/ditto/templates/swaggerui-pdb.yaml
index 43abca8abc..a132ecd6ac 100644
--- a/deployment/helm/ditto/templates/swaggerui-pdb.yaml
+++ b/deployment/helm/ditto/templates/swaggerui-pdb.yaml
@@ -14,6 +14,7 @@ apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: {{ include "ditto.fullname" . }}-swaggerui
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-swaggerui
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/swaggerui-service.yaml b/deployment/helm/ditto/templates/swaggerui-service.yaml
index bb330b5705..ff83174aa6 100644
--- a/deployment/helm/ditto/templates/swaggerui-service.yaml
+++ b/deployment/helm/ditto/templates/swaggerui-service.yaml
@@ -14,6 +14,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ include "ditto.fullname" . }}-swaggerui
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-swaggerui
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/things-configmap.yaml b/deployment/helm/ditto/templates/things-configmap.yaml
index b4cac6d796..d5211b0a66 100644
--- a/deployment/helm/ditto/templates/things-configmap.yaml
+++ b/deployment/helm/ditto/templates/things-configmap.yaml
@@ -17,6 +17,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ $releaseName }}-service-config-things-extension-conf
+ namespace: {{ $root.Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-service-config-things-extension-conf
{{ $labels | indent 4 }}
diff --git a/deployment/helm/ditto/templates/things-deployment.yaml b/deployment/helm/ditto/templates/things-deployment.yaml
index a2732b3b23..6c26c7b40b 100644
--- a/deployment/helm/ditto/templates/things-deployment.yaml
+++ b/deployment/helm/ditto/templates/things-deployment.yaml
@@ -15,6 +15,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "ditto.fullname" . }}-things
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-things
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/things-pdb.yaml b/deployment/helm/ditto/templates/things-pdb.yaml
index 8f73693f60..eae661f0bb 100644
--- a/deployment/helm/ditto/templates/things-pdb.yaml
+++ b/deployment/helm/ditto/templates/things-pdb.yaml
@@ -14,6 +14,7 @@ apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: {{ include "ditto.fullname" . }}-things
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-things
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/things-podmonitor.yaml b/deployment/helm/ditto/templates/things-podmonitor.yaml
index e9816d7280..a707d1b220 100644
--- a/deployment/helm/ditto/templates/things-podmonitor.yaml
+++ b/deployment/helm/ditto/templates/things-podmonitor.yaml
@@ -15,6 +15,7 @@ kind: PodMonitor
apiVersion: monitoring.coreos.com/v1
metadata:
name: {{ include "ditto.fullname" . }}-things
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-things
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/thingssearch-configmap.yaml b/deployment/helm/ditto/templates/thingssearch-configmap.yaml
index 3a381634d6..9c564144b4 100644
--- a/deployment/helm/ditto/templates/thingssearch-configmap.yaml
+++ b/deployment/helm/ditto/templates/thingssearch-configmap.yaml
@@ -17,6 +17,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ $releaseName }}-service-config-search-extension-conf
+ namespace: {{ $root.Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-service-config-search-extension-conf
{{ $labels | indent 4 }}
diff --git a/deployment/helm/ditto/templates/thingssearch-deployment.yaml b/deployment/helm/ditto/templates/thingssearch-deployment.yaml
index bdbe53c117..0e2c46295a 100644
--- a/deployment/helm/ditto/templates/thingssearch-deployment.yaml
+++ b/deployment/helm/ditto/templates/thingssearch-deployment.yaml
@@ -15,6 +15,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "ditto.fullname" . }}-thingssearch
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ $name }}-thingssearch
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/thingssearch-pdb.yaml b/deployment/helm/ditto/templates/thingssearch-pdb.yaml
index db6b05247e..676b8158ea 100644
--- a/deployment/helm/ditto/templates/thingssearch-pdb.yaml
+++ b/deployment/helm/ditto/templates/thingssearch-pdb.yaml
@@ -14,6 +14,7 @@ apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: {{ include "ditto.fullname" . }}-thingssearch
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-thingssearch
{{ include "ditto.labels" . | indent 4 }}
diff --git a/deployment/helm/ditto/templates/thingssearch-podmonitor.yaml b/deployment/helm/ditto/templates/thingssearch-podmonitor.yaml
index 7f83efb6a5..93d4c387c1 100644
--- a/deployment/helm/ditto/templates/thingssearch-podmonitor.yaml
+++ b/deployment/helm/ditto/templates/thingssearch-podmonitor.yaml
@@ -15,6 +15,7 @@ kind: PodMonitor
apiVersion: monitoring.coreos.com/v1
metadata:
name: {{ include "ditto.fullname" . }}-thingssearch
+ namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ include "ditto.name" . }}-thingssearch
{{ include "ditto.labels" . | indent 4 }}