Common Labels + Helm v3

README.md

@@ -43,6 +43,19 @@ PRs accepted. Pipeline is using Helm v3.
 
 Small note: If editing the Readme, please conform to the [standard-readme](https://github.com/RichardLitt/standard-readme) specification.
 
+## Upgrading to Helm v3
+
+Since [PR #75](https://github.com/t3n/helm-charts/pull/75) we changed the chart labels to helm's recommended common labels. To Upgrade with minimal downtime follow these steps:
+```
+kubectl delete deploy *chart-name* --cascade=false
+kubectl delete rs *chart-name* -l release=*chart-name* --cascade=false
+kubectl label pods -l release=*chart-name* app.kubernetes.io/instance=*chartname* helm.sh/chart=*chartname* app.kubernetes.io/managed-by=Helm app.kubernetes.io/name=*chartname* helm.sh/chart=*chartname-version*
+```
+After you labeled the old pods with the new labels, deploy the new chart version with helm, delete the old pods
+```
+kubectl delete pods -l release=*chartname*
+```
+
 ## License
 
 [MIT](LICENSE)

cloudsql-proxy/Chart.yaml

@@ -1,6 +1,6 @@
-apiVersion: v1
+apiVersion: v2
 name: cloudsql-proxy
-version: 1.0.1
+version: 2.0.0
 appVersion: 1.16
 description: Google Cloud SQL Proxy
 keywords:

cloudsql-proxy/templates/_helpers.tpl

@@ -46,16 +46,16 @@ Create the name of the service account to use
 Common labels
 */}}
 {{- define "cloudsql-proxy.labels" -}}
-app: {{ include "cloudsql-proxy.name" . }}
-chart: {{ include "cloudsql-proxy.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "cloudsql-proxy.name" . }}
+helm.sh/chart: {{ include "cloudsql-proxy.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "cloudsql-proxy.selector" -}}
-app: {{ include "cloudsql-proxy.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "cloudsql-proxy.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}

dashkiosk/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: mysql-backup
+  repository: https://storage.googleapis.com/t3n-helm-charts
+  version: 1.0.1
+digest: sha256:573253265941c108c8d212f8953c201593e10fc8d749c1c4cda459047a70cff8
+generated: "2020-06-18T13:16:47.360229577+02:00"

dashkiosk/Chart.yaml

@@ -1,5 +1,11 @@
-apiVersion: v1
+apiVersion: v2
 name: dashkiosk
 description: Managing dashboards on various displays (especially those running on Android)
-version: 1.0.0
+version: 2.0.0
 appVersion: 2.7.8
+
+dependencies:
+- name: mysql-backup
+  version: ~1.0.1
+  condition: mysql-backup.enabled
+  repository: https://storage.googleapis.com/t3n-helm-charts

dashkiosk/templates/_helpers.tpl

@@ -35,16 +35,16 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "dashkiosk.labels" -}}
-app: {{ include "dashkiosk.name" . }}
-chart: {{ include "dashkiosk.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "dashkiosk.name" . }}
+helm.sh/chart: {{ include "dashkiosk.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "dashkiosk.selector" -}}
-app: {{ include "dashkiosk.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "dashkiosk.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}

dashkiosk/templates/ingress.yaml

@@ -1,7 +1,11 @@
 {{- if .Values.ingress.enabled }}
 {{- $fullName := .Chart.Name }}
 {{- $ingressPath := .Values.ingress.path }}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
 apiVersion: extensions/v1beta1
+{{- end }}
 kind: Ingress
 metadata:
   name: {{ include "dashkiosk.fullname" . }}

external-service/Chart.yaml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 name: external-service
 description: Easily manage external services
-version: 0.2.1
+version: 1.0.0

external-service/templates/_helpers.tpl

@@ -35,8 +35,8 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "external-service.labels" -}}
-app: {{ include "external-service.name" . }}
-chart: {{ include "external-service.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "external-service.name" . }}
+helm.sh/chart: {{ include "external-service.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}

fop/Chart.yaml

@@ -1,5 +1,5 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "2.1"
 description: A Helm chart for Apache-FOP HTTP
 name: fop
-version: 0.3.1
+version: 1.0.0

fop/templates/_helpers.tpl

@@ -35,16 +35,16 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "fop.labels" -}}
-app: {{ include "fop.name" . }}
-chart: {{ include "fop.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "fop.name" . }}
+helm.sh/chart: {{ include "fop.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "fop.selector" -}}
-app: {{ include "fop.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "fop.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}

gtmetrix-bq/Chart.yaml

@@ -1,5 +1,5 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "0.2.0"
 description: A script running browser test of specified urls through GTmetrix and saving metrics in BigQuery.
 name: gtmetrix-bq
-version: 0.1.2
+version: 1.0.0

gtmetrix-bq/templates/_helpers.tpl

@@ -35,16 +35,16 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "gtmetrix-bq.labels" -}}
-app: {{ include "gtmetrix-bq.name" . }}
-chart: {{ include "gtmetrix-bq.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "gtmetrix-bq.name" . }}
+helm.sh/chart: {{ include "gtmetrix-bq.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "gtmetrix-bq.selector" -}}
-app: {{ include "gtmetrix-bq.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "gtmetrix-bq.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}

loki/Chart.yaml

@@ -1,5 +1,5 @@
-apiVersion: v1
+apiVersion: v2
 name: loki
-version: 0.3.0
+version: 1.0.0
 appVersion: 1.5.0
-desciption: simplefied upstream chart
+desciption: simplified upstream chart

loki/templates/_helpers.tpl

@@ -35,16 +35,16 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "loki.labels" -}}
-app: {{ include "loki.name" . }}
-chart: {{ include "loki.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "loki.name" . }}
+helm.sh/chart: {{ include "loki.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "loki.selector" -}}
-app: {{ include "loki.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "loki.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}

mosquitto/Chart.yaml

@@ -1,5 +1,5 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "1.6"
 description: Eclipse Mosquitto is an open source message broker which implements MQTT version 5, 3.1.1 and 3.1
 name: mosquitto
-version: 0.1.1
+version: 1.0.0

mosquitto/templates/_helpers.tpl

@@ -35,18 +35,18 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "mosquitto.labels" -}}
-app: {{ include "mosquitto.name" . }}
-chart: {{ include "mosquitto.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "mosquitto.name" . }}
+helm.sh/chart: {{ include "mosquitto.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "mosquitto.selector" -}}
-app: {{ include "mosquitto.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "mosquitto.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*

mysql-backup/Chart.yaml

@@ -1,3 +1,3 @@
-apiVersion: v1
+apiVersion: v2
 name: mysql-backup
-version: 1.1.0
+version: 2.0.0

mysql-backup/templates/_helpers.tpl

@@ -48,16 +48,16 @@ Create filename
 Common labels
 */}}
 {{- define "mysql-backup.labels" -}}
-app: {{ include "mysql-backup.name" . }}
-chart: {{ include "mysql-backup.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "mysql-backup.name" . }}
+helm.sh/chart: {{ include "mysql-backup.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "mysql-backup.selector" -}}
-app: {{ include "mysql-backup.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "mysql-backup.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}

pi-hole/Chart.yaml

@@ -1,5 +1,5 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "4.4"
 description: A black hole for Internet advertisements
 name: pi-hole
-version: 0.1.1
+version: 1.0.0

pi-hole/templates/_helpers.tpl

@@ -35,18 +35,18 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "pi-hole.labels" -}}
-app: {{ include "pi-hole.name" . }}
-chart: {{ include "pi-hole.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "pi-hole.name" . }}
+helm.sh/chart: {{ include "pi-hole.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "pi-hole.selector" -}}
-app: {{ include "pi-hole.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "pi-hole.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*

promtail/Chart.yaml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 name: promtail
-version: 0.2.0
+version: 1.0.0
 desciption: simplefied upstream chart

promtail/templates/_helpers.tpl

@@ -46,16 +46,16 @@ Create the name of the service account
 Common labels
 */}}
 {{- define "promtail.labels" -}}
-app: {{ include "promtail.name" . }}
-chart: {{ include "promtail.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "promtail.name" . }}
+helm.sh/chart: {{ include "promtail.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "promtail.selector" -}}
-app: {{ include "promtail.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "promtail.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}

python/Chart.yaml

@@ -1,3 +1,13 @@
-apiVersion: v1
+apiVersion: v2
 name: python
 version: 1.0.0
+
+dependencies:
+- name: redis-ha
+  version: ~3.11.0
+  repository: https://kubernetes-charts.storage.googleapis.com/
+  condition: redis.enabled
+- name: postgresql
+  version: ~8.6.0
+  repository: https://kubernetes-charts.storage.googleapis.com/
+  condition: postgresql.enabled