Add Namespaces to Resources (#17)

* Correctly Namespace Resources * Increase chart version --------- Co-authored-by: Narekmat <[email protected]>
kafbat · Sep 12, 2023 · 6996eab · 6996eab
1 parent 3e50fa5
commit 6996eab
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 4 deletions.
diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.7.4
+version: 0.7.5
 appVersion: v0.7.1
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png
diff --git a/charts/kafka-ui/templates/configmap.yaml b/charts/kafka-ui/templates/configmap.yaml
@@ -3,8 +3,9 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "kafka-ui.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "kafka-ui.labels" . | nindent 4 }}
 data:
   {{- toYaml .Values.envs.config | nindent 2 }}
-{{- end -}}
+{{- end -}}
diff --git a/charts/kafka-ui/templates/configmap_fromValues.yaml b/charts/kafka-ui/templates/configmap_fromValues.yaml
@@ -3,9 +3,10 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "kafka-ui.fullname" . }}-fromvalues
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "kafka-ui.labels" . | nindent 4 }}
 data:
   config.yml: |-
     {{- toYaml .Values.yamlApplicationConfig | nindent 4}}
-{{ end }}
+{{ end }}
diff --git a/charts/kafka-ui/templates/deployment.yaml b/charts/kafka-ui/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "kafka-ui.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "kafka-ui.labels" . | nindent 4 }}
   {{- with .Values.annotations }}

diff --git a/charts/kafka-ui/templates/hpa.yaml b/charts/kafka-ui/templates/hpa.yaml
@@ -9,6 +9,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "kafka-ui.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "kafka-ui.labels" . | nindent 4 }}
 spec:

diff --git a/charts/kafka-ui/templates/ingress.yaml b/charts/kafka-ui/templates/ingress.yaml
@@ -13,6 +13,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "kafka-ui.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}

diff --git a/charts/kafka-ui/templates/networkpolicy-egress.yaml b/charts/kafka-ui/templates/networkpolicy-egress.yaml
@@ -3,6 +3,7 @@ apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
   name: {{ printf "%s-egress" (include "kafka-ui.fullname" .) }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "kafka-ui.labels" . | nindent 4 }}
 spec:

diff --git a/charts/kafka-ui/templates/networkpolicy-ingress.yaml b/charts/kafka-ui/templates/networkpolicy-ingress.yaml
@@ -3,6 +3,7 @@ apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
   name: {{ printf "%s-ingress" (include "kafka-ui.fullname" .) }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "kafka-ui.labels" . | nindent 4 }}
 spec:

diff --git a/charts/kafka-ui/templates/secret.yaml b/charts/kafka-ui/templates/secret.yaml
@@ -3,11 +3,12 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "kafka-ui.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "kafka-ui.labels" . | nindent 4 }}
 type: Opaque
 data:
   {{- range $key, $val := .Values.envs.secret }}
   {{ $key }}: {{ $val | b64enc | quote }}
   {{- end -}}
-{{- end}}
+{{- end}}
diff --git a/charts/kafka-ui/templates/service.yaml b/charts/kafka-ui/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "kafka-ui.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "kafka-ui.labels" . | nindent 4 }}
 {{- if .Values.service.annotations }}

diff --git a/charts/kafka-ui/templates/serviceaccount.yaml b/charts/kafka-ui/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "kafka-ui.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "kafka-ui.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}