We skip Istio 1.5, hook into deploy flow

charts/kubezero-istio/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: kubezero-istio
 description: KubeZero Umbrella Chart for Istio
 type: application
-version: 0.1.1
+version: 0.1.2
-appVersion: 1.5
+appVersion: 1.6
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@@ -16,5 +16,5 @@ dependencies:
     version: ">= 0.1.1"
     repository: https://zero-down-time.github.io/kubezero/
   - name: istio-operator
-    version: "= 1.5"
+    version: "= 1.6"
 kubeVersion: ">= 1.16.0"

charts/kubezero-istio/README.md

@@ -5,7 +5,7 @@ KubeZero Umbrella Chart for Istio
 Installs Istio Operator and KubeZero Istio profile
 
 
-Current chart version is `0.1.1`
+Current chart version is `0.1.2`
 
 Source code can be found [here](https://kubezero.com)
 
@@ -13,7 +13,7 @@ Source code can be found [here](https://kubezero.com)
 
 | Repository | Name | Version |
 |------------|------|---------|
-|  | istio-operator | = 1.5 |
+|  | istio-operator | = 1.6 |
 | https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.1 |
 
 ## KubeZero default configuration

charts/kubezero-istio/charts/istio-operator/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: istio-operator
-version: 1.5
+version: 1.6.0
 tillerVersion: ">=2.7.2"
 description: Helm chart for deploying Istio operator
 keywords:

charts/kubezero-istio/charts/istio-operator/templates/crd-operator.yaml

@@ -1,3 +1,4 @@
+# SYNC WITH manifests/charts/base/files
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:

charts/kubezero-istio/charts/istio-operator/values.yaml

@@ -1,4 +1,4 @@
 hub: gcr.io/istio-testing
-tag: 1.5-dev
+tag: 1.6-dev
 operatorNamespace: istio-operator
 istioNamespace: istio-system

charts/kubezero-istio/templates/namespace.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: istio-system
+  labels:
+    istio-injection: disabled

charts/kubezero-istio/update-1.6.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-set -ex
-
-ISTIO_VERSION=1.6.5
-
-NAME="istio-$ISTIO_VERSION"
-URL="https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux-amd64.tar.gz"
-
-curl -sL "$URL" | tar xz
-
-# Now lets extract what we need
-rm -rf charts/istio-operator
-cp -r istio-${ISTIO_VERSION}/manifests/charts/istio-operator charts
-
-rm -rf istio-${ISTIO_VERSION}
-
-# Apply our patch
-patch  -i istio-operator.patch -p3

charts/kubezero-istio/update.sh

@@ -1,16 +1,16 @@
 #!/bin/bash
 set -ex
 
-ISTIO_VERSION=1.5.8
+ISTIO_VERSION=1.6.5
 
 NAME="istio-$ISTIO_VERSION"
-URL="https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux.tar.gz"
+URL="https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux-amd64.tar.gz"
 
 curl -sL "$URL" | tar xz
 
 # Now lets extract what we need
 rm -rf charts/istio-operator
-cp -r istio-${ISTIO_VERSION}/install/kubernetes/operator/charts/istio-operator charts
+cp -r istio-${ISTIO_VERSION}/manifests/charts/istio-operator charts
 
 rm -rf istio-${ISTIO_VERSION}
 

deploy/templates/values.yaml

@@ -63,6 +63,10 @@ kubezero:
             servicemonitor:
               enabled: {{ .Values.prometheus.enabled }}
   {{- end }}
+
+  istio:
+    enabled: {{ .Values.istio.enabled }}
+
 {{- end }}
 
 argo-cd: