From 72af496053eb60b23afb04cf7ca2831cdeaef9d0 Mon Sep 17 00:00:00 2001 From: Guangbo Chen Date: Tue, 27 Aug 2019 14:27:42 +0800 Subject: [PATCH] Bump istio to v1.2.5 release --- charts/rancher-istio/0.0.2/Chart.yaml | 2 +- .../tests/test-citadel-connection.yaml | 2 +- .../tracing/templates/nginx-configmap.yaml | 2 +- charts/rancher-istio/0.0.2/questions.yml | 2 +- charts/rancher-istio/0.0.2/values.yaml | 20 +++++++++---------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/charts/rancher-istio/0.0.2/Chart.yaml b/charts/rancher-istio/0.0.2/Chart.yaml index 2794a00..4aaf5fc 100644 --- a/charts/rancher-istio/0.0.2/Chart.yaml +++ b/charts/rancher-istio/0.0.2/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: rancher-istio version: 0.0.2 -appVersion: 1.2.4 +appVersion: 1.2.5 tillerVersion: ">=2.7.2-0" description: Helm chart for all istio components home: https://istio.io/ diff --git a/charts/rancher-istio/0.0.2/charts/security/templates/tests/test-citadel-connection.yaml b/charts/rancher-istio/0.0.2/charts/security/templates/tests/test-citadel-connection.yaml index a1ec31c..63f193a 100644 --- a/charts/rancher-istio/0.0.2/charts/security/templates/tests/test-citadel-connection.yaml +++ b/charts/rancher-istio/0.0.2/charts/security/templates/tests/test-citadel-connection.yaml @@ -21,7 +21,7 @@ spec: - name: "{{ template "security.fullname" . }}-test" image: "{{ template "system_default_registry" . }}{{ .Values.global.proxy.repository }}:{{ .Values.global.proxy.tag }}" imagePullPolicy: "{{ .Values.global.imagePullPolicy }}" - command: ['sh', '-c', 'for i in 1 2 3; do curl http://istio-citadel:8060/-/ready && exit 0 || sleep 15; done; exit 1'] + command: ['sh', '-c', 'for i in 1 2 3; do curl http://istio-citadel:{{ .Values.global.monitoringPort }}/version && exit 0 || sleep 15; done; exit 1'] restartPolicy: Never affinity: {{- include "nodeaffinity" . | indent 4 }} diff --git a/charts/rancher-istio/0.0.2/charts/tracing/templates/nginx-configmap.yaml b/charts/rancher-istio/0.0.2/charts/tracing/templates/nginx-configmap.yaml index 1d0c3f6..ccaec64 100644 --- a/charts/rancher-istio/0.0.2/charts/tracing/templates/nginx-configmap.yaml +++ b/charts/rancher-istio/0.0.2/charts/tracing/templates/nginx-configmap.yaml @@ -54,7 +54,7 @@ data: proxy_pass http://localhost:16686/; {{ else }} proxy_pass http://localhost:9411/; -{{ end}} +{{ end }} if ($request_filename ~ .*\.(?:js|css|jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm)$) { expires 90d; } diff --git a/charts/rancher-istio/0.0.2/questions.yml b/charts/rancher-istio/0.0.2/questions.yml index e8318e2..cfcea27 100644 --- a/charts/rancher-istio/0.0.2/questions.yml +++ b/charts/rancher-istio/0.0.2/questions.yml @@ -1,2 +1,2 @@ labels: - rancher.istio.v0.0.2: 1.2.4 + rancher.istio.v0.0.2: 1.2.5 diff --git a/charts/rancher-istio/0.0.2/values.yaml b/charts/rancher-istio/0.0.2/values.yaml index 6365bb4..f357a23 100644 --- a/charts/rancher-istio/0.0.2/values.yaml +++ b/charts/rancher-istio/0.0.2/values.yaml @@ -26,7 +26,7 @@ gateways: # sidecarInjectorWebhook: repository: rancher/istio-sidecar_injector - tag: "1.2.4" + tag: "1.2.5" enabled: true # @@ -35,7 +35,7 @@ sidecarInjectorWebhook: # galley: repository: rancher/istio-galley - tag: 1.2.4 + tag: 1.2.5 enabled: true # @@ -44,7 +44,7 @@ galley: # @see charts/mixer/values.yaml, it takes precedence mixer: repository: rancher/istio-mixer - tag: "1.2.4" + tag: "1.2.5" enabled: true policy: # if policy is enabled the global.disablePolicyChecks has affect. @@ -58,7 +58,7 @@ mixer: # @see charts/pilot/values.yaml pilot: repository: rancher/istio-pilot - tag: "1.2.4" + tag: "1.2.5" enabled: true # @@ -66,7 +66,7 @@ pilot: # security: repository: rancher/istio-citadel - tag: "1.2.4" + tag: "1.2.5" enabled: true # @@ -160,7 +160,7 @@ global: # Default tag for Istio images. # tag: release-1.1-latest-daily - tag: 1.2.4 + tag: 1.2.5 # Comma-separated minimum per-scope logging level of messages to output, in the form of :,: # The control plane has different scopes depending on component, but can configure default log level across all components @@ -170,7 +170,7 @@ global: kubectl: repository: rancher/istio-kubectl - tag: 1.2.4 + tag: 1.2.5 # monitoring port used by mixer, pilot, galley monitoringPort: 15014 @@ -194,7 +194,7 @@ global: proxy: repository: rancher/istio-proxyv2 - tag: 1.2.4 + tag: 1.2.5 # cluster domain. Default value is "cluster.local". clusterDomain: "cluster.local" @@ -308,7 +308,7 @@ global: proxy_init: # Base name for the proxy_init container, used to configure iptables. repository: rancher/istio-proxy_init - tag: "1.2.4" + tag: "1.2.5" # imagePullPolicy is applied to istio control plane components. # local tests require IfNotPresent, to avoid uploading to dockerhub. @@ -491,7 +491,7 @@ global: nodeAgent: repository: rancher/istio-node-agent-k8s - tag: "1.2.4" + tag: "1.2.5" sds: # SDS enabled. IF set to true, mTLS certificates for the sidecars will be # distributed through the SecretDiscoveryService instead of using K8S secrets to mount the certificates. -- GitLab