From 64bdc023457c68dd9efd2dee62610ac947e6fcbc Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Tue, 11 Dec 2018 00:12:04 +0100 Subject: [PATCH] [stable/inbucket] fix labels (#9864) * fix labels Signed-off-by: cpanato * update deployment version Signed-off-by: cpanato --- stable/inbucket/Chart.yaml | 2 +- stable/inbucket/templates/configmap.yaml | 7 +++---- stable/inbucket/templates/deployment.yaml | 17 ++++++++--------- stable/inbucket/templates/ingress.yaml | 7 +++---- stable/inbucket/templates/service.yaml | 11 +++++------ .../templates/tests/inbucket-config-test.yaml | 9 ++++----- .../inbucket/templates/tests/inbucket-test.yaml | 7 +++---- 7 files changed, 27 insertions(+), 33 deletions(-) diff --git a/stable/inbucket/Chart.yaml b/stable/inbucket/Chart.yaml index ab217a890c..497e20a3ee 100644 --- 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: 2.0.0 +version: 3.0.0 keywords: - inbucket - mail diff --git a/stable/inbucket/templates/configmap.yaml b/stable/inbucket/templates/configmap.yaml index 028782fc67..87d294cc91 100644 --- a/stable/inbucket/templates/configmap.yaml +++ b/stable/inbucket/templates/configmap.yaml @@ -3,9 +3,8 @@ kind: ConfigMap metadata: name: {{ template "inbucket.name" . }}-configmap labels: - app: {{ template "inbucket.name" . }} - chart: {{ template "inbucket.name" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "inbucket.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} data: {{ toYaml .Values.extraEnv | indent 2 }} diff --git a/stable/inbucket/templates/deployment.yaml b/stable/inbucket/templates/deployment.yaml index 043171266f..3cac015442 100644 --- a/stable/inbucket/templates/deployment.yaml +++ b/stable/inbucket/templates/deployment.yaml @@ -1,17 +1,16 @@ -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: labels: - app: {{ template "inbucket.name" . }} - chart: {{ template "inbucket.chart" . }} - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "inbucket.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} name: {{ template "inbucket.fullname" . }} spec: selector: matchLabels: - app: {{ template "inbucket.name" . }} - release: {{ .Release.Name | quote }} + app.kubernetes.io/name: {{ include "inbucket.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} template: metadata: {{- if .Values.podAnnotations }} @@ -19,8 +18,8 @@ spec: {{ toYaml .Values.podAnnotations | indent 8 }} {{- end }} labels: - app: {{ template "inbucket.name" . }} - release: {{ .Release.Name | quote }} + app.kubernetes.io/name: {{ include "inbucket.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} spec: containers: - name: {{ template "inbucket.name" . }} diff --git a/stable/inbucket/templates/ingress.yaml b/stable/inbucket/templates/ingress.yaml index 272c0bbff5..2a173fdb7e 100644 --- a/stable/inbucket/templates/ingress.yaml +++ b/stable/inbucket/templates/ingress.yaml @@ -9,10 +9,9 @@ metadata: {{ toYaml .Values.ingress.annotations | indent 4 }} {{- end }} labels: - app: {{ template "inbucket.name" . }} - chart: {{ template "inbucket.chart" . }} - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "inbucket.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} name: {{ $fullName }} spec: {{- if .Values.ingress.tls }} diff --git a/stable/inbucket/templates/service.yaml b/stable/inbucket/templates/service.yaml index 0b93e463dd..46647e692f 100644 --- a/stable/inbucket/templates/service.yaml +++ b/stable/inbucket/templates/service.yaml @@ -6,10 +6,9 @@ metadata: {{ toYaml .Values.service.annotations | indent 4 }} {{- end }} labels: - app: {{ template "inbucket.name" . }} - chart: {{ template "inbucket.chart" . }} - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "inbucket.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} name: {{ template "inbucket.fullname" . }} spec: type: "{{ .Values.service.type }}" @@ -48,5 +47,5 @@ spec: nodePort: {{ .Values.service.nodePort.pop3 }} {{- end }} selector: - app: {{ template "inbucket.name" . }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "inbucket.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/stable/inbucket/templates/tests/inbucket-config-test.yaml b/stable/inbucket/templates/tests/inbucket-config-test.yaml index 14ad205242..41070bfd95 100644 --- a/stable/inbucket/templates/tests/inbucket-config-test.yaml +++ b/stable/inbucket/templates/tests/inbucket-config-test.yaml @@ -4,12 +4,11 @@ kind: ConfigMap metadata: name: {{ template "inbucket.name" . }}-tests labels: - chart: {{ template "inbucket.chart" . }} - app: {{ template "inbucket.name" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "inbucket.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} 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 }} - } \ No newline at end of file + } diff --git a/stable/inbucket/templates/tests/inbucket-test.yaml b/stable/inbucket/templates/tests/inbucket-test.yaml index 32efb44c83..41a900d568 100644 --- a/stable/inbucket/templates/tests/inbucket-test.yaml +++ b/stable/inbucket/templates/tests/inbucket-test.yaml @@ -3,10 +3,9 @@ kind: Pod metadata: name: "{{ template "inbucket.name" . }}-test-{{ randAlphaNum 5 | lower }}" labels: - chart: {{ template "inbucket.chart" . }} - app: {{ template "inbucket.name" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "inbucket.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} annotations: "helm.sh/hook": test-success spec: