Bugfix, move CRDs into plain manifest to help bootstrapping

2020-07-22 16:01:36 +01:00 · 2020-07-22 16:01:36 +01:00 · 60fd7b33d0
commit 60fd7b33d0
parent 3b1eb3a014
3 changed files with 5302 additions and 7 deletions
--- a/charts/kubezero-istio/templates/istio-base.yaml
+++ b/charts/kubezero-istio/templates/istio-base.yaml
--- a/charts/kubezero-istio/update.sh
+++ b/charts/kubezero-istio/update.sh
@ -16,3 +16,6 @@ rm -rf istio-${ISTIO_VERSION}

 # Apply our patch
 patch  -i istio-operator.patch -p3
+
+# Extract base / CRDs from istioctl into plain manifest to workaround chicken egg problem with CRDs
+istioctl manifest generate --set profile=empty --set components.base.enabled=true > templates/istio-base.yaml
--- a/deploy/templates/values.yaml
+++ b/deploy/templates/values.yaml
@ -64,6 +64,12 @@ kubezero:

  istio:
    enabled: {{ index .Values "istio-operator" "enabled" }}
+    values:
+      ingress:
+        dnsNames:
+        {{- with .Values.istio.ingress.dnsNames }}
+        {{- . | toYaml | nindent 8 }}
+        {{- end }}

 {{- end }}