chore(netbox): add healthchecks (#5439)

* chore(netbox): add healthchecks * smooth upgrade
2022-12-16 22:21:56 +02:00 · 2022-12-16 22:21:56 +02:00 · 70b534e25b
parent e09dfe58f1
commit 70b534e25b
9 changed files with 73 additions and 19 deletions
--- a/charts/incubator/netbox/Chart.yaml
+++ b/charts/incubator/netbox/Chart.yaml
@ -27,7 +27,7 @@ name: netbox
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/incubator/netbox
  - https://github.com/netbox-community/netbox-docker
-version: 3.0.12
+version: 3.0.13
 annotations:
  truecharts.org/catagories: |
    - network
--- a/charts/incubator/netbox/templates/_housekeeper.tpl
+++ b/charts/incubator/netbox/templates/_housekeeper.tpl
@ -30,4 +30,37 @@ volumeMounts:
  - name: configfile
    mountPath: /etc/netbox/config/01-config.py
    subPath: config.py
+readinessProbe:
+  exec:
+    command:
+      - /bin/bash
+      - -c
+      - |
+        ps -aux | grep -v grep | grep -q housekeeping || exit 1
+  initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }}
+  timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }}
+  periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }}
+  failureThreshold: {{ .Values.probes.readiness.spec.failureThreshold }}
+livenessProbe:
+  exec:
+    command:
+      - /bin/bash
+      - -c
+      - |
+        ps -aux | grep -v grep | grep -q housekeeping || exit 1
+  initialDelaySeconds: {{ .Values.probes.liveness.spec.initialDelaySeconds }}
+  timeoutSeconds: {{ .Values.probes.liveness.spec.timeoutSeconds }}
+  periodSeconds: {{ .Values.probes.liveness.spec.periodSeconds }}
+  failureThreshold: {{ .Values.probes.liveness.spec.failureThreshold }}
+startupProbe:
+  exec:
+    command:
+      - /bin/bash
+      - -c
+      - |
+        ps -aux | grep -v grep | grep -q housekeeping || exit 1
+  initialDelaySeconds: {{ .Values.probes.startup.spec.initialDelaySeconds }}
+  timeoutSeconds: {{ .Values.probes.startup.spec.timeoutSeconds }}
+  periodSeconds: {{ .Values.probes.startup.spec.periodSeconds }}
+  failureThreshold: {{ .Values.probes.startup.spec.failureThreshold }}
 {{- end -}}
--- a/charts/incubator/netbox/templates/_worker.tpl
+++ b/charts/incubator/netbox/templates/_worker.tpl
@ -29,10 +29,13 @@ volumeMounts:
  - name: configfile
    mountPath: /etc/netbox/config/01-config.py
    subPath: config.py
-{{/*readinessProbe:
+readinessProbe:
  exec:
    command:
-      - TODO: find a healthcheck
+      - /bin/bash
+      - -c
+      - |
+        ps -aux | grep -v grep | grep -q rqworker || exit 1
  initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }}
  timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }}
  periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }}
@ -40,7 +43,10 @@ volumeMounts:
 livenessProbe:
  exec:
    command:
-      - TODO: find a healthcheck
+      - /bin/bash
+      - -c
+      - |
+        ps -aux | grep -v grep | grep -q rqworker || exit 1
  initialDelaySeconds: {{ .Values.probes.liveness.spec.initialDelaySeconds }}
  timeoutSeconds: {{ .Values.probes.liveness.spec.timeoutSeconds }}
  periodSeconds: {{ .Values.probes.liveness.spec.periodSeconds }}
@ -48,9 +54,12 @@ livenessProbe:
 startupProbe:
  exec:
    command:
-      - TODO: find a healthcheck
+      - /bin/bash
+      - -c
+      - |
+        ps -aux | grep -v grep | grep -q rqworker || exit 1
  initialDelaySeconds: {{ .Values.probes.startup.spec.initialDelaySeconds }}
  timeoutSeconds: {{ .Values.probes.startup.spec.timeoutSeconds }}
  periodSeconds: {{ .Values.probes.startup.spec.periodSeconds }}
-  failureThreshold: {{ .Values.probes.startup.spec.failureThreshold }}*/}}
+  failureThreshold: {{ .Values.probes.startup.spec.failureThreshold }}
 {{- end -}}
--- a/charts/incubator/netbox/values.yaml
+++ b/charts/incubator/netbox/values.yaml
@ -14,13 +14,13 @@ podSecurityContext:
 probes:
  liveness:
    type: HTTP
-    path: /login
+    path: /api
  readiness:
    type: HTTP
-    path: /login
+    path: /api
  startup:
    type: HTTP
-    path: /login
+    path: /api
    # Gives some time for app to run db migrations
    initialDelaySeconds: 60

--- a/charts/stable/immich/Chart.yaml
+++ b/charts/stable/immich/Chart.yaml
@ -26,7 +26,7 @@ name: immich
 sources:
  - https://github.com/truecharts/charts/tree/master/charts/stable/immich
  - https://github.com/immich-app/immich
-version: 4.0.11
+version: 4.0.12
 annotations:
  truecharts.org/catagories: |
    - media
--- a/charts/stable/immich/templates/_ml.tpl
+++ b/charts/stable/immich/templates/_ml.tpl
@ -1,7 +1,11 @@
 {{/* Define the ml container */}}
 {{- define "immich.ml" -}}
-image: {{ .Values.imageML.repository }}:{{ .Values.imageML.tag }}
-imagePullPolicy: {{ .Values.imageML.pullPolicy }}
+  {{- if hasKey .Values "imageML" -}} {{/* For smooth upgrade, Remove later*/}}
+    {{- $img := .Values.imageML -}}
+    {{- $_ := set .Values "mlImage" (dict "repository" $img.repository "tag" $img.tag "pullPolicy" $img.pullPolicy) -}}
+  {{- end }}
+image: {{ .Values.mlImage.repository }}:{{ .Values.mlImage.tag }}
+imagePullPolicy: {{ .Values.mlImage.pullPolicy }}
 securityContext:
  runAsUser: {{ .Values.podSecurityContext.runAsUser }}
  runAsGroup: {{ .Values.podSecurityContext.runAsGroup }}
--- a/charts/stable/immich/templates/_proxy.tpl
+++ b/charts/stable/immich/templates/_proxy.tpl
@ -1,7 +1,11 @@
 {{/* Define the proxy container */}}
 {{- define "immich.proxy" -}}
-image: {{ .Values.imageProxy.repository }}:{{ .Values.imageProxy.tag }}
-imagePullPolicy: {{ .Values.imageProxy.pullPolicy }}
+  {{- if hasKey .Values "imageProxy" -}} {{/* For smooth upgrade, Remove later */}}
+    {{- $img := .Values.imageProxy -}}
+    {{- $_ := set .Values "proxyImage" (dict "repository" $img.repository "tag" $img.tag "pullPolicy" $img.pullPolicy) -}}
+  {{- end }}
+image: {{ .Values.proxyImage.repository }}:{{ .Values.proxyImage.tag }}
+imagePullPolicy: {{ .Values.proxyImage.pullPolicy }}
 securityContext:
  runAsUser: {{ .Values.podSecurityContext.runAsUser }}
  runAsGroup: {{ .Values.podSecurityContext.runAsGroup }}
--- a/charts/stable/immich/templates/_web.tpl
+++ b/charts/stable/immich/templates/_web.tpl
@ -1,7 +1,11 @@
 {{/* Define the web container */}}
 {{- define "immich.web" -}}
-image: {{ .Values.imageWeb.repository }}:{{ .Values.imageWeb.tag }}
-imagePullPolicy: {{ .Values.imageWeb.pullPolicy }}
+  {{- if hasKey .Values "imageWeb" -}} {{/* For smooth upgrade, Remove later */}}
+    {{- $img := .Values.imageWeb -}}
+    {{- $_ := set .Values "webImage" (dict "repository" $img.repository "tag" $img.tag "pullPolicy" $img.pullPolicy) -}}
+  {{- end }}
+image: {{ .Values.webImage.repository }}:{{ .Values.webImage.tag }}
+imagePullPolicy: {{ .Values.webImage.pullPolicy }}
 securityContext:
  runAsUser: {{ .Values.podSecurityContext.runAsUser }}
  runAsGroup: {{ .Values.podSecurityContext.runAsGroup }}
--- a/charts/stable/immich/values.yaml
+++ b/charts/stable/immich/values.yaml
@ -3,17 +3,17 @@ image:
  tag: 1.38.2_60@sha256:d1a67c3bd732f8b3fbf6f334b17d053f867ada27cbcbf2e55647dd782abf86e8
  pullPolicy: IfNotPresent

-imageML:
+mlImage:
  repository: tccr.io/truecharts/immich-ml
  tag: 1.29.5_44@sha256:2df7b6368beb52ff1ffd946aaacc4df21f278b97ee3c592e2021118b3dcb5fec
  pullPolicy: IfNotPresent

-imageWeb:
+webImage:
  repository: tccr.io/truecharts/immich-web
  tag: 1.29.5_44@sha256:c17ec4c2a174bac8fc2c58ebaedc7db70600fa2480695cf0920d54127c8bb32e
  pullPolicy: IfNotPresent

-imageProxy:
+proxyImage:
  repository: tccr.io/truecharts/immich-proxy
  tag: 1.29.5_44@sha256:a4c24a70cc1e1bbbdecc3df371af08528430846709ef22ca16e2a923aa8da509
  pullPolicy: IfNotPresent