From 250b63eced1e9dbc9ca4b7a0758025c3a17d0f35 Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Tue, 7 May 2019 14:13:29 -0400 Subject: [PATCH] Updating the labels for consistency Signed-off-by: Matt Farina --- .../output/template-name-template.txt | 14 +-- cmd/helm/testdata/output/template-set.txt | 14 +-- .../testdata/output/template-values-files.txt | 14 +-- cmd/helm/testdata/output/template.txt | 14 +-- .../testdata/testcharts/alpine/Chart.yaml | 2 +- .../alpine/templates/alpine-pod.yaml | 13 +-- .../chart-bad-type/templates/alpine-pod.yaml | 12 +-- .../templates/deployment.yaml | 16 ++-- .../chart-with-lib-dep/templates/ingress.yaml | 8 +- .../issue1979/templates/alpine-pod.yaml | 19 ++-- .../testdata/testcharts/lib-chart/README.md | 88 +++++++++---------- .../lib-chart/templates/_deployment.yaml | 4 +- .../lib-chart/templates/_metadata_labels.tpl | 8 +- .../lib-chart/templates/_service.yaml | 4 +- .../novals/templates/alpine-pod.yaml | 11 +-- .../charts/alpine/templates/alpine-pod.yaml | 19 ++-- .../charts/alpine/templates/alpine-pod.yaml | 8 +- .../charts/alpine/templates/alpine-pod.yaml | 8 +- .../charts/subchartA/templates/service.yaml | 4 +- .../charts/subchartB/templates/service.yaml | 4 +- .../charts/subchart1/templates/service.yaml | 6 +- .../charts/subchartB/templates/service.yaml | 4 +- .../charts/subchartC/templates/service.yaml | 4 +- .../charts/subchart2/templates/service.yaml | 4 +- .../subpop/noreqs/templates/service.yaml | 4 +- .../testdata/albatross/templates/svc.yaml | 2 +- 26 files changed, 156 insertions(+), 152 deletions(-) diff --git a/cmd/helm/testdata/output/template-name-template.txt b/cmd/helm/testdata/output/template-name-template.txt index 56105bb75..229ffe20f 100644 --- a/cmd/helm/testdata/output/template-name-template.txt +++ b/cmd/helm/testdata/output/template-name-template.txt @@ -5,7 +5,7 @@ kind: Service metadata: name: subcharta labels: - chart: "subcharta-0.1.0" + helm.sh/chart: "subcharta-0.1.0" spec: type: ClusterIP ports: @@ -14,7 +14,7 @@ spec: protocol: TCP name: apache selector: - app: subcharta + app.kubernetes.io/name: subcharta --- # Source: subchart1/charts/subchartb/templates/service.yaml apiVersion: v1 @@ -22,7 +22,7 @@ kind: Service metadata: name: subchartb labels: - chart: "subchartb-0.1.0" + helm.sh/chart: "subchartb-0.1.0" spec: type: ClusterIP ports: @@ -31,7 +31,7 @@ spec: protocol: TCP name: nginx selector: - app: subchartb + app.kubernetes.io/name: subchartb --- # Source: subchart1/templates/service.yaml apiVersion: v1 @@ -39,8 +39,8 @@ kind: Service metadata: name: subchart1 labels: - chart: "subchart1-0.1.0" - release-name: "foobar-YWJj-baz" + helm.sh/chart: "subchart1-0.1.0" + app.kubernetes.io/instance: "foobar-YWJj-baz" kube-version/major: "1" kube-version/minor: "9" kube-version/gitversion: "v1.9.0" @@ -52,4 +52,4 @@ spec: protocol: TCP name: nginx selector: - app: subchart1 + app.kubernetes.io/name: subchart1 diff --git a/cmd/helm/testdata/output/template-set.txt b/cmd/helm/testdata/output/template-set.txt index 4e4643976..fec32bcae 100644 --- a/cmd/helm/testdata/output/template-set.txt +++ b/cmd/helm/testdata/output/template-set.txt @@ -5,7 +5,7 @@ kind: Service metadata: name: subcharta labels: - chart: "subcharta-0.1.0" + helm.sh/chart: "subcharta-0.1.0" spec: type: ClusterIP ports: @@ -14,7 +14,7 @@ spec: protocol: TCP name: apache selector: - app: subcharta + app.kubernetes.io/name: subcharta --- # Source: subchart1/charts/subchartb/templates/service.yaml apiVersion: v1 @@ -22,7 +22,7 @@ kind: Service metadata: name: subchartb labels: - chart: "subchartb-0.1.0" + helm.sh/chart: "subchartb-0.1.0" spec: type: ClusterIP ports: @@ -31,7 +31,7 @@ spec: protocol: TCP name: nginx selector: - app: subchartb + app.kubernetes.io/name: subchartb --- # Source: subchart1/templates/service.yaml apiVersion: v1 @@ -39,8 +39,8 @@ kind: Service metadata: name: subchart1 labels: - chart: "subchart1-0.1.0" - release-name: "RELEASE-NAME" + helm.sh/chart: "subchart1-0.1.0" + app.kubernetes.io/instance: "RELEASE-NAME" kube-version/major: "1" kube-version/minor: "9" kube-version/gitversion: "v1.9.0" @@ -52,4 +52,4 @@ spec: protocol: TCP name: apache selector: - app: subchart1 + app.kubernetes.io/name: subchart1 diff --git a/cmd/helm/testdata/output/template-values-files.txt b/cmd/helm/testdata/output/template-values-files.txt index 4e4643976..fec32bcae 100644 --- a/cmd/helm/testdata/output/template-values-files.txt +++ b/cmd/helm/testdata/output/template-values-files.txt @@ -5,7 +5,7 @@ kind: Service metadata: name: subcharta labels: - chart: "subcharta-0.1.0" + helm.sh/chart: "subcharta-0.1.0" spec: type: ClusterIP ports: @@ -14,7 +14,7 @@ spec: protocol: TCP name: apache selector: - app: subcharta + app.kubernetes.io/name: subcharta --- # Source: subchart1/charts/subchartb/templates/service.yaml apiVersion: v1 @@ -22,7 +22,7 @@ kind: Service metadata: name: subchartb labels: - chart: "subchartb-0.1.0" + helm.sh/chart: "subchartb-0.1.0" spec: type: ClusterIP ports: @@ -31,7 +31,7 @@ spec: protocol: TCP name: nginx selector: - app: subchartb + app.kubernetes.io/name: subchartb --- # Source: subchart1/templates/service.yaml apiVersion: v1 @@ -39,8 +39,8 @@ kind: Service metadata: name: subchart1 labels: - chart: "subchart1-0.1.0" - release-name: "RELEASE-NAME" + helm.sh/chart: "subchart1-0.1.0" + app.kubernetes.io/instance: "RELEASE-NAME" kube-version/major: "1" kube-version/minor: "9" kube-version/gitversion: "v1.9.0" @@ -52,4 +52,4 @@ spec: protocol: TCP name: apache selector: - app: subchart1 + app.kubernetes.io/name: subchart1 diff --git a/cmd/helm/testdata/output/template.txt b/cmd/helm/testdata/output/template.txt index 40b05a1f6..c0ddca8d8 100644 --- a/cmd/helm/testdata/output/template.txt +++ b/cmd/helm/testdata/output/template.txt @@ -5,7 +5,7 @@ kind: Service metadata: name: subcharta labels: - chart: "subcharta-0.1.0" + helm.sh/chart: "subcharta-0.1.0" spec: type: ClusterIP ports: @@ -14,7 +14,7 @@ spec: protocol: TCP name: apache selector: - app: subcharta + app.kubernetes.io/name: subcharta --- # Source: subchart1/charts/subchartb/templates/service.yaml apiVersion: v1 @@ -22,7 +22,7 @@ kind: Service metadata: name: subchartb labels: - chart: "subchartb-0.1.0" + helm.sh/chart: "subchartb-0.1.0" spec: type: ClusterIP ports: @@ -31,7 +31,7 @@ spec: protocol: TCP name: nginx selector: - app: subchartb + app.kubernetes.io/name: subchartb --- # Source: subchart1/templates/service.yaml apiVersion: v1 @@ -39,8 +39,8 @@ kind: Service metadata: name: subchart1 labels: - chart: "subchart1-0.1.0" - release-name: "RELEASE-NAME" + helm.sh/chart: "subchart1-0.1.0" + app.kubernetes.io/instance: "RELEASE-NAME" kube-version/major: "1" kube-version/minor: "9" kube-version/gitversion: "v1.9.0" @@ -52,4 +52,4 @@ spec: protocol: TCP name: nginx selector: - app: subchart1 + app.kubernetes.io/name: subchart1 diff --git a/cmd/helm/testdata/testcharts/alpine/Chart.yaml b/cmd/helm/testdata/testcharts/alpine/Chart.yaml index 7ee0b1122..1d6bad825 100644 --- a/cmd/helm/testdata/testcharts/alpine/Chart.yaml +++ b/cmd/helm/testdata/testcharts/alpine/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "3.3" +appVersion: "3.9" description: Deploy a basic Alpine Linux pod home: https://helm.sh/helm name: alpine diff --git a/cmd/helm/testdata/testcharts/alpine/templates/alpine-pod.yaml b/cmd/helm/testdata/testcharts/alpine/templates/alpine-pod.yaml index b48bb5e4f..ae19a1127 100644 --- a/cmd/helm/testdata/testcharts/alpine/templates/alpine-pod.yaml +++ b/cmd/helm/testdata/testcharts/alpine/templates/alpine-pod.yaml @@ -3,12 +3,13 @@ kind: Pod metadata: name: "{{.Release.Name}}-{{.Values.Name}}" labels: - # The "heritage" label is used to track which tool deployed a given chart. - # It is useful for admins who want to see what releases a particular tool - # is responsible for. + # The "app.kubernetes.io/managed-by" label is used to track which tool + # deployed a given chart. It is useful for admins who want to see what + # releases a particular tool is responsible for. app.kubernetes.io/managed-by: {{.Release.Service | quote }} - # The "release" convention makes it easy to tie a release to all of the - # Kubernetes resources that were created as part of that release. + # The "app.kubernetes.io/instance" convention makes it easy to tie a release + # to all of the Kubernetes resources that were created as part of that + # release. app.kubernetes.io/instance: {{.Release.Name | quote }} app.kubernetes.io/version: {{ .Chart.AppVersion }} # This makes it easy to audit chart usage. @@ -22,5 +23,5 @@ spec: restartPolicy: {{default "Never" .Values.restartPolicy}} containers: - name: waiter - image: "alpine:3.3" + image: "alpine:{{ .Chart.AppVersion }}" command: ["/bin/sleep","9000"] diff --git a/cmd/helm/testdata/testcharts/chart-bad-type/templates/alpine-pod.yaml b/cmd/helm/testdata/testcharts/chart-bad-type/templates/alpine-pod.yaml index eaf882385..a40ae32d7 100644 --- a/cmd/helm/testdata/testcharts/chart-bad-type/templates/alpine-pod.yaml +++ b/cmd/helm/testdata/testcharts/chart-bad-type/templates/alpine-pod.yaml @@ -3,15 +3,15 @@ kind: Pod metadata: name: "{{.Release.Name}}-{{.Values.Name}}" labels: - # The "heritage" label is used to track which tool deployed a given chart. - # It is useful for admins who want to see what releases a particular tool - # is responsible for. - heritage: {{.Release.Service | quote }} + # The "app.kubernetes.io/managed-by" label is used to track which tool + # deployed a given chart. It is useful for admins who want to see what + # releases a particular tool is responsible for. + app.kubernetes.io/managed-by: {{.Release.Service | quote }} # The "release" convention makes it easy to tie a release to all of the # Kubernetes resources that were created as part of that release. app.kubernetes.io/instance: {{.Release.Name | quote }} # This makes it easy to audit chart usage. - chart: "{{.Chart.Name}}-{{.Chart.Version}}" + helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}" values: {{.Values.test.Name}} spec: # This shows how to use a simple value. This will look for a passed-in value @@ -21,5 +21,5 @@ spec: restartPolicy: {{default "Never" .Values.restartPolicy}} containers: - name: waiter - image: "alpine:3.3" + image: "alpine:3.9" command: ["/bin/sleep","9000"] diff --git a/cmd/helm/testdata/testcharts/chart-with-lib-dep/templates/deployment.yaml b/cmd/helm/testdata/testcharts/chart-with-lib-dep/templates/deployment.yaml index ff63aefc2..18b4f8718 100644 --- a/cmd/helm/testdata/testcharts/chart-with-lib-dep/templates/deployment.yaml +++ b/cmd/helm/testdata/testcharts/chart-with-lib-dep/templates/deployment.yaml @@ -3,21 +3,21 @@ kind: Deployment metadata: name: {{ template "chart-with-lib-dep.fullname" . }} labels: - app: {{ template "chart-with-lib-dep.name" . }} - chart: {{ template "chart-with-lib-dep.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "chart-with-lib-dep.name" . }} + helm.sh/chart: {{ template "chart-with-lib-dep.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} spec: replicas: {{ .Values.replicaCount }} selector: matchLabels: - app: {{ template "chart-with-lib-dep.name" . }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ template "chart-with-lib-dep.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} template: metadata: labels: - app: {{ template "chart-with-lib-dep.name" . }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ template "chart-with-lib-dep.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} spec: containers: - name: {{ .Chart.Name }} diff --git a/cmd/helm/testdata/testcharts/chart-with-lib-dep/templates/ingress.yaml b/cmd/helm/testdata/testcharts/chart-with-lib-dep/templates/ingress.yaml index 0330f2fef..42afd0879 100644 --- a/cmd/helm/testdata/testcharts/chart-with-lib-dep/templates/ingress.yaml +++ b/cmd/helm/testdata/testcharts/chart-with-lib-dep/templates/ingress.yaml @@ -6,10 +6,10 @@ kind: Ingress metadata: name: {{ $fullName }} labels: - app: {{ template "chart-with-lib-dep.name" . }} - chart: {{ template "chart-with-lib-dep.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "chart-with-lib-dep.name" . }} + helm.sh/chart: {{ template "chart-with-lib-dep.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} {{- with .Values.ingress.annotations }} annotations: {{ toYaml . | indent 4 }} diff --git a/cmd/helm/testdata/testcharts/issue1979/templates/alpine-pod.yaml b/cmd/helm/testdata/testcharts/issue1979/templates/alpine-pod.yaml index ee61f2056..6f025fecb 100644 --- a/cmd/helm/testdata/testcharts/issue1979/templates/alpine-pod.yaml +++ b/cmd/helm/testdata/testcharts/issue1979/templates/alpine-pod.yaml @@ -3,15 +3,16 @@ kind: Pod metadata: name: "{{.Release.Name}}-{{.Values.Name}}" labels: - # The "heritage" label is used to track which tool deployed a given chart. - # It is useful for admins who want to see what releases a particular tool - # is responsible for. - heritage: {{.Release.Service | quote }} - # The "release" convention makes it easy to tie a release to all of the - # Kubernetes resources that were created as part of that release. - release: {{.Release.Name | quote }} + # The "app.kubernetes.io/managed-by" label is used to track which tool + # deployed a given chart. It is useful for admins who want to see what + # releases a particular tool is responsible for. + app.kubernetes.io/managed-by: {{.Release.Service | quote }} + # The "app.kubernetes.io/instance" convention makes it easy to tie a release + # to all of the Kubernetes resources that were created as part of that + # release. + app.kubernetes.io/instance: {{.Release.Name | quote }} # This makes it easy to audit chart usage. - chart: "{{.Chart.Name}}-{{.Chart.Version}}" + helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}" values: {{.Values.test.Name}} spec: # This shows how to use a simple value. This will look for a passed-in value @@ -21,5 +22,5 @@ spec: restartPolicy: {{default "Never" .Values.restartPolicy}} containers: - name: waiter - image: "alpine:3.3" + image: "alpine:3.9" command: ["/bin/sleep","9000"] diff --git a/cmd/helm/testdata/testcharts/lib-chart/README.md b/cmd/helm/testdata/testcharts/lib-chart/README.md index ca0459474..aca257924 100644 --- a/cmd/helm/testdata/testcharts/lib-chart/README.md +++ b/cmd/helm/testdata/testcharts/lib-chart/README.md @@ -65,7 +65,7 @@ following defaults: - Service type (ClusterIP, NodePort, LoadBalancer) made configurable by `.Values.service.type` - Named port `http` configured on port 80 -- Selector set to `app: {{ template "common.name" }}, release: {{ .Release.Name | quote }}` to match the default used in the `Deployment` resource +- Selector set to `app.kubernetes.io/name: {{ template "common.name" }}, app.kubernetes.io/instance: {{ .Release.Name | quote }}` to match the default used in the `Deployment` resource Example template: @@ -115,11 +115,11 @@ apiVersion: v1 kind: Service metadata: labels: - app: service - chart: service-0.1.0 - heritage: Tiller + app.kubernetes.io/name: service + helm.sh/chart: service-0.1.0 + app.kubernetes.io/managed-by: Helm protocol: mail - release: release-name + app.kubernetes.io/instance: release-name name: release-name-service-mail spec: ports: @@ -130,8 +130,8 @@ spec: port: 993 targetPort: 993 selector: - app: service - release: release-name + app.kubernetes.io/name: service + app.kubernetes.io/instance: release-name protocol: mail type: ClusterIP --- @@ -139,11 +139,11 @@ apiVersion: v1 kind: Service metadata: labels: - app: service - chart: service-0.1.0 - heritage: Tiller + app.kubernetes.io/name: service + helm.sh/chart: service-0.1.0 + app.kubernetes.io/managed-by: Helm protocol: www - release: release-name + app.kubernetes.io/instance: release-name name: release-name-service-www spec: ports: @@ -250,16 +250,16 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: labels: - app: deployment - chart: deployment-0.1.0 - heritage: Tiller - release: release-name + app.kubernetes.io/name: deployment + helm.sh/chart: deployment-0.1.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: release-name name: release-name-deployment spec: template: metadata: labels: - app: deployment + app.kubernetes.io/name: deployment spec: containers: - image: nginx:stable @@ -316,10 +316,10 @@ data: kind: ConfigMap metadata: labels: - app: configmap - chart: configmap-0.1.0 - heritage: Tiller - release: release-name + app.kubernetes.io/name: configmap + helm.sh/chart: configmap-0.1.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: release-name name: release-name-configmap ``` @@ -354,10 +354,10 @@ data: kind: Secret metadata: labels: - app: secret - chart: secret-0.1.0 - heritage: Tiller - release: release-name + app.kubernetes.io/name: secret + helm.sh/chart: secret-0.1.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: release-name name: release-name-secret type: Opaque ``` @@ -399,10 +399,10 @@ metadata: kubernetes.io/ingress.class: nginx kubernetes.io/tls-acme: "true" labels: - app: ingress - chart: ingress-0.1.0 - heritage: Tiller - release: release-name + app.kubernetes.io/name: ingress + helm.sh/chart: ingress-0.1.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: release-name name: release-name-ingress spec: rules: @@ -459,10 +459,10 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: labels: - app: persistentvolumeclaim - chart: persistentvolumeclaim-0.1.0 - heritage: Tiller - release: release-name + app.kubernetes.io/name: persistentvolumeclaim + helm.sh/chart: persistentvolumeclaim-0.1.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: release-name name: release-name-persistentvolumeclaim spec: accessModes: @@ -731,10 +731,10 @@ Example output: metadata: name: release-name-metadata labels: - app: metadata - heritage: "Tiller" - release: "RELEASE-NAME" - chart: metadata-0.1.0 + app.kubernetes.io/name: metadata + app.kubernetes.io/managed-by: "Helm" + app.kubernetes.io/instance: "RELEASE-NAME" + helm.sh/chart: metadata-0.1.0 first: "matt" last: "butcher" nick: "technosophos" @@ -746,10 +746,10 @@ metadata: metadata: name: Zeus labels: - app: metadata - heritage: "Tiller" - release: "RELEASE-NAME" - chart: metadata-0.1.0 + app.kubernetes.io/name: metadata + app.kubernetes.io/managed-by: "Helm" + app.kubernetes.io/instance: "RELEASE-NAME" + helm.sh/chart: metadata-0.1.0 annotations: ``` @@ -789,10 +789,10 @@ Example usage: Example output: ```yaml -app: labelizer -heritage: "Tiller" -release: "RELEASE-NAME" -chart: labelizer-0.1.0 +app.kubernetes.io/name: labelizer +app.kubernetes.io/managed-by: "Tiller" +app.kubernetes.io/instance: "RELEASE-NAME" +helm.sh/chart: labelizer-0.1.0 ``` ### `common.hook` diff --git a/cmd/helm/testdata/testcharts/lib-chart/templates/_deployment.yaml b/cmd/helm/testdata/testcharts/lib-chart/templates/_deployment.yaml index c49dae3eb..e99a8cd33 100644 --- a/cmd/helm/testdata/testcharts/lib-chart/templates/_deployment.yaml +++ b/cmd/helm/testdata/testcharts/lib-chart/templates/_deployment.yaml @@ -6,8 +6,8 @@ spec: template: metadata: labels: - app: {{ template "common.name" . }} - release: {{ .Release.Name | quote }} + app.kubernetes.io/name: {{ template "common.name" . }} + app.kubernetes.io/instance: {{ .Release.Name | quote }} spec: containers: - diff --git a/cmd/helm/testdata/testcharts/lib-chart/templates/_metadata_labels.tpl b/cmd/helm/testdata/testcharts/lib-chart/templates/_metadata_labels.tpl index 15fe00c5f..bcb8cdaa8 100644 --- a/cmd/helm/testdata/testcharts/lib-chart/templates/_metadata_labels.tpl +++ b/cmd/helm/testdata/testcharts/lib-chart/templates/_metadata_labels.tpl @@ -21,8 +21,8 @@ common.labels.standard prints the standard Helm labels. The standard labels are frequently used in metadata. */ -}} {{- define "common.labels.standard" -}} -app: {{ template "common.name" . }} -chart: {{ template "common.chartref" . }} -heritage: {{ .Release.Service | quote }} -release: {{ .Release.Name | quote }} +app.kubernetes.io/name: {{ template "common.name" . }} +helm.sh/chart: {{ template "common.chartref" . }} +app.kubernetes.io/managed-by: {{ .Release.Service | quote }} +app.kubernetes.io/instance: {{ .Release.Name | quote }} {{- end -}} diff --git a/cmd/helm/testdata/testcharts/lib-chart/templates/_service.yaml b/cmd/helm/testdata/testcharts/lib-chart/templates/_service.yaml index 67379525f..b9dfc378a 100644 --- a/cmd/helm/testdata/testcharts/lib-chart/templates/_service.yaml +++ b/cmd/helm/testdata/testcharts/lib-chart/templates/_service.yaml @@ -9,8 +9,8 @@ spec: port: 80 targetPort: http selector: - app: {{ template "common.name" . }} - release: {{ .Release.Name | quote }} + app.kubernetes.io/name: {{ template "common.name" . }} + app.kubernetes.io/instance: {{ .Release.Name | quote }} {{- end -}} {{- define "common.service" -}} {{- template "common.util.merge" (append . "common.service.tpl") -}} diff --git a/cmd/helm/testdata/testcharts/novals/templates/alpine-pod.yaml b/cmd/helm/testdata/testcharts/novals/templates/alpine-pod.yaml index 564429dea..96c92d61d 100644 --- a/cmd/helm/testdata/testcharts/novals/templates/alpine-pod.yaml +++ b/cmd/helm/testdata/testcharts/novals/templates/alpine-pod.yaml @@ -3,12 +3,13 @@ kind: Pod metadata: name: "{{.Release.Name}}-{{.Values.Name}}" labels: - # The "heritage" label is used to track which tool deployed a given chart. - # It is useful for admins who want to see what releases a particular tool - # is responsible for. + # The "app.kubernetes.io/managed-by" label is used to track which tool + # deployed a given chart. It is useful for admins who want to see what + # releases a particular tool is responsible for. app.kubernetes.io/managed-by: {{.Release.Service | quote }} - # The "release" convention makes it easy to tie a release to all of the - # Kubernetes resources that were created as part of that release. + # The "app.kubernetes.io/instance" convention makes it easy to tie a release + # to all of the Kubernetes resources that were created as part of that + # release. app.kubernetes.io/instance: {{.Release.Name | quote }} app.kubernetes.io/version: {{ .Chart.AppVersion }} # This makes it easy to audit chart usage. diff --git a/docs/examples/nginx/charts/alpine/templates/alpine-pod.yaml b/docs/examples/nginx/charts/alpine/templates/alpine-pod.yaml index da9caef78..a1a5f15da 100644 --- a/docs/examples/nginx/charts/alpine/templates/alpine-pod.yaml +++ b/docs/examples/nginx/charts/alpine/templates/alpine-pod.yaml @@ -3,16 +3,17 @@ kind: Pod metadata: name: {{ template "alpine.fullname" . }} labels: - # The "heritage" label is used to track which tool deployed a given chart. - # It is useful for admins who want to see what releases a particular tool - # is responsible for. - heritage: {{ .Release.Service }} - # The "release" convention makes it easy to tie a release to all of the - # Kubernetes resources that were created as part of that release. - release: {{ .Release.Name }} + # The "app.kubernetes.io/managed-by" label is used to track which tool + # deployed a given chart. It is useful for admins who want to see what + # releases a particular tool is responsible for. + app.kubernetes.io/managed-by: {{.Release.Service | quote }} + # The "app.kubernetes.io/instance" convention makes it easy to tie a release + # to all of the Kubernetes resources that were created as part of that + # release. + app.kubernetes.io/instance: {{.Release.Name | quote }} # This makes it easy to audit chart usage. - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - app: {{ template "alpine.name" . }} + helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}" + app.kubernetes.io/name: {{ template "alpine.name" . }} spec: # This shows how to use a simple value. This will look for a passed-in value called restartPolicy. restartPolicy: {{ .Values.restartPolicy }} diff --git a/pkg/chart/loader/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/loader/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml index 0c6980cf7..21ae20aad 100644 --- a/pkg/chart/loader/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml +++ b/pkg/chart/loader/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml @@ -3,12 +3,12 @@ kind: Pod metadata: name: {{.Release.Name}}-{{.Chart.Name}} labels: - heritage: {{.Release.Service}} - chartName: {{.Chart.Name}} - chartVersion: {{.Chart.Version | quote}} + app.kubernetes.io/managed-by: {{.Release.Service}} + app.kubernetes.io/name: {{.Chart.Name}} + helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}" spec: restartPolicy: {{default "Never" .restart_policy}} containers: - name: waiter - image: "alpine:3.3" + image: "alpine:3.9" command: ["/bin/sleep","9000"] diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/templates/alpine-pod.yaml index 0c6980cf7..0ac5ca6a8 100755 --- a/pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/templates/alpine-pod.yaml +++ b/pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/templates/alpine-pod.yaml @@ -3,12 +3,12 @@ kind: Pod metadata: name: {{.Release.Name}}-{{.Chart.Name}} labels: - heritage: {{.Release.Service}} - chartName: {{.Chart.Name}} - chartVersion: {{.Chart.Version | quote}} + app.kubernetes.io/managed-by: {{.Release.Service | quote }} + app.kubernetes.io/name: {{.Chart.Name}} + helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}" spec: restartPolicy: {{default "Never" .restart_policy}} containers: - name: waiter - image: "alpine:3.3" + image: "alpine:3.9" command: ["/bin/sleep","9000"] diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml b/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml index fdf75aa91..27501e1e0 100644 --- a/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml +++ b/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: {{ .Chart.Name }} labels: - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: type: {{ .Values.service.type }} ports: @@ -12,4 +12,4 @@ spec: protocol: TCP name: {{ .Values.service.name }} selector: - app: {{ .Chart.Name }} + app.kubernetes.io/name: {{ .Chart.Name }} diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml b/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml index fdf75aa91..27501e1e0 100644 --- a/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml +++ b/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: {{ .Chart.Name }} labels: - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: type: {{ .Values.service.type }} ports: @@ -12,4 +12,4 @@ spec: protocol: TCP name: {{ .Values.service.name }} selector: - app: {{ .Chart.Name }} + app.kubernetes.io/name: {{ .Chart.Name }} diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/templates/service.yaml b/pkg/chartutil/testdata/subpop/charts/subchart1/templates/service.yaml index 3c6395ef4..0ce52ac43 100644 --- a/pkg/chartutil/testdata/subpop/charts/subchart1/templates/service.yaml +++ b/pkg/chartutil/testdata/subpop/charts/subchart1/templates/service.yaml @@ -3,8 +3,8 @@ kind: Service metadata: name: {{ .Chart.Name }} labels: - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release-name: "{{ .Release.Name }}" + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app.kubernetes.io/instance: "{{ .Release.Name }}" kube-version/major: "{{ .Capabilities.KubeVersion.Major }}" kube-version/minor: "{{ .Capabilities.KubeVersion.Minor }}" kube-version/gitversion: "v{{ .Capabilities.KubeVersion.Major }}.{{ .Capabilities.KubeVersion.Minor }}.0" @@ -16,4 +16,4 @@ spec: protocol: TCP name: {{ .Values.service.name }} selector: - app: {{ .Chart.Name }} + app.kubernetes.io/name: {{ .Chart.Name }} diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml b/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml index 0935aadce..3f168bdbf 100644 --- a/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml +++ b/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: subchart2-{{ .Chart.Name }} labels: - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + helm.sh/hart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: type: {{ .Values.service.type }} ports: @@ -12,4 +12,4 @@ spec: protocol: TCP name: subchart2-{{ .Values.service.name }} selector: - app: {{ .Chart.Name }} + app.kubernetes.io/name: {{ .Chart.Name }} diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml b/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml index fdf75aa91..27501e1e0 100644 --- a/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml +++ b/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: {{ .Chart.Name }} labels: - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: type: {{ .Values.service.type }} ports: @@ -12,4 +12,4 @@ spec: protocol: TCP name: {{ .Values.service.name }} selector: - app: {{ .Chart.Name }} + app.kubernetes.io/name: {{ .Chart.Name }} diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/templates/service.yaml b/pkg/chartutil/testdata/subpop/charts/subchart2/templates/service.yaml index fdf75aa91..27501e1e0 100644 --- a/pkg/chartutil/testdata/subpop/charts/subchart2/templates/service.yaml +++ b/pkg/chartutil/testdata/subpop/charts/subchart2/templates/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: {{ .Chart.Name }} labels: - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: type: {{ .Values.service.type }} ports: @@ -12,4 +12,4 @@ spec: protocol: TCP name: {{ .Values.service.name }} selector: - app: {{ .Chart.Name }} + app.kubernetes.io/name: {{ .Chart.Name }} diff --git a/pkg/chartutil/testdata/subpop/noreqs/templates/service.yaml b/pkg/chartutil/testdata/subpop/noreqs/templates/service.yaml index fdf75aa91..27501e1e0 100644 --- a/pkg/chartutil/testdata/subpop/noreqs/templates/service.yaml +++ b/pkg/chartutil/testdata/subpop/noreqs/templates/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: {{ .Chart.Name }} labels: - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: type: {{ .Values.service.type }} ports: @@ -12,4 +12,4 @@ spec: protocol: TCP name: {{ .Values.service.name }} selector: - app: {{ .Chart.Name }} + app.kubernetes.io/name: {{ .Chart.Name }} diff --git a/pkg/lint/rules/testdata/albatross/templates/svc.yaml b/pkg/lint/rules/testdata/albatross/templates/svc.yaml index 18b3c99ef..16bb27d55 100644 --- a/pkg/lint/rules/testdata/albatross/templates/svc.yaml +++ b/pkg/lint/rules/testdata/albatross/templates/svc.yaml @@ -16,4 +16,4 @@ spec: protocol: TCP name: http selector: - app: {{template "fullname" .}} + app.kubernetes.io/name: {{template "fullname" .}}