ZeroDownTime/KubeZero
3
0
Fork 0
Code Issues 1 Pull Requests 26 Packages Projects Releases Wiki Activity

Bootstrap fixes for istio

Browse Source
This commit is contained in:
Stefan Reimer 2020-07-22 19:20:43 +01:00
parent 251844a44a
commit fbe34ddad2
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deploy/deploy.sh
View File

@ -10,7 +10,7 @@ function wait_for() {
$@ && break $@ && break
[ $TRIES -eq 100 ] && return 1 [ $TRIES -eq 100 ] && return 1
let TRIES=$TRIES+1 let TRIES=$TRIES+1
sleep 3 sleep 3
done done
} }
@ -58,14 +58,18 @@ EOF
helm template $DEPLOY_DIR -f values.yaml -f cloudbender.yaml --set istio.enabled=false --set prometheus.enabled=false > generated-values.yaml helm template $DEPLOY_DIR -f values.yaml -f cloudbender.yaml --set istio.enabled=false --set prometheus.enabled=false > generated-values.yaml
helm upgrade -n argocd kubezero kubezero/kubezero-argo-cd -f generated-values.yaml helm upgrade -n argocd kubezero kubezero/kubezero-argo-cd -f generated-values.yaml
echo "Install Istio / kube-prometheus manually for now, before proceeding! <Any key to continue>" # Install Istio if enabled, but keep ArgoCD istio support disabled for now in case
helm template $DEPLOY_DIR -f values.yaml -f cloudbender.yaml --set argo-cd.istio.enabled=false > generated-values.yaml
helm upgrade -n argocd kubezero kubezero/kubezero-argo-cd -f generated-values.yaml
echo "Install kube-prometheus and logging manually for now, before proceeding! <Any key to continue>"
read read
# Todo: Now we need to wait till all is synced and healthy ... argocd cli or kubectl ? # Todo: Now we need to wait till all is synced and healthy ... argocd cli or kubectl ?
# Wait for aws-ebs or kiam to be all ready, or all pods running ? # Wait for aws-ebs or kiam to be all ready, or all pods running ?
# Todo: # Todo:
# - integrate Istio
# - integrate Prometheus-Grafana # - integrate Prometheus-Grafana
# - integrate ES based logging
# Finally we could enable the actual config and deploy all # Finally we could enable the actual config and deploy all
helm template $DEPLOY_DIR -f values.yaml -f cloudbender.yaml > generated-values.yaml helm template $DEPLOY_DIR -f values.yaml -f cloudbender.yaml > generated-values.yaml

4
deploy/templates/values.yaml
View File

@ -63,7 +63,7 @@ kubezero:
{{- end }} {{- end }}
istio: istio:
enabled: {{ index .Values "istio-operator" "enabled" }} enabled: {{ .Values.istio.enabled }}
values: values:
ingress: ingress:
dnsNames: dnsNames:
@ -84,6 +84,6 @@ argo-cd:
{{- end }} {{- end }}
{{- if not .Values.bootstrap }} {{- if not .Values.bootstrap }}
istio: istio:
enabled: {{ .Values.istio.enabled }} enabled: {{ index .Values "argo-cd" "istio" "enabled" }}
gateway: private-ingressgateway.istio-system.svc.cluster.local gateway: private-ingressgateway.istio-system.svc.cluster.local
{{- end }} {{- end }}