feat(helm): allow to use S3 or minio storage backends without HA enabled

Author: plaffitt

helm/kube-image-keeper/templates/_helpers.tpl

@@ -110,6 +110,6 @@ Create the name of the service account to use
 {{- default (printf "%s-%s" (include "kube-image-keeper.fullname" .) "controllers") .Values.serviceAccount.name }}
 {{- end }}
 
-{{- define "kube-image-keeper.registry-ha-mode" -}}
-{{- ternary "true" "false" (gt (int .Values.registry.replicas) 1) }}
+{{- define "kube-image-keeper.registry-stateless-mode" -}}
+{{- ternary "true" "false" (or .Values.minio.enabled (not (empty .Values.registry.persistence.s3))) }}
 {{- end }}

helm/kube-image-keeper/templates/garbage-collection-cron-job.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.registry.garbageCollectionSchedule (or .Values.registry.persistence.enabled (eq (include "kube-image-keeper.registry-ha-mode" .) "true")) }}
+{{- if and .Values.registry.garbageCollectionSchedule (or .Values.registry.persistence.enabled (eq (include "kube-image-keeper.registry-stateless-mode" .) "true")) }}
 {{- if semverCompare ">=1.21-0" (default .Capabilities.KubeVersion.Version .Values.kubeVersion) -}}
 apiVersion: batch/v1
 {{- else -}}
@@ -28,7 +28,7 @@ spec:
                 - -c
                 - |
                   set -e
-                  {{- if eq (include "kube-image-keeper.registry-ha-mode" .) "true" }}
+                  {{- if eq (include "kube-image-keeper.registry-stateless-mode" .) "true" }}
                   kubectl set env deploy {{ include "kube-image-keeper.fullname" . }}-registry REGISTRY_STORAGE_MAINTENANCE_READONLY="{\"enabled\":true}"
 
                   # wait for deployment to berolled out and terminated pods to be deleted to prevent exec’ing into a terminating pod (see https://binx.io/2022/01/18/how-to-run-a-post-deployment-script-on-kubernetes/)

helm/kube-image-keeper/templates/minio-registry-keys.yaml

@@ -1,4 +1,4 @@
-{{- if and (eq (include "kube-image-keeper.registry-ha-mode" .) "true") .Values.minio.enabled }}
+{{- if .Values.minio.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:

helm/kube-image-keeper/templates/minio-registry-users.yaml

@@ -1,4 +1,4 @@
-{{- if and (eq (include "kube-image-keeper.registry-ha-mode" .) "true") .Values.minio.enabled }}
+{{- if .Values.minio.enabled }}
 
 {{- $secretName := printf "%s-%s" (include "kube-image-keeper.fullname" .) "minio-passwords" }}
 {{- $secretData := (get (lookup "v1" "Secret" .Release.Namespace $secretName) "data") | default dict }}

helm/kube-image-keeper/templates/registry-deployment.yaml

@@ -1,9 +1,4 @@
-{{- if eq (include "kube-image-keeper.registry-ha-mode" .) "true" }}
-
-{{- if and (eq (include "kube-image-keeper.registry-ha-mode" .) "true") (and (not .Values.minio.enabled) (empty .Values.registry.persistence.s3)) -}}
-{{ fail "registry needs a configured S3 endpoint to enable HA mode (>1 replicas), please enable minio or configure an external S3 endpoint" }}
-{{- end }}
-
+{{- if eq (include "kube-image-keeper.registry-stateless-mode" .) "true" }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

helm/kube-image-keeper/templates/registry-http-secret.yaml

@@ -1,4 +1,4 @@
-{{- if eq (include "kube-image-keeper.registry-ha-mode" .) "true" }}
+{{- if eq (include "kube-image-keeper.registry-stateless-mode" .) "true" }}
 apiVersion: v1
 kind: Secret
 metadata:

helm/kube-image-keeper/templates/registry-statefulset.yaml

@@ -1,4 +1,9 @@
-{{- if eq (include "kube-image-keeper.registry-ha-mode" .) "false" }}
+{{- if eq (include "kube-image-keeper.registry-stateless-mode" .) "false" }}
+
+{{- if gt (int .Values.registry.replicas) 1 -}}
+{{ fail "registry needs a configured S3 endpoint to enable HA mode (>1 replicas), please enable minio or configure an external S3 endpoint" }}
+{{- end }}
+
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:

helm/kube-image-keeper/templates/s3-registry-keys.yaml

@@ -1,4 +1,4 @@
-{{- if and (eq (include "kube-image-keeper.registry-ha-mode" .) "true") (not .Values.minio.enabled) }}
+{{- if not (empty .Values.registry.persistence.s3) }}
 apiVersion: v1
 kind: Secret
 metadata: