feat(helm): merge registryMonitors.items default values with user supplied values and make it a dict instead of an array

Author: plaffitt

helm/kube-image-keeper/templates/registrymonitors.yaml

@@ -1,13 +1,14 @@
 {{- $defaultSpec := .Values.registryMonitors.defaultSpec }}
-{{- range .Values.registryMonitors.items }}
+{{- range $registry, $value := .Values.registryMonitors.items }}
+{{- $spec := $value | default dict }}
 apiVersion: kuik.enix.io/v1alpha1
 kind: RegistryMonitor
 metadata:
-  name: {{ .name | default .registry }}
+  name: {{ $spec.name | default (regexReplaceAll "^[-\\.]+|[-\\.]+$" (regexReplaceAll "[.-]{2,}" (regexReplaceAll "[^a-z0-9-.]" ($registry | lower) "-") "-") "") }}
 spec:
-  registry: {{ .registry }}
-  interval: {{ .interval | default $defaultSpec.interval }}
-  maxPerInterval: {{ .maxPerInterval | default $defaultSpec.maxPerInterval }}
-  parallel: {{ .parallel | default $defaultSpec.parallel }}
+  registry: {{ $registry }}
+  interval: {{ $spec.interval | default $defaultSpec.interval }}
+  maxPerInterval: {{ $spec.maxPerInterval | default $defaultSpec.maxPerInterval }}
+  parallel: {{ $spec.parallel | default $defaultSpec.parallel }}
 ---
 {{- end }}

helm/kube-image-keeper/values.yaml

@@ -96,12 +96,11 @@ registryMonitors:
     parallel: 10
   # -- RegistryMonitors to create on install and upgrade, if name is not provided, defaults to registry value.
   items:
-    - name: docker.io
-      registry: docker.io
+    docker.io:
       interval: 1h
       maxPerInterval: 2
       parallel: 2
-    - registry: quay.io
-    - registry: ghcr.io
-    - registry: registry.k8s.io
-    - registry: public.ecr.aws
+    quay.io: {}
+    ghcr.io: {}
+    registry.k8s.io: {}
+    public.ecr.aws: {}