From 3551c07381b3305a843474855b09343dee350dc3 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Tue, 14 Jul 2020 18:17:08 +0100
Subject: [PATCH] Revert istio-operator to 1.5 as we cannot skip versions
 during upgrades

---
 charts/kubezero-istio/Chart.yaml               |  6 +++---
 .../charts/istio-operator/Chart.yaml           |  2 +-
 .../templates/{crd-operator.yaml => crd.yaml}  |  1 -
 .../charts/istio-operator/values.yaml          |  2 +-
 charts/kubezero-istio/update-1.6.sh            | 18 ++++++++++++++++++
 charts/kubezero-istio/update.sh                |  6 +++---
 6 files changed, 26 insertions(+), 9 deletions(-)
 rename charts/kubezero-istio/charts/istio-operator/templates/{crd-operator.yaml => crd.yaml} (98%)
 create mode 100755 charts/kubezero-istio/update-1.6.sh

diff --git a/charts/kubezero-istio/Chart.yaml b/charts/kubezero-istio/Chart.yaml
index 40ec5d2..29eaf99 100644
--- a/charts/kubezero-istio/Chart.yaml
+++ b/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.0
-appVersion: 1.6
+version: 0.1.1
+appVersion: 1.5
 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.6"
+    version: "= 1.5"
 kubeVersion: ">= 1.16.0"
diff --git a/charts/kubezero-istio/charts/istio-operator/Chart.yaml b/charts/kubezero-istio/charts/istio-operator/Chart.yaml
index 4f4977f..2887a97 100644
--- a/charts/kubezero-istio/charts/istio-operator/Chart.yaml
+++ b/charts/kubezero-istio/charts/istio-operator/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: istio-operator
-version: 1.6.0
+version: 1.5
 tillerVersion: ">=2.7.2"
 description: Helm chart for deploying Istio operator
 keywords:
diff --git a/charts/kubezero-istio/charts/istio-operator/templates/crd-operator.yaml b/charts/kubezero-istio/charts/istio-operator/templates/crd.yaml
similarity index 98%
rename from charts/kubezero-istio/charts/istio-operator/templates/crd-operator.yaml
rename to charts/kubezero-istio/charts/istio-operator/templates/crd.yaml
index 6b85c37..09dd3b0 100644
--- a/charts/kubezero-istio/charts/istio-operator/templates/crd-operator.yaml
+++ b/charts/kubezero-istio/charts/istio-operator/templates/crd.yaml
@@ -1,4 +1,3 @@
-# SYNC WITH manifests/charts/base/files
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
diff --git a/charts/kubezero-istio/charts/istio-operator/values.yaml b/charts/kubezero-istio/charts/istio-operator/values.yaml
index 6a653f5..ffe8f39 100644
--- a/charts/kubezero-istio/charts/istio-operator/values.yaml
+++ b/charts/kubezero-istio/charts/istio-operator/values.yaml
@@ -1,4 +1,4 @@
 hub: gcr.io/istio-testing
-tag: 1.6-dev
+tag: 1.5-dev
 operatorNamespace: istio-operator
 istioNamespace: istio-system
diff --git a/charts/kubezero-istio/update-1.6.sh b/charts/kubezero-istio/update-1.6.sh
new file mode 100755
index 0000000..f452b8b
--- /dev/null
+++ b/charts/kubezero-istio/update-1.6.sh
@@ -0,0 +1,18 @@
+#!/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
diff --git a/charts/kubezero-istio/update.sh b/charts/kubezero-istio/update.sh
index f452b8b..7e6051f 100755
--- a/charts/kubezero-istio/update.sh
+++ b/charts/kubezero-istio/update.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 set -ex
 
-ISTIO_VERSION=1.6.5
+ISTIO_VERSION=1.5.8
 
 NAME="istio-$ISTIO_VERSION"
-URL="https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux-amd64.tar.gz"
+URL="https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux.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
+cp -r istio-${ISTIO_VERSION}/install/kubernetes/operator/charts/istio-operator charts
 
 rm -rf istio-${ISTIO_VERSION}