[stable/inbucket] adding recommended label (helm#10063)

* adding recomended label Signed-off-by: cpanato <[email protected]> * update Signed-off-by: cpanato <[email protected]>
agolo · Dec 20, 2018 · 9ce4655 · 9ce4655
1 parent 83905b9
commit 9ce4655
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 17 deletions.
diff --git a/stable/inbucket/Chart.yaml b/stable/inbucket/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: Inbucket is an email testing application
 name: inbucket
 appVersion: 2.0.0
-version: 3.0.0
+version: 3.1.0
 keywords:
   - inbucket
   - mail

diff --git a/stable/inbucket/templates/NOTES.txt b/stable/inbucket/templates/NOTES.txt
@@ -1,34 +1,34 @@
 Inbucket can be accessed via ports {{ .Values.service.port.http }} (HTTP) and {{ .Values.service.port.smtp }} (SMTP) on the following DNS name from within your cluster:
-{{ template "inbucket.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
+{{ include "inbucket.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
 
 If you'd like to test your instance, forward the ports locally:
 
 Web UI:
 =======
 
-export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "inbucket.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "inbucket.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
 kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME {{ .Values.service.port.http }}
 
 or
 
-kubectl port-forward --namespace {{ .Release.Namespace }} service/{{ template "inbucket.fullname" . }} {{ .Values.service.port.http }}
+kubectl port-forward --namespace {{ .Release.Namespace }} service/{{ include "inbucket.fullname" . }} {{ .Values.service.port.http }}
 
 SMTP Server:
 ============
 
-export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "inbucket.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "inbucket.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
 kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME {{ .Values.service.port.smtp }}
 
 or
 
-kubectl port-forward --namespace {{ .Release.Namespace }} service/{{ template "inbucket.fullname" . }} {{ .Values.service.port.smtp }}
+kubectl port-forward --namespace {{ .Release.Namespace }} service/{{ include "inbucket.fullname" . }} {{ .Values.service.port.smtp }}
 
 POP3 Server:
 ============
 
-export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "inbucket.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "inbucket.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
 kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME {{ .Values.service.port.pop3 }}
 
 or
 
-kubectl port-forward --namespace {{ .Release.Namespace }} service/{{ template "inbucket.fullname" . }} {{ .Values.service.port.pop3 }}
+kubectl port-forward --namespace {{ .Release.Namespace }} service/{{ include "inbucket.fullname" . }} {{ .Values.service.port.pop3 }}
diff --git a/stable/inbucket/templates/configmap.yaml b/stable/inbucket/templates/configmap.yaml
@@ -1,10 +1,11 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "inbucket.name" . }}-configmap
+  name: {{ include "inbucket.name" . }}-configmap
   labels:
     app.kubernetes.io/name: {{ include "inbucket.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ include "inbucket.chart" . }}
 data:
 {{ toYaml .Values.extraEnv | indent 2 }}
diff --git a/stable/inbucket/templates/deployment.yaml b/stable/inbucket/templates/deployment.yaml
@@ -5,7 +5,8 @@ metadata:
     app.kubernetes.io/name: {{ include "inbucket.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-  name: {{ template "inbucket.fullname" . }}
+    helm.sh/chart: {{ include "inbucket.chart" . }}
+  name: {{ include "inbucket.fullname" . }}
 spec:
   selector:
     matchLabels:
@@ -20,14 +21,16 @@ spec:
       labels:
         app.kubernetes.io/name: {{ include "inbucket.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
+        app.kubernetes.io/managed-by: {{ .Release.Service }}
+        helm.sh/chart: {{ include "inbucket.chart" . }}
     spec:
       containers:
-        - name: {{ template "inbucket.name" . }}
+        - name: {{ include "inbucket.name" . }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: "{{ .Values.image.pullPolicy }}"
           envFrom:
           - configMapRef:
-              name: {{ template "inbucket.name" . }}-configmap
+              name: {{ include "inbucket.name" . }}-configmap
           ports:
             - name: http
               containerPort: 9000

diff --git a/stable/inbucket/templates/ingress.yaml b/stable/inbucket/templates/ingress.yaml
@@ -12,6 +12,7 @@ metadata:
     app.kubernetes.io/name: {{ include "inbucket.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ include "inbucket.chart" . }}
   name: {{ $fullName }}
 spec:
 {{- if .Values.ingress.tls }}

diff --git a/stable/inbucket/templates/service.yaml b/stable/inbucket/templates/service.yaml
@@ -9,7 +9,8 @@ metadata:
     app.kubernetes.io/name: {{ include "inbucket.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-  name: {{ template "inbucket.fullname" . }}
+    helm.sh/chart: {{ include "inbucket.chart" . }}
+  name: {{ include "inbucket.fullname" . }}
 spec:
   type: "{{ .Values.service.type }}"
   clusterIP: "{{ .Values.service.clusterIP }}"

diff --git a/stable/inbucket/templates/tests/inbucket-config-test.yaml b/stable/inbucket/templates/tests/inbucket-config-test.yaml
@@ -2,13 +2,14 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "inbucket.name" . }}-tests
+  name: {{ include "inbucket.name" . }}-tests
   labels:
     app.kubernetes.io/name: {{ include "inbucket.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ include "inbucket.chart" . }}
 data:
   run.sh: |-
     @test "Testing Inbucket is accessible" {
-      curl --retry 48 --retry-delay 10 {{ template "inbucket.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port.http }}
+      curl --retry 48 --retry-delay 10 {{ include "inbucket.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port.http }}
     }
diff --git a/stable/inbucket/templates/tests/inbucket-test.yaml b/stable/inbucket/templates/tests/inbucket-test.yaml
@@ -1,11 +1,12 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ template "inbucket.name" . }}-test-{{ randAlphaNum 5 | lower }}"
+  name: "{{ include "inbucket.name" . }}-test-{{ randAlphaNum 5 | lower }}"
   labels:
     app.kubernetes.io/name: {{ include "inbucket.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ include "inbucket.chart" . }}
   annotations:
     "helm.sh/hook": test-success
 spec:
@@ -35,7 +36,7 @@ spec:
   volumes:
   - name: tests
     configMap:
-      name: {{ template "inbucket.name" . }}-tests
+      name: {{ include "inbucket.name" . }}-tests
   - name: tools
     emptyDir: {}
   restartPolicy: Never