Merge branch...

Merge branch '388-set-global-timeout-for-flux-allow-for-helmrelease-flux-settings-to-be-populated-via-values-file' into 'master'

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

See merge request platform-one/big-bang/bigbang!453

.gitlab-ci/jobs/networking/aws/dependencies/terraform/main/main.tf

@@ -39,6 +39,7 @@ locals {
 #
 module "vpc" {
   source = "terraform-aws-modules/vpc/aws"
+  version = "2.78.0"
 
   name = local.name
   cidr = var.vpc_cidr

chart/templates/anchore/anchore-helmrelease.yaml

+{{- $fluxSettingsAnchore := merge .Values.addons.anchore.flux .Values.flux -}}
 {{- if .Values.addons.anchore.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -16,23 +17,7 @@ spec:
         name: anchore
         namespace: {{ .Release.Namespace }}
 
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    disableWait: true
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+  {{- toYaml $fluxSettingsAnchore | nindent 2 }}
 
   valuesFrom:
     - name: {{ .Release.Name }}-anchore-values
@@ -56,4 +41,4 @@ spec:
       namespace: {{ .Release.Namespace }}
     {{- end }}
   {{- end }}
-{{- end }}
+{{- end }}
\ No newline at end of file

chart/templates/argocd/argocd-helmrelease.yaml

+{{- $fluxSettingsArgo := merge .Values.addons.argocd.flux .Values.flux -}}
 {{- if .Values.addons.argocd.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -19,22 +20,7 @@ spec:
         name: argocd
         namespace: {{ .Release.Namespace }}
 
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+  {{- toYaml $fluxSettingsArgo | nindent 2 }}
 
   valuesFrom:
     - name: {{ .Release.Name }}-argocd-values

chart/templates/authservice/authservice-helmrelease.yaml

+{{- $fluxSettingsAuthservice := merge .Values.addons.authservice.flux .Values.flux -}}
 {{- if and .Values.istio.enabled ( or .Values.addons.authservice.enabled .Values.monitoring.sso.enabled .Values.jaeger.sso.enabled ) }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -19,22 +20,8 @@ spec:
         name: authservice
         namespace: {{ .Release.Namespace }}
 
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+  {{- toYaml $fluxSettingsAuthservice | nindent 2 }}
+
   {{- if .Values.addons.authservice.postRenderers }}
   postRenderers:
   {{ toYaml .Values.addons.authservice.postRenderers | nindent 4 }}

chart/templates/clusterauditor/clusterauditor-helmrelease.yaml

+{{- $fluxSettingsClusterAuditor := merge .Values.clusterAuditor.flux .Values.flux -}}
 {{- if .Values.clusterAuditor.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -19,22 +20,8 @@ spec:
         name: cluster-auditor
         namespace: {{ .Release.Namespace }}
 
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+  {{- toYaml $fluxSettingsClusterAuditor | nindent 2 }}
+
   {{- if .Values.clusterAuditor.postRenderers }}
   postRenderers:
   {{ toYaml .Values.clusterAuditor.postRenderers | nindent 4 }}

chart/templates/gatekeeper/gatekeeper-helmrelease.yaml

+{{- $fluxSettingsGatekeeper := merge .Values.gatekeeper.flux .Values.flux -}}
 {{- if or .Values.gatekeeper.enabled .Values.clusterAuditor.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -19,22 +20,8 @@ spec:
         name: gatekeeper
         namespace: {{ .Release.Namespace }}
 
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+  {{- toYaml $fluxSettingsGatekeeper | nindent 2 }}
+
   {{- if .Values.gatekeeper.postRenderers }}
   postRenderers:
   {{ toYaml .Values.gatekeeper.postRenderers | nindent 4 }}

chart/templates/gitlab-runner/gitlabRunner-helmrelease.yaml

+{{- $fluxSettingsGitlabRunner := merge .Values.addons.gitlabRunner.flux .Values.flux -}}
 {{- if .Values.addons.gitlabRunner.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -16,22 +17,8 @@ spec:
         name: gitlab-runner
         namespace: {{ .Release.Namespace }}
 
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+  {{- toYaml $fluxSettingsGitlabRunner | nindent 2 }}
+
   {{- if .Values.addons.gitlab.postRenderers }}
   postRenderers:
   {{ toYaml .Values.addons.gitlab.postRenderers | nindent 4 }}

chart/templates/gitlab/helmrelease.yaml

+{{- $fluxSettingsGitlab := merge .Values.addons.gitlab.flux .Values.flux -}}
 {{- if .Values.addons.gitlab.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -19,23 +20,9 @@ spec:
         kind: GitRepository
         name: gitlab
         namespace: {{ .Release.Namespace }}
-  timeout: 10m
-{{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+
+  {{- toYaml $fluxSettingsGitlab | nindent 2 }}
+
   {{- if .Values.addons.gitlab.postRenderers }}
   postRenderers:
   {{ toYaml .Values.addons.gitlab.postRenderers | nindent 4 }}

chart/templates/haproxy/haproxy-authservice.yaml

+{{- $fluxSettingsHaProxy := merge .Values.addons.haproxy.flux .Values.flux -}}
 {{- if and .Values.istio.enabled .Values.monitoring.sso.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -33,22 +34,7 @@ spec:
       kind: Secret
       valuesKey: "overlays"
 
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+  {{- toYaml $fluxSettingsHaProxy | nindent 2 }}
 
   dependsOn:
     {{- if .Values.istio.enabled }}

chart/templates/istio/controlplane/istio-controlplane-helmrelease.yaml

+{{- $fluxSettingsIstioCp := merge .Values.istio.flux .Values.flux -}}
 {{- if .Values.istio.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -19,22 +20,8 @@ spec:
         name: istio-controlplane
         namespace: {{ .Release.Namespace }}
 
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+  {{- toYaml $fluxSettingsIstioCp | nindent 2 }}
+
   {{- if .Values.istio.postRenderers }}
   postRenderers:
   {{ toYaml .Values.istio.postRenderers | nindent 4 }}

chart/templates/istio/operator/istio-operator-helmrelease.yaml

+{{- $fluxSettingsIstioOperator := merge .Values.istiooperator.flux .Values.flux -}}
 {{- if .Values.istiooperator.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -19,22 +20,8 @@ spec:
         name: istio-operator
         namespace: {{ .Release.Namespace }}
 
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+  {{- toYaml $fluxSettingsIstioOperator | nindent 2 }}
+
   {{- if .Values.istiooperator.postRenderers }}
   postRenderers:
   {{ toYaml .Values.istiooperator.postRenderers | nindent 4 }}

chart/templates/jaeger/jaeger-helmrelease.yaml

+{{- $fluxSettingsJaeger := merge .Values.jaeger.flux .Values.flux -}}
 {{- if .Values.jaeger.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -19,22 +20,7 @@ spec:
         name: jaeger
         namespace: {{ .Release.Namespace }}
 
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+  {{- toYaml $fluxSettingsJaeger | nindent 2 }}
 
   valuesFrom:
     - name: {{ .Release.Name }}-jaeger-values

chart/templates/kiali/helmrelease.yaml

+{{- $fluxSettingsKiali := merge .Values.kiali.flux .Values.flux -}}
 {{- if .Values.kiali.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -18,22 +19,9 @@ spec:
         kind: GitRepository
         name: kiali
         namespace: {{ .Release.Namespace }}
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+
+  {{- toYaml $fluxSettingsKiali | nindent 2 }}
+  
   {{- if .Values.kiali.postRenderers }}
   postRenderers:
   {{ toYaml .Values.kiali.postRenderers | nindent 4 }}

chart/templates/logging/eck-operator/eck-operator-helmrelease.yaml

+{{- $fluxSettingsEckOperator := merge .Values.eckoperator.flux .Values.flux -}}
 {{- if or .Values.eckoperator.enabled .Values.logging.enabled .Values.clusterAuditor.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -19,22 +20,8 @@ spec:
         name: eck-operator
         namespace: {{ .Release.Namespace }}
 
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+  {{- toYaml $fluxSettingsEckOperator | nindent 2 }}
+
   {{- if .Values.eckoperator.postRenderers }}
   postRenderers:
   {{ toYaml .Values.eckoperator.postRenderers | nindent 4 }}

chart/templates/logging/elasticsearch-kibana/ek-helmrelease.yaml

+{{- $fluxSettingsEk := merge .Values.logging.flux .Values.flux -}}
 {{- if or .Values.logging.enabled .Values.clusterAuditor.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -19,22 +20,8 @@ spec:
         name: elasticsearch-kibana
         namespace: {{ .Release.Namespace }}
 
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+  {{- toYaml $fluxSettingsEk | nindent 2 }}
+
   {{- if .Values.logging.postRenderers }}
   postRenderers:
   {{ toYaml .Values.logging.postRenderers | nindent 4 }}

chart/templates/logging/fluentbit/fluentbit-helmrelease.yaml

+{{- $fluxSettingsFluentbit := merge .Values.fluentbit.flux .Values.flux -}}
 {{- if .Values.fluentbit.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -18,22 +19,9 @@ spec:
         kind: GitRepository
         name: fluentbit
         namespace: {{ .Release.Namespace }}
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+
+  {{- toYaml $fluxSettingsFluentbit | nindent 2 }}
+
   {{- if .Values.fluentbit.postRenderers }}
   postRenderers:
   {{ toYaml .Values.fluentbit.postRenderers | nindent 4 }}

chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml

+{{- $fluxSettingsMattermost := merge .Values.addons.mattermost.flux .Values.flux -}}
 {{- if .Values.addons.mattermost.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -20,22 +21,8 @@ spec:
         name: mattermost
         namespace: {{ .Release.Namespace }}
 
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+  {{- toYaml $fluxSettingsMattermost | nindent 2 }}
+
   {{- if .Values.addons.mattermost.postRenderers }}
   postRenderers:
   {{ toYaml .Values.addons.mattermost.postRenderers | nindent 4 }}

chart/templates/mattermost/operator/mattermost-operator-helmrelease.yaml

+{{- $fluxSettingsMattermostOperator := merge .Values.addons.mattermostoperator.flux .Values.flux -}}
 {{- if or .Values.addons.mattermostoperator.enabled .Values.addons.mattermost.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -19,22 +20,8 @@ spec:
         name: mattermost-operator
         namespace: {{ .Release.Namespace }}
 
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+  {{- toYaml $fluxSettingsMattermostOperator | nindent 2 }}
+  
   {{- if .Values.addons.mattermostoperator.postRenderers }}
   postRenderers:
   {{ toYaml .Values.addons.authservice.postRenderers | nindent 4 }}

chart/templates/minio/minio-operator/minio-operator-helmrelease.yaml

+{{- $fluxSettingsMinioOperator := merge .Values.addons.minioOperator.flux .Values.flux -}}
 {{- if or .Values.addons.minioOperator.enabled .Values.addons.minio.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -15,22 +16,8 @@ spec:
         name: minio-operator
         namespace: {{ .Release.Namespace }}
 
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+  {{- toYaml $fluxSettingsMinioOperator | nindent 2 }}
+
   {{- if .Values.addons.minioOperator.postRenderers }}
   postRenderers:
   {{ toYaml .Values.addons.minioOperator.postRenderers | nindent 4 }}

chart/templates/minio/minio/minio-helmrelease.yaml

+{{- $fluxSettingsMinio := merge .Values.addons.minio.flux .Values.flux -}}
 {{- if .Values.addons.minio.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -15,22 +16,8 @@ spec:
         name: minio
         namespace: {{ .Release.Namespace }}
 
-  {{- with .Values.flux }}
-  interval: {{ .interval }}
-  test:
-    enable: false
-  install:
-    remediation:
-      retries: {{ .install.retries }}
-  upgrade:
-    remediation:
-      retries: {{ .upgrade.retries }}
-      remediateLastFailure: true
-    cleanupOnFail: true
-  rollback:
-    timeout: {{ .rollback.timeout }}
-    cleanupOnFail: {{ .rollback.cleanupOnFail }}
-  {{- end }}
+  {{- toYaml $fluxSettingsMinio | nindent 2 }}
+  
   {{- if .Values.addons.minio.postRenderers }}
   postRenderers:
   {{ toYaml .Values.addons.minio.postRenderers | nindent 4 }}