Merge pull request #54 from WyriHaximusNet/use-commons-labels-on-the-…

…other-charts Use commons labels on the application charts
WyriHaximusNet · Dec 12, 2020 · 707e65a · 707e65a
2 parents fc9145c + b504d78
commit 707e65a
Show file tree

Hide file tree

Showing 64 changed files with 194 additions and 573 deletions.
diff --git a/charts/commento/Chart.lock b/charts/commento/Chart.lock
@@ -1,6 +1,9 @@
 dependencies:
+- name: commons
+  repository: https://helm.wyrihaximus.net/
+  version: 0.1.0
 - name: horizontal-pod-autoscalers
   repository: https://helm.wyrihaximus.net/
   version: 0.2.0
-digest: sha256:c24acf3aaf1d76d5b431e2d608ee5162acf6e5bb0ad764b2a3cf81e37bb499bf
-generated: "2020-11-13T22:49:13.62060267+01:00"
+digest: sha256:05017e6af7c52308e69f1e7769366c66e1e8194661b08792b1d1bb24b2ba49de
+generated: "2020-12-09T22:30:21.6534143+01:00"
diff --git a/charts/commento/Chart.yaml b/charts/commento/Chart.yaml
@@ -4,11 +4,14 @@ description: Helm chart to install commento on a kubernetes cluster
 home: https://commento.io/
 icon: https://cdn.commento.io/images/logo.svg
 name: commento
-version: 0.1.1
+version: 0.1.2
 maintainers:
   - name: WyriHaximus
     email: [email protected]
 dependencies:
+  - name: commons
+    version: ^0.1
+    repository: https://helm.wyrihaximus.net/
   - name: horizontal-pod-autoscalers
     version: ^0.2
     repository: https://helm.wyrihaximus.net/
diff --git a/charts/commento/templates/_helpers.tpl b/charts/commento/templates/_helpers.tpl
diff --git a/charts/commento/templates/deployment.yaml b/charts/commento/templates/deployment.yaml
@@ -1,23 +1,18 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "commento.fullname" . }}
+  name: {{ template "commons.fullname" . }}
   labels:
-    app: {{ template "commento.name" . }}
-    chart: {{ template "commento.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    {{- include "commons.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicas }}
   selector:
     matchLabels:
-      app: {{ template "commento.name" . }}
-      release: {{ .Release.Name }}
+      {{- include "commons.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ template "commento.name" . }}
-        release: {{ .Release.Name }}
+        {{- include "commons.labels" . | nindent 8 }}
     spec:
       containers:
         - name: commento

diff --git a/charts/commento/templates/horizontal-pod-autoscaler.yaml b/charts/commento/templates/horizontal-pod-autoscaler.yaml
@@ -1,3 +1,3 @@
 {{- if .Values.hpa.enable -}}
-{{- include "horizontal-pod-autoscalers.hpa" (dict "name" (include "commento.fullname" .) "replicas" (dict "min" .Values.replicas "max" .Values.hpa.maxReplicas)) -}}
+{{- include "horizontal-pod-autoscalers.hpa" (dict "name" (include "commons.fullname" .) "replicas" (dict "min" .Values.replicas "max" .Values.hpa.maxReplicas)) -}}
 {{ end }}
diff --git a/charts/commento/templates/ingress.yaml b/charts/commento/templates/ingress.yaml
@@ -1,15 +1,12 @@
 {{- if eq (eq .Values.ingress.host "comments.YOURDOMAIN.TLD") false }}
 {{- $chartName := .Chart.Name -}}
-{{- $fullName := include "commento.fullname" . -}}
+{{- $fullName := include "commons.fullname" . -}}
 apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels:
-    app: {{ template "commento.name" . }}
-    chart: {{ template "commento.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    {{- include "commons.labels" . | nindent 4 }}
 {{- with .Values.ingress.annotations }}
   annotations:
 {{ toYaml . | indent 4 }}

diff --git a/charts/commento/templates/pod-disruption-budget.yaml b/charts/commento/templates/pod-disruption-budget.yaml
@@ -2,11 +2,10 @@
 apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
-  name: {{ template "commento.fullname" . }}-pdb
+  name: {{ template "commons.fullname" . }}
 spec:
   maxUnavailable: 1
   selector:
     matchLabels:
-      app: {{ include "commento.fullname" . }}
-      release: {{ include "commento.fullname" . }}
+      {{- include "commons.selectorLabels" . | nindent 6 }}
 {{ end }}
diff --git a/charts/commento/templates/service.yaml b/charts/commento/templates/service.yaml
@@ -1,12 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "commento.fullname" . }}
+  name: {{ template "commons.fullname" . }}
   labels:
-    app: {{ template "commento.name" . }}
-    chart: {{ template "commento.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    {{- include "commons.labels" . | nindent 4 }}
 spec:
   type: ClusterIP
   ports:
@@ -15,5 +12,4 @@ spec:
       protocol: TCP
       name: commento
   selector:
-    app: {{ template "commento.name" . }}
-    release: {{ .Release.Name }}
+    {{- include "commons.selectorLabels" . | nindent 6 }}
diff --git a/charts/commento/templates/tests/test-connection.yaml b/charts/commento/templates/tests/test-connection.yaml
@@ -1,18 +1,15 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ include "commento.fullname" . }}-test-connection"
+  name: "{{ include "commons.fullname" . }}-test-connection"
   labels:
-    app: {{ template "commento.name" . }}
-    chart: {{ template "commento.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    {{- include "commons.labels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": test-success
 spec:
   containers:
     - name: wget
       image: busybox
       command: ['wget']
-      args:  ['{{ include "commento.fullname" . }}:8967/login']
+      args:  ['{{ include "commons.fullname" . }}:8967/login']
   restartPolicy: Never
diff --git a/charts/default-backend/Chart.lock b/charts/default-backend/Chart.lock
@@ -1,9 +1,12 @@
 dependencies:
+- name: commons
+  repository: https://helm.wyrihaximus.net/
+  version: 0.1.0
 - name: cron-jobs
   repository: https://helm.wyrihaximus.net/
   version: 0.1.2
 - name: horizontal-pod-autoscalers
   repository: https://helm.wyrihaximus.net/
   version: 0.2.0
-digest: sha256:da3cabd092499f75f425706a7faae76bdefe5a54d805628ea48a3b769e8cbf2b
-generated: "2020-10-21T20:34:40.497024599+02:00"
+digest: sha256:9311081e2d53beca7cf5d1bf74a8f755085bbaafec6c1ae2efee4afd6c1b30a5
+generated: "2020-12-09T23:59:39.5032794+01:00"
diff --git a/charts/default-backend/Chart.yaml b/charts/default-backend/Chart.yaml
@@ -4,13 +4,16 @@ description: A Helm chart for Kubernetes
 home: https://github.com/wyrihaximusnet/docker-default-backend
 icon: https://helm.wyrihaximus.net/images/charts/default-backend.png
 type: application
-version: 0.4.2
+version: 0.4.3
 kubeVersion: ^1.18
 appVersion: random
 maintainers:
   - name: WyriHaximus
     email: [email protected]
 dependencies:
+  - name: commons
+    version: ^0.1
+    repository: https://helm.wyrihaximus.net/
   - name: cron-jobs
     version: ^0.1
     repository: https://helm.wyrihaximus.net/

diff --git a/charts/default-backend/templates/_helpers.tpl b/charts/default-backend/templates/_helpers.tpl
diff --git a/charts/default-backend/templates/cronjob-role-binding.yaml b/charts/default-backend/templates/cronjob-role-binding.yaml
@@ -2,19 +2,16 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ include "default-backend.fullname" . }}-recycle-cronjob
+  name: {{ include "commons.fullname" . }}-recycle-cronjob
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "default-backend.fullname" . }}
-    appRevision: {{ template "default-backend.nameRevision" . }}
-    release: {{ include "default-backend.fullname" . }}
-    releaseRevision: {{ .Release.Revision | quote }}
+    {{- include "commons.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ include "default-backend.fullname" . }}-recycle-cronjob
+  name: {{ include "commons.fullname" . }}-recycle-cronjob
 subjects:
   - kind: ServiceAccount
-    name: {{ include "default-backend.fullname" . }}-recycle-cronjob
+    name: {{ include "commons.fullname" . }}-recycle-cronjob
     namespace: {{ .Release.Namespace }}
 {{ end }}
diff --git a/charts/default-backend/templates/cronjob-role.yaml b/charts/default-backend/templates/cronjob-role.yaml
@@ -2,13 +2,10 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ include "default-backend.fullname" . }}-recycle-cronjob
+  name: {{ include "commons.fullname" . }}-recycle-cronjob
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "default-backend.fullname" . }}
-    appRevision: {{ template "default-backend.nameRevision" . }}
-    release: {{ include "default-backend.fullname" . }}
-    releaseRevision: {{ .Release.Revision | quote }}
+    {{- include "commons.labels" . | nindent 4 }}
 rules:
 - apiGroups: [""]
   resources: ["pods"]

diff --git a/charts/default-backend/templates/cronjob-service-account.yaml b/charts/default-backend/templates/cronjob-service-account.yaml
@@ -2,12 +2,8 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "default-backend.fullname" . }}-recycle-cronjob
+  name: {{ include "commons.fullname" . }}-recycle-cronjob
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "default-backend.fullname" . }}
-    appRevision: {{ template "default-backend.nameRevision" . }}
-    release: {{ include "default-backend.fullname" . }}
-    releaseRevision: {{ .Release.Revision | quote }}
-    {{- include "default-backend.labels" . | nindent 4 }}
+    {{- include "commons.labels" . | nindent 4 }}
 {{ end }}
diff --git a/charts/default-backend/templates/cronjob.yaml b/charts/default-backend/templates/cronjob.yaml
@@ -1,3 +1,3 @@
 {{- if .Values.cron.replaceOldestPodHourly -}}
-{{- include "cron-jobs.cronjob" (fromYaml (.Files.Get "values/cronjob.yaml" | replace "[[fullname]]" (include "default-backend.fullname" .) | replace "[[app]]" (include "default-backend.name" .) | replace "[[release]]" .Release.Name | replace "[[namespace]]" .Release.Namespace)) -}}
+{{- include "cron-jobs.cronjob" (fromYaml (.Files.Get "values/cronjob.yaml" | replace "[[fullname]]" (include "commons.fullname" .) | replace "[[app]]" (include "commons.name" .) | replace "[[release]]" .Release.Name | replace "[[namespace]]" .Release.Namespace)) -}}
 {{ end }}
diff --git a/charts/default-backend/templates/deployment.yaml b/charts/default-backend/templates/deployment.yaml
@@ -1,31 +1,22 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "default-backend.fullname" . }}
+  name: {{ template "commons.fullname" . }}
   labels:
-    app: {{ template "default-backend.name" . }}
-    appRevision: {{ template "default-backend.nameRevision" . }}
-    chart: {{ template "default-backend.chart" . }}
-    release: {{ .Release.Name }}
-    releaseRevision: {{ .Release.Revision | quote }}
-    heritage: {{ .Release.Service }}
+    {{- include "commons.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
 spec:
   selector:
     matchLabels:
-      app: {{ template "default-backend.name" . }}
-      release: {{ .Release.Name }}
+      {{- include "commons.selectorLabels" . | nindent 6 }}
   replicas: {{ .Values.replicas }}
   template:
     metadata:
       annotations:
         prometheus.io/scrape: "true"
         prometheus.io/port: "9696"
       labels:
-        app: {{ template "default-backend.name" . }}
-        appRevision: {{ template "default-backend.nameRevision" . }}
-        release: {{ .Release.Name }}
-        releaseRevision: {{ .Release.Revision | quote }}
+        {{- include "commons.labels" . | nindent 8 }}
     spec:
       containers:
         - name: default-backend
@@ -64,5 +55,5 @@ spec:
               - key: appRevision
                 operator: In
                 values:
-                - {{ template "default-backend.nameRevision" . }}
+                - {{ template "commons.nameRevision" . }}
             topologyKey: "kubernetes.io/hostname"
diff --git a/charts/default-backend/templates/horizontal-pod-autoscaler.yaml b/charts/default-backend/templates/horizontal-pod-autoscaler.yaml
@@ -1,3 +1,3 @@
 {{- if .Values.hpa.enable -}}
-{{- include "horizontal-pod-autoscalers.hpa" (dict "name" (include "default-backend.fullname" .) "replicas" (dict "min" .Values.replicas "max" .Values.hpa.maxReplicas)) -}}
+{{- include "horizontal-pod-autoscalers.hpa" (dict "name" (include "commons.fullname" .) "replicas" (dict "min" .Values.replicas "max" .Values.hpa.maxReplicas)) -}}
 {{ end }}
diff --git a/charts/default-backend/templates/ingress.yaml b/charts/default-backend/templates/ingress.yaml
@@ -1,16 +1,12 @@
 {{- if not (empty .Values.ingress.hosts) -}}
 {{- $chartName := .Chart.Name -}}
-{{- $fullName := include "default-backend.fullname" . -}}
+{{- $fullName := include "commons.fullname" . -}}
 apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels:
-    app: {{ template "default-backend.name" . }}
-    chart: {{ template "default-backend.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-    releaseRevision: {{ .Release.Revision | quote }}
+    {{- include "commons.labels" . | nindent 4 }}
 {{- with .Values.ingress.annotations }}
   annotations:
 {{ toYaml . | indent 4 }}