Merge pull request #627 from brendarearden/istio-version-rollback

Add annotation changes to version Istio 1.6.8

packages/rancher-istio/charts/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: 1.7.0
+appVersion: 1.6.8
 description: Helm chart for installing istio components with the istioctl
 name: rancher-istio
-version: 1.7.000
+version: 1.6.800
 icon: https://charts.rancher.io/assets/logos/istio.svg
 keywords:
 - networking

packages/rancher-istio/charts/configs/istio-base.yaml

@@ -4,6 +4,14 @@ spec:
   addonComponents:
     istiocoredns:
       enabled: {{ .Values.istiocoredns.enabled }}
+    prometheus:
+      enabled: false
+    grafana:
+      enabled: false
+    kiali:
+      enabled: false
+    tracing:
+      enabled: false
   components:
     base:
       enabled: {{ .Values.base.enabled }}

packages/rancher-istio/charts/templates/_helpers.tpl

@@ -4,8 +4,8 @@
 {{- end -}}
 
 {{- define "system_default_registry" -}}
-{{- if .Values.global.systemDefaultRegistry -}}
+{{- if .Values.global.cattle.systemDefaultRegistry -}}
-{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
+{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
 {{- else -}}
 {{- "" -}}
 {{- end -}}

packages/rancher-istio/charts/values.yaml

@@ -1,6 +1,6 @@
 overlayFile: ""
-tag: 1.7.0
+tag: 1.6.8
-installerVersion: 1.7.0-rancher1
+installerVersion: 1.6.8-rancher1
 forceInstall: false
 
 istiocoredns:
@@ -18,7 +18,7 @@ base:
 cni:
     enabled: false
     repository: rancher/istio-install-cni
-    tag: 1.7.0
+    tag: 1.6.8
 
 egressGateways:
     enabled: false
@@ -34,17 +34,17 @@ istiodRemote:
 pilot:
     enabled: true
     repository: rancher/istio-pilot
-    tag: 1.7.0
+    tag: 1.6.8
 
 policy:
     enabled: true
     repository: rancher/istio-mixer
-    tag: 1.7.0
+    tag: 1.6.8
 
 telemetry:
     enabled: true
     repository: rancher/istio-mixer
-    tag: 1.7.0
+    tag: 1.6.8
 
 sidecarInjectorWebhook:
   enableNamespacesByDefault: false
@@ -54,13 +54,14 @@ sidecarInjectorWebhook:
   rewriteAppHTTPProbe: true
 
 global:
+  cattle:
     systemDefaultRegistry: ""
   proxy:
     repository: rancher/istio-proxyv2
-    tag: 1.7.0
+    tag: 1.6.8
   proxy_init:
     repository: rancher/istio-proxyv2
-    tag: 1.7.0
+    tag: 1.6.8
   defaultPodDisruptionBudget:
     enabled: true