Add namespace and labels to manifests

templates/cm-config.yaml

@@ -5,6 +5,9 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: {{ include "krakend.fullname" . }}-config
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "krakend.labels" . | nindent 4 }}
 {{- if .Values.krakend.configFileSource }}
 binaryData:
   {{ include "krakend.configFileName" . }}: |-

templates/cm-partials.yaml

@@ -3,6 +3,9 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: {{ include "krakend.fullname" . }}-partials
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "krakend.labels" . | nindent 4 }}
 {{- if .Values.krakend.partialsDirSource }}
 binaryData:
 {{- range $path, $_ := .Files.Glob .Values.krakend.partialsDirSource }}

templates/cm-settings.yaml

@@ -3,6 +3,9 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: {{ include "krakend.fullname" . }}-settings
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "krakend.labels" . | nindent 4 }}
 {{- if .Values.krakend.settingsDirSource }}
 binaryData:
 {{- range $path, $_ := .Files.Glob .Values.krakend.settingsDirSource }}

templates/cm-templates.yaml

@@ -3,6 +3,9 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: {{ include "krakend.fullname" . }}-templates
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "krakend.labels" . | nindent 4 }}
 {{- if .Values.krakend.templatesDirSource }}
 binaryData:
 {{- range $path, $_ := .Files.Glob .Values.krakend.templatesDirSource }}

templates/deployment.yaml

@@ -7,6 +7,7 @@ kind: Rollout
 {{- end }}
 metadata:
   name: {{ include "krakend.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "krakend.labels" . | nindent 4 }}
   {{- with .Values.deploymentAnnotations }}
@@ -87,11 +88,9 @@ spec:
             - name: http
               containerPort: {{ .Values.service.targetPort }}
               protocol: TCP
-          {{- if .Values.serviceMonitor.enabled }}
             - name: metrics
               containerPort: {{ .Values.serviceMonitor.targetPort }}
               protocol: TCP
-          {{- end }}
           {{- with .Values.livenessProbe }}
           livenessProbe: {{ toYaml . | nindent 12 }}
           {{- end }}

templates/hpa.yaml

@@ -3,6 +3,7 @@ apiVersion: {{ ternary "autoscaling/v2" "autoscaling/v2beta2" (.Capabilities.API
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "krakend.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "krakend.labels" . | nindent 4 }}
   {{- with .Values.autoscaling.annotations }}

templates/ingress.yaml

@@ -16,6 +16,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "krakend.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}

templates/service.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "krakend.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "krakend.labels" . | nindent 4 }}
   {{- if .Values.service.annotations }}

templates/serviceaccount.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "krakend.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "krakend.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}