fix(base): components name and instance

base/templates/release.yaml

@@ -1,19 +1,19 @@
-{{- range $name, $config := .Values.components }}
+{{- range $componentInstance, $config := .Values.components }}
 {{- if ($config.enabled | default false) }}
-{{- $name = $config.name | default $name }}
+{{- $componentName := $config.name | default $componentInstance }}
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: "{{ $.Release.Name }}-{{ $name }}"
+  name: "{{ $.Release.Name }}-{{ $componentInstance }}"
 spec:
   chart:
     spec:
       sourceRef:
         {{- toYaml $.Values.commons.helm.chart.sourceRef | nindent 8 }}
-      chart: "./{{ $name }}"
+      chart: "./{{ $componentName }}"
       reconcileStrategy: "Revision"
-  releaseName: "{{ $.Release.Name }}-{{ $name }}"
+  releaseName: "{{ $.Release.Name }}-{{ $componentInstance }}"
   targetNamespace: "{{ ($config.namespace | default (dict)).name | default (dict) | default $.Release.Namespace }}"
   install:
     {{- toYaml $.Values.commons.helm.release.install | nindent 4 }}
@@ -21,10 +21,10 @@ spec:
     {{- toYaml $.Values.commons.helm.release.test | nindent 4 }}
   upgrade:
     {{- toYaml $.Values.commons.helm.release.upgrade | nindent 4 }}
-  interval: 5m
+  interval: {{ $.Values.componentCommons.helm.release.interval }}
   valuesFrom:
     - kind: ConfigMap
-      name: "{{ $.Release.Name }}-{{ $name }}-init"
+      name: "{{ $.Release.Name }}-{{ $componentInstance }}-init"
       optional: true
       valuesKey: init
       targetPath: init.version

base/values.yaml

@@ -13,6 +13,7 @@ commons:
 componentCommons:
   helm:
     release:
+      interval: 10m
       valuesFrom: []
 
 components: {}