Resolve "Set Global Timeout for Flux & Allow for HelmRelease Flux Settings to be Populated via Values File"

Summary

Upping global timeout for all HelmReleases (installs, upgrades, rollbacks, etc) to 10 minutes from default (5m) and moving flux settings section from few templated options to per-package complete settings block.

Closes #388 (closed)

chart/templates/anchore/anchore-helmrelease.yaml

+{{- $fluxSettings := deepCopy .Values.addons.anchore.flux | mergeOverwrite .Values.flux -}}
 {{- if .Values.addons.anchore.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -16,31 +17,7 @@ spec:
         name: anchore
         namespace: {{ .Release.Namespace }}
 
-  {{- with .Values.flux }}
-  timeout: {{ .Values.addons.anchore.flux.timeout | default .timeout }}
-  interval: {{ .Values.addons.anchore.flux.interval | default .interval }}
-  test:
-    enable: {{ .Values.addons.anchore.flux.test.enabled | default false }}
-    ignoreFailures: {{ .Values.addons.anchore.flux.test.ignoreFailures | default false }}
-  install:
-    disableWait: {{ .Values.addons.anchore.flux.install.disableWait | default false }}
-    skipCRDs: {{ .Values.addons.anchore.flux.install.skipCRDs | default false }}
-    remediation:
-      retries: {{ .Values.addons.anchore.flux.install.retries | default .install.retries }}
-  upgrade:
-    disableWait: {{ .Values.addons.anchore.flux.upgrade.disableWait | default true }}
-    force: {{ .Values.addons.anchore.flux.upgrade.force | default false }}
-    remediation:
-      retries: {{ .Values.addons.anchore.flux.upgrade.retries | default .upgrade.retries }}
-      remediateLastFailure: {{ .Values.addons.anchore.flux.upgrade.remediation.remediateLastFailure | default true }}
-    cleanupOnFail: {{ .Values.addons.anchore.flux.upgrade.cleanupOnFail | default true }}
-  rollback:
-    disableWait: {{ .Values.addons.anchore.flux.rollback.disableWait | default false }}
-    timeout: {{ .Values.addons.anchore.flux.rollback.timeout | default .rollback.timeout }}
-    force: {{ .Values.addons.anchore.flux.rollback.force | default false }}
-    recreate: {{ .Values.addons.anchore.flux.rollback.recreate | default false }}
-    cleanupOnFail: {{ .Values.addons.anchore.flux.rollback.cleanupOnFail | default .rollback.cleanupOnFail }}
-  {{- end }}
+  {{- toYaml $fluxSettings | nindent 2 }}
 
   valuesFrom:
     - name: {{ .Release.Name }}-anchore-values
@@ -65,3 +42,4 @@ spec:
     {{- end }}
   {{- end }}
 {{- end }}
+{{- end }}
\ No newline at end of file