Merge pull request #117 from nobbs/chore/sync-deploy-and-statefulset-…

…manifest style: refactor deployment and statefulset to be more similar
dirsigler · Aug 22, 2023 · ee6f420 · ee6f420
2 parents a1bdfdd + 7a9f101
commit ee6f420
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/charts/uptime-kuma/Chart.yaml b/charts/uptime-kuma/Chart.yaml
@@ -11,4 +11,4 @@ name: uptime-kuma
 sources:
   - https://github.com/louislam/uptime-kuma
 type: application
-version: 2.10.1
+version: 2.10.2
diff --git a/charts/uptime-kuma/README.md b/charts/uptime-kuma/README.md
@@ -1,6 +1,6 @@
 # uptime-kuma
 
-![Version: 2.10.0](https://img.shields.io/badge/Version-2.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.21.3](https://img.shields.io/badge/AppVersion-1.21.3-informational?style=flat-square)
+![Version: 2.10.2](https://img.shields.io/badge/Version-2.10.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.23.0](https://img.shields.io/badge/AppVersion-1.23.0-informational?style=flat-square)
 
 A self-hosted Monitoring tool like "Uptime-Robot".
 
@@ -24,7 +24,7 @@ A self-hosted Monitoring tool like "Uptime-Robot".
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"louislam/uptime-kuma"` |  |
-| image.tag | string | `"1.21.3-debian"` |  |
+| image.tag | string | `"1.23.0-debian"` |  |
 | imagePullSecrets | list | `[]` |  |
 | ingress.annotations."nginx.ingress.kubernetes.io/proxy-read-timeout" | string | `"3600"` |  |
 | ingress.annotations."nginx.ingress.kubernetes.io/proxy-send-timeout" | string | `"3600"` |  |
@@ -74,3 +74,6 @@ A self-hosted Monitoring tool like "Uptime-Robot".
 | volume.enabled | bool | `true` |  |
 | volume.existingClaim | string | `""` |  |
 | volume.size | string | `"4Gi"` |  |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
diff --git a/charts/uptime-kuma/templates/deployment.yaml b/charts/uptime-kuma/templates/deployment.yaml
@@ -10,6 +10,9 @@ spec:
   selector:
     matchLabels:
       {{- include "uptime-kuma.selectorLabels" . | nindent 6 }}
+      {{- if .Values.podLabels }}
+        {{- toYaml .Values.podLabels | nindent 6 }}
+      {{- end }}
   {{- with .Values.strategy }}
   strategy:
     {{- toYaml . | nindent 4 }}
@@ -22,6 +25,9 @@ spec:
       {{- end }}
       labels:
         {{- include "uptime-kuma.selectorLabels" . | nindent 8 }}
+        {{- if .Values.podLabels }}
+          {{- toYaml .Values.podLabels | nindent 8 }}
+        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -48,23 +54,23 @@ spec:
           volumeMounts:
             - mountPath: /app/data
               name: storage
-          {{ end }}
-          {{ if .Values.livenessProbe.enabled -}}
+          {{- end }}
+          {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             exec:
               command:
                 - extra/healthcheck
             timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds}}
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds}}
-          {{ end }}  
-          {{ if .Values.readinessProbe.enabled -}}  
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
               path: /
               port: 3001
               scheme: HTTP
             initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds}}
-          {{ end }}  
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
@@ -83,7 +89,7 @@ spec:
       volumes:
       - name: storage
         persistentVolumeClaim:
-          {{- if not .Values.volume.existingClaim }}   
+          {{- if not .Values.volume.existingClaim }}
           claimName: {{ include "uptime-kuma.fullname" . }}-pvc
           {{- else }}
           claimName: {{ .Values.volume.existingClaim }}

diff --git a/charts/uptime-kuma/templates/statefulset.yaml b/charts/uptime-kuma/templates/statefulset.yaml
@@ -12,7 +12,7 @@ spec:
     matchLabels:
       {{- include "uptime-kuma.selectorLabels" . | nindent 6 }}
       {{- if .Values.podLabels }}
-{{ toYaml .Values.podLabels | indent 6 }}
+        {{- toYaml .Values.podLabels | nindent 6 }}
       {{- end }}
   template:
     metadata:
@@ -23,7 +23,7 @@ spec:
       labels:
         {{- include "uptime-kuma.selectorLabels" . | nindent 8 }}
         {{- if .Values.podLabels }}
-{{ toYaml .Values.podLabels | indent 8 }}
+          {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
@@ -52,19 +52,23 @@ spec:
           volumeMounts:
             - mountPath: /app/data
               name: storage
-          {{ end }}
+          {{- end }}
+          {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             exec:
               command:
                 - extra/healthcheck
             timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds}}
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds}}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
               path: /
               port: 3001
               scheme: HTTP
             initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds}}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
@@ -93,4 +97,4 @@ spec:
         storageClassName: {{ . }}
         {{- end }}
   {{- end -}}
-{{- end -}}
+{{- end -}}