UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 3aecece7 authored by Ryan Garcia's avatar Ryan Garcia :dizzy:
Browse files

feat: ReOrg of flux settings and merging of per package settings

parent d6458628
No related branches found
No related tags found
No related merge requests found
Pipeline #238379 failed
Stage: .pre
Stage: smoke tests
Hide whitespace changes
Inline Side-by-side
Showing
with 60 additions and 330 deletions
chart/templates/anchore/anchore-helmrelease.yaml
+ 3
− 25
View file @ 3aecece7
{{- $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
chart/templates/argocd/argocd-helmrelease.yaml
+ 2
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.addons.argocd.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
valuesFrom:
- name: {{ .Release.Name }}-argocd-values
......
chart/templates/authservice/authservice-helmrelease.yaml
+ 3
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.addons.authservice.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
{{- if .Values.addons.authservice.postRenderers }}
postRenderers:
{{ toYaml .Values.addons.authservice.postRenderers | nindent 4 }}
......
chart/templates/clusterauditor/clusterauditor-helmrelease.yaml
+ 3
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.clusterAuditor.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
{{- if .Values.clusterAuditor.postRenderers }}
postRenderers:
{{ toYaml .Values.clusterAuditor.postRenderers | nindent 4 }}
......
chart/templates/gatekeeper/gatekeeper-helmrelease.yaml
+ 3
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.gatekeeper.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
{{- if .Values.gatekeeper.postRenderers }}
postRenderers:
{{ toYaml .Values.gatekeeper.postRenderers | nindent 4 }}
......
chart/templates/gitlab-runner/gitlabRunner-helmrelease.yaml
+ 3
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.addons.gitlabRunner.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
{{- if .Values.addons.gitlab.postRenderers }}
postRenderers:
{{ toYaml .Values.addons.gitlab.postRenderers | nindent 4 }}
......
chart/templates/gitlab/helmrelease.yaml
+ 4
− 17
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.addons.gitlab.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
{{- if .Values.addons.gitlab.postRenderers }}
postRenderers:
{{ toYaml .Values.addons.gitlab.postRenderers | nindent 4 }}
......
chart/templates/haproxy/haproxy-authservice.yaml
+ 2
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.addons.haproxy.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
dependsOn:
{{- if .Values.istio.enabled }}
......
chart/templates/istio/controlplane/istio-controlplane-helmrelease.yaml
+ 3
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.istio.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
{{- if .Values.istio.postRenderers }}
postRenderers:
{{ toYaml .Values.istio.postRenderers | nindent 4 }}
......
chart/templates/istio/operator/istio-operator-helmrelease.yaml
+ 3
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.istiooperator.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
{{- if .Values.istiooperator.postRenderers }}
postRenderers:
{{ toYaml .Values.istiooperator.postRenderers | nindent 4 }}
......
chart/templates/jaeger/jaeger-helmrelease.yaml
+ 2
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.jaeger.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
valuesFrom:
- name: {{ .Release.Name }}-jaeger-values
......
chart/templates/kiali/helmrelease.yaml
+ 4
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.kiali.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
{{- if .Values.kiali.postRenderers }}
postRenderers:
{{ toYaml .Values.kiali.postRenderers | nindent 4 }}
......
chart/templates/logging/eck-operator/eck-operator-helmrelease.yaml
+ 3
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.eckoperator.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
{{- if .Values.eckoperator.postRenderers }}
postRenderers:
{{ toYaml .Values.eckoperator.postRenderers | nindent 4 }}
......
chart/templates/logging/elasticsearch-kibana/ek-helmrelease.yaml
+ 3
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.logging.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
{{- if .Values.logging.postRenderers }}
postRenderers:
{{ toYaml .Values.logging.postRenderers | nindent 4 }}
......
chart/templates/logging/fluentbit/fluentbit-helmrelease.yaml
+ 4
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.fluentbit.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
{{- if .Values.fluentbit.postRenderers }}
postRenderers:
{{ toYaml .Values.fluentbit.postRenderers | nindent 4 }}
......
chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
+ 3
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.addons.mattermost.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
{{- if .Values.addons.mattermost.postRenderers }}
postRenderers:
{{ toYaml .Values.addons.mattermost.postRenderers | nindent 4 }}
......
chart/templates/mattermost/operator/mattermost-operator-helmrelease.yaml
+ 3
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.addons.mattermostoperator.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
{{- if .Values.addons.mattermostoperator.postRenderers }}
postRenderers:
{{ toYaml .Values.addons.authservice.postRenderers | nindent 4 }}
......
chart/templates/minio/minio-operator/minio-operator-helmrelease.yaml
+ 3
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.addons.minioOperator.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
{{- if .Values.addons.minioOperator.postRenderers }}
postRenderers:
{{ toYaml .Values.addons.minioOperator.postRenderers | nindent 4 }}
......
chart/templates/minio/minio/minio-helmrelease.yaml
+ 3
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.addons.minio.flux | mergeOverwrite .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 $fluxSettings | nindent 2 }}
{{- if .Values.addons.minio.postRenderers }}
postRenderers:
{{ toYaml .Values.addons.minio.postRenderers | nindent 4 }}
......
chart/templates/monitoring/monitoring-helmrelease.yaml
+ 3
− 16
View file @ 3aecece7
{{- $fluxSettings := deepCopy .Values.monitoring.flux | mergeOverwrite .Values.flux -}}
{{- if .Values.monitoring.enabled }}
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
......@@ -19,22 +20,8 @@ spec:
name: monitoring
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 $fluxSettings | nindent 2 }}
{{- if .Values.monitoring.postRenderers }}
postRenderers:
{{ toYaml .Values.monitoring.postRenderers | nindent 4 }}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED - NO CUI