diff --git a/charts/kubezero-istio/Chart.yaml b/charts/kubezero-istio/Chart.yaml index 29eaf997..443caaee 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.1 -appVersion: 1.5 +version: 0.1.2 +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" diff --git a/charts/kubezero-istio/README.md b/charts/kubezero-istio/README.md index 1a258da4..65e94c48 100644 --- a/charts/kubezero-istio/README.md +++ b/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 diff --git a/charts/kubezero-istio/charts/istio-operator/Chart.yaml b/charts/kubezero-istio/charts/istio-operator/Chart.yaml index 2887a97d..4f4977f1 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.5 +version: 1.6.0 tillerVersion: ">=2.7.2" description: Helm chart for deploying Istio operator keywords: diff --git a/charts/kubezero-istio/charts/istio-operator/templates/crd.yaml b/charts/kubezero-istio/charts/istio-operator/templates/crd-operator.yaml similarity index 98% rename from charts/kubezero-istio/charts/istio-operator/templates/crd.yaml rename to charts/kubezero-istio/charts/istio-operator/templates/crd-operator.yaml index 09dd3b0d..6b85c37c 100644 --- a/charts/kubezero-istio/charts/istio-operator/templates/crd.yaml +++ b/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: diff --git a/charts/kubezero-istio/charts/istio-operator/values.yaml b/charts/kubezero-istio/charts/istio-operator/values.yaml index ffe8f397..6a653f51 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.5-dev +tag: 1.6-dev operatorNamespace: istio-operator istioNamespace: istio-system diff --git a/charts/kubezero-istio/templates/namespace.yaml b/charts/kubezero-istio/templates/namespace.yaml new file mode 100644 index 00000000..58bebec1 --- /dev/null +++ b/charts/kubezero-istio/templates/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: istio-system + labels: + istio-injection: disabled diff --git a/charts/kubezero-istio/update-1.6.sh b/charts/kubezero-istio/update-1.6.sh deleted file mode 100755 index f452b8b6..00000000 --- a/charts/kubezero-istio/update-1.6.sh +++ /dev/null @@ -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 diff --git a/charts/kubezero-istio/update.sh b/charts/kubezero-istio/update.sh index 7e6051f8..f452b8b6 100755 --- a/charts/kubezero-istio/update.sh +++ b/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} diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml index ab5d8805..ad7859ce 100644 --- a/deploy/templates/values.yaml +++ b/deploy/templates/values.yaml @@ -63,6 +63,10 @@ kubezero: servicemonitor: enabled: {{ .Values.prometheus.enabled }} {{- end }} + + istio: + enabled: {{ .Values.istio.enabled }} + {{- end }} argo-cd: