From 5ba7f38000e7dedcc1bec2d647e8614c587887a0 Mon Sep 17 00:00:00 2001
From: Ruslan Khizhnyak <rkhizhnyak@ptsecurity.com>
Date: Wed, 25 Dec 2024 02:54:21 +0300
Subject: [PATCH] Add namespace declaration to manifests

---
 .../templates/configmap-zabbix-server-init-waitschema.yaml       | 1 +
 charts/zabbix/templates/cronjob-hanodes-autoclean.yaml           | 1 +
 charts/zabbix/templates/daemonset-zabbix-agent.yaml              | 1 +
 charts/zabbix/templates/deployment-webdriver.yaml                | 1 +
 charts/zabbix/templates/deployment-zabbix-java-gateway.yaml      | 1 +
 charts/zabbix/templates/deployment-zabbix-server.yaml            | 1 +
 charts/zabbix/templates/deployment-zabbix-web.yaml               | 1 +
 charts/zabbix/templates/deployment-zabbix-webservice.yaml        | 1 +
 charts/zabbix/templates/ingress.yaml                             | 1 +
 charts/zabbix/templates/job-create-upgrade-db.yaml               | 1 +
 charts/zabbix/templates/role-ha-helper.yaml                      | 1 +
 charts/zabbix/templates/rolebinding-ha-helper.yaml               | 1 +
 charts/zabbix/templates/secret-db-access.yaml                    | 1 +
 charts/zabbix/templates/service.yaml                             | 1 +
 charts/zabbix/templates/serviceaccount-ha-helper.yaml            | 1 +
 charts/zabbix/templates/serviceaccount.yaml                      | 1 +
 charts/zabbix/templates/statefulset-postgresql.yaml              | 1 +
 charts/zabbix/templates/statefulset-zabbix-proxy.yaml            | 1 +
 18 files changed, 18 insertions(+)

diff --git a/charts/zabbix/templates/configmap-zabbix-server-init-waitschema.yaml b/charts/zabbix/templates/configmap-zabbix-server-init-waitschema.yaml
index 95e5e35..670215e 100644
--- a/charts/zabbix/templates/configmap-zabbix-server-init-waitschema.yaml
+++ b/charts/zabbix/templates/configmap-zabbix-server-init-waitschema.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "zabbix.fullname" . }}-waitdbschema-script
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zabbix.fullname" . }}-waitdbschema-script
     app.kubernetes.io/name: waitdbschema-script
diff --git a/charts/zabbix/templates/cronjob-hanodes-autoclean.yaml b/charts/zabbix/templates/cronjob-hanodes-autoclean.yaml
index c5a4765..c5f9e38 100644
--- a/charts/zabbix/templates/cronjob-hanodes-autoclean.yaml
+++ b/charts/zabbix/templates/cronjob-hanodes-autoclean.yaml
@@ -7,6 +7,7 @@ apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: {{ template "zabbix.fullname" . }}-nodesclean
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zabbix.fullname" . }}-nodesclean
     app.kubernetes.io/name: nodesclean
diff --git a/charts/zabbix/templates/daemonset-zabbix-agent.yaml b/charts/zabbix/templates/daemonset-zabbix-agent.yaml
index 013140a..ff72a2a 100644
--- a/charts/zabbix/templates/daemonset-zabbix-agent.yaml
+++ b/charts/zabbix/templates/daemonset-zabbix-agent.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ template "zabbix.fullname" . }}-zabbix-agent
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zabbix.fullname" . }}-zabbix-agent
     app.kubernetes.io/name: zabbix-agent
diff --git a/charts/zabbix/templates/deployment-webdriver.yaml b/charts/zabbix/templates/deployment-webdriver.yaml
index 526119a..da9cd8c 100644
--- a/charts/zabbix/templates/deployment-webdriver.yaml
+++ b/charts/zabbix/templates/deployment-webdriver.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "zabbix.fullname" . }}-{{ .Values.zabbixBrowserMonitoring.webdriver.name }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zabbix.name" . }}
     release: {{ .Release.Name }}
diff --git a/charts/zabbix/templates/deployment-zabbix-java-gateway.yaml b/charts/zabbix/templates/deployment-zabbix-java-gateway.yaml
index 0baa2d0..85ff59d 100644
--- a/charts/zabbix/templates/deployment-zabbix-java-gateway.yaml
+++ b/charts/zabbix/templates/deployment-zabbix-java-gateway.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "zabbix.fullname" . }}-{{ .Values.zabbixJavaGateway.ZBX_JAVAGATEWAY }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zabbix.fullname" . }}-{{ .Values.zabbixJavaGateway.ZBX_JAVAGATEWAY }}
     app.kubernetes.io/name: {{ .Values.zabbixJavaGateway.ZBX_JAVAGATEWAY }}
diff --git a/charts/zabbix/templates/deployment-zabbix-server.yaml b/charts/zabbix/templates/deployment-zabbix-server.yaml
index e1145f2..528c225 100644
--- a/charts/zabbix/templates/deployment-zabbix-server.yaml
+++ b/charts/zabbix/templates/deployment-zabbix-server.yaml
@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "zabbix.fullname" . }}-zabbix-server
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zabbix.fullname" . }}-zabbix-server
     app.kubernetes.io/name: zabbix-server
diff --git a/charts/zabbix/templates/deployment-zabbix-web.yaml b/charts/zabbix/templates/deployment-zabbix-web.yaml
index 5dffce6..feee2e1 100644
--- a/charts/zabbix/templates/deployment-zabbix-web.yaml
+++ b/charts/zabbix/templates/deployment-zabbix-web.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "zabbix.fullname" . }}-zabbix-web
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zabbix.fullname" . }}-zabbix-web
     app.kubernetes.io/name: zabbix-web
diff --git a/charts/zabbix/templates/deployment-zabbix-webservice.yaml b/charts/zabbix/templates/deployment-zabbix-webservice.yaml
index 7a81923..3479cf7 100644
--- a/charts/zabbix/templates/deployment-zabbix-webservice.yaml
+++ b/charts/zabbix/templates/deployment-zabbix-webservice.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "zabbix.fullname" . }}-zabbix-webservice
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zabbix.fullname" . }}-zabbix-webservice
     app.kubernetes.io/name: zabbix-webservice
diff --git a/charts/zabbix/templates/ingress.yaml b/charts/zabbix/templates/ingress.yaml
index 9720ed7..8dc2bc0 100644
--- a/charts/zabbix/templates/ingress.yaml
+++ b/charts/zabbix/templates/ingress.yaml
@@ -16,6 +16,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "zabbix.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
diff --git a/charts/zabbix/templates/job-create-upgrade-db.yaml b/charts/zabbix/templates/job-create-upgrade-db.yaml
index c579ee8..4b43e03 100644
--- a/charts/zabbix/templates/job-create-upgrade-db.yaml
+++ b/charts/zabbix/templates/job-create-upgrade-db.yaml
@@ -7,6 +7,7 @@ apiVersion: batch/v1beta1
 kind: Job
 metadata:
   name: {{ template "zabbix.fullname" . }}-create-upgrade-db
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zabbix.fullname" . }}-create-upgrade-db
     app.kubernetes.io/name: create-upgrade-db
diff --git a/charts/zabbix/templates/role-ha-helper.yaml b/charts/zabbix/templates/role-ha-helper.yaml
index a9c0cac..6ce1f32 100644
--- a/charts/zabbix/templates/role-ha-helper.yaml
+++ b/charts/zabbix/templates/role-ha-helper.yaml
@@ -4,6 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ template "zabbix.fullname" . }}-ha-helper
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zabbix.fullname" . }}-ha-helper
     app.kubernetes.io/name: zabbix-server
diff --git a/charts/zabbix/templates/rolebinding-ha-helper.yaml b/charts/zabbix/templates/rolebinding-ha-helper.yaml
index e65ac6d..8ed4198 100644
--- a/charts/zabbix/templates/rolebinding-ha-helper.yaml
+++ b/charts/zabbix/templates/rolebinding-ha-helper.yaml
@@ -4,6 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ template "zabbix.fullname" . }}-ha-helper
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zabbix.fullname" . }}-ha-helper
     app.kubernetes.io/name: zabbix-server
diff --git a/charts/zabbix/templates/secret-db-access.yaml b/charts/zabbix/templates/secret-db-access.yaml
index 5edc2cc..0be4cda 100644
--- a/charts/zabbix/templates/secret-db-access.yaml
+++ b/charts/zabbix/templates/secret-db-access.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Values.postgresAccess.unifiedSecretName }}
+  namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/resource-policy": keep
   labels:
diff --git a/charts/zabbix/templates/service.yaml b/charts/zabbix/templates/service.yaml
index d5b578e..b8d989b 100644
--- a/charts/zabbix/templates/service.yaml
+++ b/charts/zabbix/templates/service.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "zabbix.fullname" . }}-zabbix-server
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zabbix.fullname" . }}-zabbix-server
     app.kubernetes.io/name: zabbix-server
diff --git a/charts/zabbix/templates/serviceaccount-ha-helper.yaml b/charts/zabbix/templates/serviceaccount-ha-helper.yaml
index 68e7705..dfaa6ca 100644
--- a/charts/zabbix/templates/serviceaccount-ha-helper.yaml
+++ b/charts/zabbix/templates/serviceaccount-ha-helper.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "zabbix.fullname" . }}-ha-helper
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zabbix.fullname" . }}-ha-helper
     app.kubernetes.io/name: zabbix-server
diff --git a/charts/zabbix/templates/serviceaccount.yaml b/charts/zabbix/templates/serviceaccount.yaml
index 66e54c2..4ada548 100644
--- a/charts/zabbix/templates/serviceaccount.yaml
+++ b/charts/zabbix/templates/serviceaccount.yaml
@@ -8,6 +8,7 @@ imagePullSecrets:
 automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
 metadata:
   name: {{ template "zabbix.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/charts/zabbix/templates/statefulset-postgresql.yaml b/charts/zabbix/templates/statefulset-postgresql.yaml
index 22b16b0..a4718f2 100644
--- a/charts/zabbix/templates/statefulset-postgresql.yaml
+++ b/charts/zabbix/templates/statefulset-postgresql.yaml
@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "zabbix.fullname" . }}-postgresql
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zabbix.fullname" . }}-postgresql
     app.kubernetes.io/name: postgresql
diff --git a/charts/zabbix/templates/statefulset-zabbix-proxy.yaml b/charts/zabbix/templates/statefulset-zabbix-proxy.yaml
index 1e14fe1..7974d48 100644
--- a/charts/zabbix/templates/statefulset-zabbix-proxy.yaml
+++ b/charts/zabbix/templates/statefulset-zabbix-proxy.yaml
@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "zabbix.fullname" . }}-zabbix-proxy
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zabbix.fullname" . }}-zabbix-proxy
     app.kubernetes.io/name: zabbix-proxy