From d1a835be21092ea71677078286317d7d4fd330b0 Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Mon, 10 Dec 2018 20:15:00 +0100 Subject: [PATCH] update labels (#9861) Signed-off-by: cpanato --- stable/mattermost-team-edition/Chart.yaml | 2 +- .../templates/configmap-config.yaml | 7 +++---- .../templates/deployment.yaml | 19 +++++++++---------- .../templates/ingress.yaml | 7 +++---- .../templates/pvc.yaml | 7 +++---- .../templates/service.yaml | 12 ++++++------ .../tests/mattermost-config-test.yaml | 7 +++---- .../templates/tests/mattermost-test.yaml | 7 +++---- 8 files changed, 31 insertions(+), 37 deletions(-) diff --git a/stable/mattermost-team-edition/Chart.yaml b/stable/mattermost-team-edition/Chart.yaml index 79f838fe0b..48095c7cd8 100644 --- a/stable/mattermost-team-edition/Chart.yaml +++ b/stable/mattermost-team-edition/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Mattermost Team Edition server. name: mattermost-team-edition -version: 1.4.2 +version: 2.0.0 appVersion: 5.5.1 keywords: - mattermost diff --git a/stable/mattermost-team-edition/templates/configmap-config.yaml b/stable/mattermost-team-edition/templates/configmap-config.yaml index 9b1a254b26..71bd96d64e 100644 --- a/stable/mattermost-team-edition/templates/configmap-config.yaml +++ b/stable/mattermost-team-edition/templates/configmap-config.yaml @@ -3,10 +3,9 @@ kind: ConfigMap metadata: name: {{ template "mattermost-team-edition.fullname" . }}-config-json labels: - chart: {{ template "mattermost-team-edition.chart" . }} - app: {{ template "mattermost-team-edition.fullname" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "mattermost-team-edition.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} data: config.json: | {{ include "config.tpl" . | printf "%s" | indent 4 }} diff --git a/stable/mattermost-team-edition/templates/deployment.yaml b/stable/mattermost-team-edition/templates/deployment.yaml index d677b8f230..7cce74f8b2 100644 --- a/stable/mattermost-team-edition/templates/deployment.yaml +++ b/stable/mattermost-team-edition/templates/deployment.yaml @@ -3,10 +3,9 @@ kind: Deployment metadata: name: {{ template "mattermost-team-edition.fullname" . }} labels: - chart: {{ template "mattermost-team-edition.chart" . }} - app: {{ template "mattermost-team-edition.fullname" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "mattermost-team-edition.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} spec: replicas: 1 strategy: @@ -15,17 +14,17 @@ spec: revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} selector: matchLabels: - app: {{ template "mattermost-team-edition.fullname" . }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "mattermost-team-edition.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} template: metadata: annotations: checksum/config: {{ include (print $.Template.BasePath "/configmap-config.yaml") . | sha256sum }} labels: - app: {{ template "mattermost-team-edition.fullname" . }} - release: {{ .Release.Name }} - chart: {{ template "mattermost-team-edition.chart" . }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "mattermost-team-edition.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} spec: initContainers: {{- if not .Values.externalDB.enabled }} diff --git a/stable/mattermost-team-edition/templates/ingress.yaml b/stable/mattermost-team-edition/templates/ingress.yaml index b0b312d441..c5bd4ee975 100644 --- a/stable/mattermost-team-edition/templates/ingress.yaml +++ b/stable/mattermost-team-edition/templates/ingress.yaml @@ -7,10 +7,9 @@ kind: Ingress metadata: name: {{ template "mattermost-team-edition.fullname" . }} labels: - chart: {{ template "mattermost-team-edition.chart" . }} - app: {{ template "mattermost-team-edition.fullname" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "mattermost-team-edition.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} annotations: {{ if .Values.ingress.tls }} nginx.ingress.kubernetes.io/ssl-redirect: "true" diff --git a/stable/mattermost-team-edition/templates/pvc.yaml b/stable/mattermost-team-edition/templates/pvc.yaml index a67b922a69..17a2293b05 100644 --- a/stable/mattermost-team-edition/templates/pvc.yaml +++ b/stable/mattermost-team-edition/templates/pvc.yaml @@ -4,10 +4,9 @@ apiVersion: v1 metadata: name: {{ template "mattermost-team-edition.fullname" . }} labels: - chart: {{ template "mattermost-team-edition.chart" . }} - app: {{ template "mattermost-team-edition.fullname" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "mattermost-team-edition.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} annotations: {{ range $key, $value := .Values.persistence.data.annotations }} {{ $key }}: {{ $value | quote }} diff --git a/stable/mattermost-team-edition/templates/service.yaml b/stable/mattermost-team-edition/templates/service.yaml index 62583dbb71..baa1cef01f 100644 --- a/stable/mattermost-team-edition/templates/service.yaml +++ b/stable/mattermost-team-edition/templates/service.yaml @@ -3,14 +3,14 @@ kind: Service metadata: name: {{ template "mattermost-team-edition.name" . }} labels: - chart: {{ template "mattermost-team-edition.chart" . }} - app: {{ template "mattermost-team-edition.fullname" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "mattermost-team-edition.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} spec: selector: - app: {{ template "mattermost-team-edition.fullname" . }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "mattermost-team-edition.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} type: {{ .Values.service.type }} ports: - port: {{ .Values.service.externalPort }} diff --git a/stable/mattermost-team-edition/templates/tests/mattermost-config-test.yaml b/stable/mattermost-team-edition/templates/tests/mattermost-config-test.yaml index e965a778f1..2c10981911 100644 --- a/stable/mattermost-team-edition/templates/tests/mattermost-config-test.yaml +++ b/stable/mattermost-team-edition/templates/tests/mattermost-config-test.yaml @@ -3,10 +3,9 @@ kind: ConfigMap metadata: name: {{ template "mattermost-team-edition.fullname" . }}-tests labels: - chart: {{ template "mattermost-team-edition.chart" . }} - app: {{ template "mattermost-team-edition.fullname" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "mattermost-team-edition.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} data: run.sh: |- @test "Testing Mattermost is accessible" { diff --git a/stable/mattermost-team-edition/templates/tests/mattermost-test.yaml b/stable/mattermost-team-edition/templates/tests/mattermost-test.yaml index 4cf545a1e3..b3d6cd3df0 100644 --- a/stable/mattermost-team-edition/templates/tests/mattermost-test.yaml +++ b/stable/mattermost-team-edition/templates/tests/mattermost-test.yaml @@ -3,10 +3,9 @@ kind: Pod metadata: name: "{{ template "mattermost-team-edition.fullname" . }}-test-{{ randAlphaNum 5 | lower }}" labels: - chart: {{ template "mattermost-team-edition.chart" . }} - app: {{ template "mattermost-team-edition.fullname" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "mattermost-team-edition.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} annotations: "helm.sh/hook": test-success spec: