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

Revert istio-operator to 1.5 as we cannot skip versions during upgrades

Browse Source
This commit is contained in:
Stefan Reimer 2020-07-14 18:17:08 +01:00
parent b35358b0d2
commit 5340daf3a0
6 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
charts/kubezero-istio/Chart.yaml
View File

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

2
charts/kubezero-istio/charts/istio-operator/Chart.yaml
View File

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

1
charts/kubezero-istio/charts/istio-operator/templates/crd-operator.yaml → charts/kubezero-istio/charts/istio-operator/templates/crd.yaml
View File

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

2
charts/kubezero-istio/charts/istio-operator/values.yaml
View File

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

18
charts/kubezero-istio/update-1.6.sh Executable file
View File

@ -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

6
charts/kubezero-istio/update.sh
View File

@ -1,16 +1,16 @@
#!/bin/bash #!/bin/bash
set -ex set -ex
ISTIO_VERSION=1.6.5 ISTIO_VERSION=1.5.8
NAME="istio-$ISTIO_VERSION" 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 curl -sL "$URL" | tar xz
# Now lets extract what we need # Now lets extract what we need
rm -rf charts/istio-operator 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} rm -rf istio-${ISTIO_VERSION}