fix: namespace inconsistency (#9)

Chart.yaml

@@ -7,7 +7,7 @@ description: A Helm chart template for byzanteam application
 # chart 类型
 type: application
 # chart 版本
-version: 1.3.0
+version: 1.3.1
 # 项目源码的URL列表
 sources:
   - https://github.com/Byzanteam/application-chart-template/

README.md

@@ -34,7 +34,6 @@ A Helm chart template for byzanteam application
 | imageCredentials | object | `{}` |  |
 | initContainers | list | `[]` |  |
 | nameOverride | string | `""` |  |
-| namespace | string | `"default"` |  |
 | replicaCount | int | `1` |  |
 | restartPolicy | string | `"Always"` |  |
 | service.name | string | `"http"` |  |

templates/_helpers.tpl

@@ -36,7 +36,7 @@ Selector labels
 {{- define "application-chart-template.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "application-chart-template.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
-app.kubernetes.io/namespace: {{ .Values.namespace }}
+app.kubernetes.io/namespace: {{ .Release.Namespace }}
 {{- end }}
 
 {{/*

templates/configMap.yaml

@@ -4,6 +4,6 @@ metadata:
   labels:
     {{- include "application-chart-template.labels" . | nindent 4 }}
   name: {{ include "application-chart-template.fullname" . }}-env
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 data:
   {{- .Values.env | toYaml | nindent 2 }}

templates/deployment.yaml

@@ -4,7 +4,7 @@ metadata:
   name: {{ include "application-chart-template.fullname" . }}
   labels:
     {{- include "application-chart-template.labels" . | nindent 4 }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:

templates/service.yaml

@@ -4,7 +4,7 @@ metadata:
   name: {{ include "application-chart-template.fullname" . }}
   labels:
     {{- include "application-chart-template.labels" . | nindent 4 }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   type: {{ .Values.service.type }}
   ports:

tests/deployment_test.yaml

@@ -7,28 +7,27 @@ tests:
       - isKind:
           of: Deployment
 
-  - it: should set name and namespace label to nameOverride and namespace if no override is set
+  - it: should set name label to nameOverride if no override is set
     asserts:
       - isSubset:
           path: spec.selector
           content:
             matchLabels:
               app.kubernetes.io/name: application-chart-template
               app.kubernetes.io/instance: RELEASE-NAME
-              app.kubernetes.io/namespace: default
+              app.kubernetes.io/namespace: NAMESPACE
 
-  - it: should set name and namespace label to nameOverride and namespace if set
+  - it: should set name label to nameOverride if set
     set:
       nameOverride: unittest
-      namespace: unittest
     asserts:
       - isSubset:
           path: spec.selector
           content:
             matchLabels:
               app.kubernetes.io/name: unittest
               app.kubernetes.io/instance: RELEASE-NAME
-              app.kubernetes.io/namespace: unittest
+              app.kubernetes.io/namespace: NAMESPACE
 
   - it: should change image when image value is specified
     values:

values.yaml

@@ -8,9 +8,6 @@
 nameOverride: ""
 fullnameOverride: ""
 
-# 设置 chart 的 namespace
-namespace: default
-
 # 设置此 Pod 的副本数
 replicaCount: 1