From 7472a0bc722081881f2bacf9a76207cd597478ed Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 30 Jan 2020 17:20:15 +0100
Subject: [PATCH] Add labels following Helm best practices

- There are 4 recommended labels, and one optional that were added.
- Source, https://helm.sh/docs/topics/chart_best_practices/labels/
---
 .../templates/cluster-issuers/letsencrypt-prod.yaml         | 6 ++++++
 .../templates/cluster-issuers/letsencrypt-staging.yaml      | 6 ++++++
 .../templates/deployments/deployment-backend.yaml           | 6 ++++++
 .../templates/deployments/deployment-mailserver.yaml        | 6 ++++++
 .../templates/deployments/deployment-maintenance.yaml       | 6 ++++++
 .../templates/deployments/deployment-neo4j.yaml             | 6 ++++++
 .../templates/deployments/deployment-web.yaml               | 6 ++++++
 .../templates/ingress/ingress.template.yaml                 | 6 ++++++
 .../human-connection/templates/jobs/job-db-migration.yaml   | 6 ++++++
 .../templates/services/service-backend.yaml                 | 6 ++++++
 .../templates/services/service-mailserver.yaml              | 6 ++++++
 .../templates/services/service-maintenance.yaml             | 6 ++++++
 .../human-connection/templates/services/service-neo4j.yaml  | 6 ++++++
 .../human-connection/templates/services/service-webapp.yaml | 6 ++++++
 14 files changed, 84 insertions(+)

diff --git a/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml b/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml
index 65bd160e1..ac11e76b8 100644
--- a/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml
+++ b/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml
@@ -2,6 +2,12 @@ apiVersion: cert-manager.io/v1alpha2
 kind: ClusterIssuer
 metadata:
   name: letsencrypt-prod
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   acme:
     server: https://acme-v02.api.letsencrypt.org/directory
diff --git a/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml b/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml
index f8315c9be..cc9d9fdd7 100644
--- a/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml
+++ b/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml
@@ -2,6 +2,12 @@ apiVersion: cert-manager.io/v1alpha2
 kind: ClusterIssuer
 metadata:
   name: letsencrypt-staging
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   acme:
     server: https://acme-staging-v02.api.letsencrypt.org/directory
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
index ad5a26473..61e0b22a2 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
@@ -2,6 +2,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-backend
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   replicas: 1
   minReadySeconds: 15
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml b/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
index 13fa63521..11491163f 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
@@ -3,6 +3,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-mailserver
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   replicas: 1
   minReadySeconds: 15
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml b/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml
index ee877f16e..86b3fbd4e 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml
@@ -2,6 +2,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-maintenance
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   selector:
     matchLabels:
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml b/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
index 195e57b5a..04b58953a 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
@@ -2,6 +2,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-neo4j
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   replicas: 1
   strategy:
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-web.yaml b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
index 3ec56e5bc..30f3ffd16 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
@@ -2,6 +2,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-webapp
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   replicas: 2
   minReadySeconds: 15
diff --git a/deployment/helm/human-connection/templates/ingress/ingress.template.yaml b/deployment/helm/human-connection/templates/ingress/ingress.template.yaml
index d5ec3c1af..eb8dd65be 100644
--- a/deployment/helm/human-connection/templates/ingress/ingress.template.yaml
+++ b/deployment/helm/human-connection/templates/ingress/ingress.template.yaml
@@ -2,6 +2,12 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name:  {{ .Release.Name }}-ingress
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
   annotations:
     kubernetes.io/ingress.class: "nginx"
     cert-manager.io/cluster-issuer: {{ .Values.letsencryptIssuer }}
diff --git a/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml b/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml
index 782d54aa3..675bcf344 100644
--- a/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml
+++ b/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml
@@ -2,6 +2,12 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ .Release.Name }}-db-migrations
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
   annotations:
     "helm.sh/hook": post-upgrade
     "helm.sh/hook-weight": "0"
diff --git a/deployment/helm/human-connection/templates/services/service-backend.yaml b/deployment/helm/human-connection/templates/services/service-backend.yaml
index b9d40ef8a..af23e6910 100644
--- a/deployment/helm/human-connection/templates/services/service-backend.yaml
+++ b/deployment/helm/human-connection/templates/services/service-backend.yaml
@@ -2,6 +2,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ .Release.Name }}-backend
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   ports:
     - name: graphql
diff --git a/deployment/helm/human-connection/templates/services/service-mailserver.yaml b/deployment/helm/human-connection/templates/services/service-mailserver.yaml
index e5e22aa37..685becb1d 100644
--- a/deployment/helm/human-connection/templates/services/service-mailserver.yaml
+++ b/deployment/helm/human-connection/templates/services/service-mailserver.yaml
@@ -3,6 +3,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Release.Name }}-mailserver
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   ports:
   - name: web
diff --git a/deployment/helm/human-connection/templates/services/service-maintenance.yaml b/deployment/helm/human-connection/templates/services/service-maintenance.yaml
index a82473e2e..d641ca8ba 100644
--- a/deployment/helm/human-connection/templates/services/service-maintenance.yaml
+++ b/deployment/helm/human-connection/templates/services/service-maintenance.yaml
@@ -2,6 +2,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ .Release.Name }}-maintenance
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   ports:
     - name: web
diff --git a/deployment/helm/human-connection/templates/services/service-neo4j.yaml b/deployment/helm/human-connection/templates/services/service-neo4j.yaml
index 547dad6c7..f5c7d5b38 100644
--- a/deployment/helm/human-connection/templates/services/service-neo4j.yaml
+++ b/deployment/helm/human-connection/templates/services/service-neo4j.yaml
@@ -2,6 +2,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ .Release.Name }}-neo4j
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   ports:
   - name: bolt
diff --git a/deployment/helm/human-connection/templates/services/service-webapp.yaml b/deployment/helm/human-connection/templates/services/service-webapp.yaml
index 99677aa05..d762c2a55 100644
--- a/deployment/helm/human-connection/templates/services/service-webapp.yaml
+++ b/deployment/helm/human-connection/templates/services/service-webapp.yaml
@@ -2,6 +2,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ .Release.Name }}-webapp
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   ports:
     - name: {{ .Release.Name }}-webapp