New bootstrap flow

This commit is contained in:
Stefan Reimer 2020-09-14 16:06:53 +01:00
parent f9770ce483
commit 2171a4211e
3 changed files with 21 additions and 19 deletions

View File

@ -1,5 +1,5 @@
kiam: kiam:
enabled: false enabled: true
server: server:
image: image:
tag: "v3.6" tag: "v3.6"

View File

@ -8,22 +8,20 @@ kubezero:
values: values:
network: {{ default "vxlan" .Values.calico.network }} network: {{ default "vxlan" .Values.calico.network }}
mtu: {{ default "8941" .Values.calico.mtu }} mtu: {{ default "8941" .Values.calico.mtu }}
prometheus: {{ .Values.metrics.ready }} prometheus: {{ default .Values.metrics.enabled .Values.metrics.ready }}
cert-manager: cert-manager:
enabled: {{ index .Values "cert-manager" "enabled" }} enabled: {{ index .Values "cert-manager" "enabled" }}
values: values:
# Disable all until webhook is in place # Disable all until webhook is in place
{{- if not ( index .Values "cert-manager" "ready" ) }}
localCA: localCA:
enabled: false enabled: {{ index .Values "cert-manager" "ready" }}
{{- end }}
{{- if eq .Values.platform "aws" }} {{- if eq .Values.platform "aws" }}
cert-manager: cert-manager:
podAnnotations: podAnnotations:
iam.amazonaws.com/role: "{{ index .Values "cert-manager" "IamArn" }}" iam.amazonaws.com/role: "{{ index .Values "cert-manager" "IamArn" }}"
{{- end }} {{- end }}
{{- if .Values.kiam.ready }} {{- if and .Values.kiam.enabled .Values.kiam.ready }}
clusterIssuer: clusterIssuer:
name: letsencrypt-dns-prod name: letsencrypt-dns-prod
server: https://acme-v02.api.letsencrypt.org/directory server: https://acme-v02.api.letsencrypt.org/directory
@ -51,20 +49,20 @@ kubezero:
enabled: {{ .Values.kiam.enabled }} enabled: {{ .Values.kiam.enabled }}
values: values:
kiam: kiam:
enabled: {{ ( not .Values.kiam.certsOnly ) }} enabled: {{ not .Values.kiam.certsOnly }}
server: server:
assumeRoleArn: "{{ .Values.kiam.IamArn }}" assumeRoleArn: "{{ .Values.kiam.IamArn }}"
deployment: deployment:
replicas: {{ ternary 2 1 .Values.HighAvailableControlplane }} replicas: {{ ternary 2 1 .Values.HighAvailableControlplane }}
prometheus: prometheus:
servicemonitor: servicemonitor:
enabled: {{ .Values.metrics.ready }} enabled: {{ default .Values.metrics.enabled .Values.metrics.ready }}
agent: agent:
prometheus: prometheus:
servicemonitor: servicemonitor:
enabled: {{ .Values.metrics.ready }} enabled: {{ default .Values.metrics.enabled .Values.metrics.ready }}
{{- if .Values.kiam.ready }} {{- if and .Values.kiam.enabled .Values.kiam.ready }}
# AWS only components # AWS only components
aws-ebs-csi-driver: aws-ebs-csi-driver:
enabled: {{ index .Values "aws-ebs-csi-driver" "enabled" }} enabled: {{ index .Values "aws-ebs-csi-driver" "enabled" }}
@ -102,7 +100,7 @@ kubezero:
{{- end }} {{- end }}
metrics: metrics:
enabled: {{ .Values.metrics.ready }} enabled: {{ .Values.metrics.enabled }}
values: values:
{{- if and .Values.metrics.istio.grafana.enabled .Values.istio.ready }} {{- if and .Values.metrics.istio.grafana.enabled .Values.istio.ready }}
grafana: grafana:
@ -148,7 +146,7 @@ kubezero:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- end }} {{- end }}
prometheus: {{ .Values.metrics.ready }} prometheus: {{ default .Values.metrics.enabled .Values.metrics.ready }}
{{- if .Values.logging.es.s3Snapshot }} {{- if .Values.logging.es.s3Snapshot }}
s3Snapshot: s3Snapshot:
@ -168,9 +166,9 @@ kubezero:
fluentd: fluentd:
enabled: {{ .Values.logging.fluentd.enabled }} enabled: {{ .Values.logging.fluentd.enabled }}
metrics: metrics:
enabled: {{ .Values.metrics.ready }} enabled: {{ default .Values.metrics.enabled .Values.metrics.ready }}
url: {{ .Values.logging.fluentd.url }} url: {{ .Values.logging.fluentd.url }}
{{- if and .Values.logging.fluentd.istio .Values.istio.ready }} {{- if and .Values.logging.fluentd.istio .Values.istio.enabled .Values.istio.ready }}
istio: istio:
{{- with .Values.logging.fluentd.istio }} {{- with .Values.logging.fluentd.istio }}
{{- toYaml . | nindent 10 }} {{- toYaml . | nindent 10 }}
@ -180,7 +178,7 @@ kubezero:
fluent-bit: fluent-bit:
enabled: {{ index .Values.logging "fluent-bit" "enabled" }} enabled: {{ index .Values.logging "fluent-bit" "enabled" }}
metrics: metrics:
enabled: {{ .Values.metrics.ready }} enabled: {{ default .Values.metrics.enabled .Values.metrics.ready }}
{{- if index .Values.logging "fluent-bit" "config" }} {{- if index .Values.logging "fluent-bit" "config" }}
config: config:
{{- with index .Values.logging "fluent-bit" "config" }} {{- with index .Values.logging "fluent-bit" "config" }}
@ -191,13 +189,13 @@ kubezero:
argo-cd: argo-cd:
controller: controller:
metrics: metrics:
enabled: {{ .Values.metrics.ready }} enabled: {{ default .Values.metrics.enabled .Values.metrics.ready }}
repoServer: repoServer:
metrics: metrics:
enabled: {{ .Values.metrics.ready }} enabled: {{ default .Values.metrics.enabled .Values.metrics.ready }}
server: server:
metrics: metrics:
enabled: {{ .Values.metrics.ready }} enabled: {{ default .Values.metrics.enabled .Values.metrics.ready }}
{{- with index .Values "argo-cd" "server" }} {{- with index .Values "argo-cd" "server" }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
@ -205,7 +203,7 @@ argo-cd:
configs: configs:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- if and ( index .Values "argo-cd" "istio" "enabled" ) .Values.istio.ready }} {{- if and ( index .Values "argo-cd" "istio" "enabled" ) .Values.istio.enabled .Values.istio.ready }}
istio: istio:
{{- with index .Values "argo-cd" "istio" }} {{- with index .Values "argo-cd" "istio" }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}

View File

@ -9,6 +9,7 @@ calico:
cert-manager: cert-manager:
enabled: true enabled: true
ready: true
IamArn: "" IamArn: ""
aws-ebs-csi-driver: aws-ebs-csi-driver:
@ -20,13 +21,16 @@ aws-efs-csi-driver:
kiam: kiam:
enabled: true enabled: true
ready: true
IamArn: "" IamArn: ""
istio: istio:
ready: true
enabled: false enabled: false
metrics: metrics:
enabled: false enabled: false
ready: true
istio: istio:
grafana: grafana:
enabled: false enabled: false