(dev-v2.6-archive) Merge pull request #1309 from brendarearden/istio-1102

Istio 1.10.2

(partially cherry picked from commit d1ec28de81)
pull/1680/head
Brenda Rearden 2021-06-29 08:20:35 -07:00 committed by Arvind Iyengar
parent 6294948732
commit 7e9bf4764e
No known key found for this signature in database
GPG Key ID: A8DD9BFD6C811498
3 changed files with 8 additions and 17 deletions

View File

@ -1,8 +1,8 @@
apiVersion: v1
appVersion: 1.10.1
appVersion: 1.10.2
description: A basic Istio setup that installs with the istioctl. Refer to https://istio.io/latest/ for details.
name: rancher-istio
version: 1.10.1
version: 1.10.2
icon: https://charts.rancher.io/assets/logos/istio.svg
keywords:
- networking

View File

@ -1,11 +1,11 @@
overlayFile: ""
tag: 1.10.1
tag: 1.10.2
##Setting forceInstall: true will remove the check for istio version < 1.6.x and will not analyze your install cluster prior to install
forceInstall: false
installer:
repository: rancher/istio-installer
tag: 1.10.1-rancher1
tag: 1.10.2-rancher1
##Native support for dns added in 1.8
dns:
@ -17,7 +17,7 @@ base:
cni:
enabled: false
repository: rancher/mirrored-istio-install-cni
tag: 1.10.1
tag: 1.10.2
logLevel: info
excludeNamespaces:
- istio-system
@ -37,7 +37,7 @@ istiodRemote:
pilot:
enabled: true
repository: rancher/mirrored-istio-pilot
tag: 1.10.1
tag: 1.10.2
telemetry:
enabled: true
@ -49,10 +49,10 @@ global:
systemDefaultRegistry: ""
proxy:
repository: rancher/mirrored-istio-proxyv2
tag: 1.10.1
tag: 1.10.2
proxy_init:
repository: rancher/mirrored-istio-proxyv2
tag: 1.10.1
tag: 1.10.2
defaultPodDisruptionBudget:
enabled: true
rbac:

View File

@ -1,14 +1,5 @@
--- charts-original/templates/_helpers.tpl
+++ charts/templates/_helpers.tpl
@@ -19,7 +19,7 @@
Create chart name and version as used by the chart label.
*/}}
{{- define "kiali-server.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- printf "%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end }}
{{/*
@@ -176,3 +176,11 @@
{{- end }}
{{- end }}