Merge pull request #145 from cbron/istio-1.4.3

charts/rancher-istio/1.4.2/Chart.yaml → charts/rancher-istio/1.4.3/Chart.yaml

 apiVersion: v1
-appVersion: 1.4.2
+appVersion: 1.4.3
 description: Helm chart for all istio components
 engine: gotpl
 icon: https://istio.io/favicons/android-192x192.png
@@ -14,4 +14,4 @@ name: rancher-istio
 sources:
 - http://github.com/istio/istio
 tillerVersion: '>=2.7.2-0'
-version: 1.4.2
+version: 1.4.3

charts/rancher-istio/1.4.2/charts/certmanager/Chart.yaml → charts/rancher-istio/1.4.3/charts/certmanager/Chart.yaml

@@ -3,4 +3,4 @@ appVersion: 0.6.2
 description: A Helm chart for Kubernetes
 name: certmanager
 tillerVersion: '>=2.7.2'
-version: 1.4.2
+version: 1.4.3

charts/rancher-istio/1.4.2/charts/galley/Chart.yaml → charts/rancher-istio/1.4.3/charts/galley/Chart.yaml

 apiVersion: v1
-appVersion: 1.4.2
+appVersion: 1.4.3
 description: Helm chart for galley deployment
 engine: gotpl
 icon: https://istio.io/favicons/android-192x192.png
@@ -10,4 +10,4 @@ name: galley
 sources:
 - http://github.com/istio/istio
 tillerVersion: '>=2.7.2'
-version: 1.4.2
+version: 1.4.3

charts/rancher-istio/1.4.2/charts/gateways/Chart.yaml → charts/rancher-istio/1.4.3/charts/gateways/Chart.yaml

 apiVersion: v1
-appVersion: 1.4.2
+appVersion: 1.4.3
 description: Helm chart for deploying Istio gateways
 engine: gotpl
 icon: https://istio.io/favicons/android-192x192.png
@@ -12,4 +12,4 @@ name: gateways
 sources:
 - http://github.com/istio/istio
 tillerVersion: '>=2.7.2'
-version: 1.4.2
+version: 1.4.3

charts/rancher-istio/1.4.2/charts/gateways/templates/deployment.yaml → charts/rancher-istio/1.4.3/charts/gateways/templates/deployment.yaml

@@ -257,7 +257,7 @@ spec:
           - name: ISTIO_META_WORKLOAD_NAME
             value: {{ $key }}
           - name: ISTIO_META_OWNER
-            value: kubernetes://api/apps/v1/namespaces/{{ $spec.namespace | default $.Release.Namespace }}/deployments/{{ $key }}
+            value: kubernetes://apis/apps/v1/namespaces/{{ $spec.namespace | default $.Release.Namespace }}/deployments/{{ $key }}
           {{- if $.Values.global.meshID }}
           - name: ISTIO_META_MESH_ID
             value: "{{ $.Values.global.meshID }}"

charts/rancher-istio/1.4.2/charts/grafana/Chart.yaml → charts/rancher-istio/1.4.3/charts/grafana/Chart.yaml

 apiVersion: v1
-appVersion: 1.4.2
+appVersion: 1.4.3
 description: A Helm chart for Kubernetes
 name: grafana
 tillerVersion: '>=2.7.2'
-version: 1.4.2
+version: 1.4.3

charts/rancher-istio/1.4.2/charts/grafana/templates/create-custom-resources-job.yaml → charts/rancher-istio/1.4.3/charts/grafana/templates/create-custom-resources-job.yaml

@@ -75,6 +75,8 @@ spec:
         chart: {{ template "grafana.chart" . }}
         heritage: {{ .Release.Service }}
         release: {{ .Release.Name }}
+      annotations:
+        sidecar.istio.io/inject: "false"
     spec:
       serviceAccountName: istio-grafana-post-install-account
       containers:

charts/rancher-istio/1.4.2/charts/istiocoredns/Chart.yaml → charts/rancher-istio/1.4.3/charts/istiocoredns/Chart.yaml

@@ -3,4 +3,4 @@ appVersion: "0.1"
 description: Istio CoreDNS provides DNS resolution for services in multicluster setups.
 name: istiocoredns
 tillerVersion: '>=2.7.2'
-version: 1.4.2
+version: 1.4.3

charts/rancher-istio/1.4.2/charts/kiali/templates/deployment.yaml → charts/rancher-istio/1.4.3/charts/kiali/templates/deployment.yaml

@@ -71,6 +71,9 @@ spec:
           mountPath: "/kiali-cert"
         - name: kiali-secret
           mountPath: "/kiali-secret"
+        - name: kiali-console
+          subPath: env.js
+          mountPath: /opt/kiali/console/env.js
         resources:
 {{- if .Values.resources }}
 {{ toYaml .Values.resources | indent 10 }}
@@ -78,6 +81,12 @@ spec:
 {{ toYaml .Values.global.defaultResources | indent 10 }}
 {{- end }}
       volumes:
+      - name: kiali-console
+        configMap:
+          name: kiali-console
+          items:
+          - key: env.js
+            path: env.js
       - name: kiali-configuration
         configMap:
           name: kiali

charts/rancher-istio/1.4.3/charts/kiali/templates/kiali-console-configmap.yaml

+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kiali-console
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ template "kiali.name" . }}
+    chart: {{ template "kiali.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+  env.js: |
+    window.WEB_ROOT='/k8s/clusters/{{ .Values.global.rancher.clusterId }}/api/v1/namespaces/istio-system/services/http:kiali:20001/proxy';
\ No newline at end of file

charts/rancher-istio/1.4.2/charts/mixer/Chart.yaml → charts/rancher-istio/1.4.3/charts/mixer/Chart.yaml

 apiVersion: v1
-appVersion: 1.4.2
+appVersion: 1.4.3
 description: Helm chart for mixer deployment
 engine: gotpl
 icon: https://istio.io/favicons/android-192x192.png
@@ -10,4 +10,4 @@ name: mixer
 sources:
 - http://github.com/istio/istio
 tillerVersion: '>=2.7.2'
-version: 1.4.2
+version: 1.4.3

charts/rancher-istio/1.4.2/charts/nodeagent/Chart.yaml → charts/rancher-istio/1.4.3/charts/nodeagent/Chart.yaml

 apiVersion: v1
-appVersion: 1.4.2
+appVersion: 1.4.3
 description: Helm chart for nodeagent deployment
 engine: gotpl
 icon: https://istio.io/favicons/android-192x192.png
@@ -10,4 +10,4 @@ name: nodeagent
 sources:
 - http://github.com/istio/istio
 tillerVersion: '>=2.7.2'
-version: 1.4.2
+version: 1.4.3

charts/rancher-istio/1.4.2/charts/pilot/Chart.yaml → charts/rancher-istio/1.4.3/charts/pilot/Chart.yaml

 apiVersion: v1
-appVersion: 1.4.2
+appVersion: 1.4.3
 description: Helm chart for pilot deployment
 engine: gotpl
 icon: https://istio.io/favicons/android-192x192.png
@@ -10,4 +10,4 @@ name: pilot
 sources:
 - http://github.com/istio/istio
 tillerVersion: '>=2.7.2'
-version: 1.4.2
+version: 1.4.3