From 4b904ed6d92707123490aac21756fdcd8a53e9f8 Mon Sep 17 00:00:00 2001 From: Morven Cao Date: Wed, 13 Jun 2018 13:53:00 +0800 Subject: [PATCH] remove unused parameters for istio remote chart. (#6226) * remove unused parameters for istio remote chart. * update security subchart to use global imagePullPolicy. --- .../charts/security/templates/deployment.yaml | 2 +- install/kubernetes/helm/istio-remote/values.yaml | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/install/kubernetes/helm/istio-remote/charts/security/templates/deployment.yaml b/install/kubernetes/helm/istio-remote/charts/security/templates/deployment.yaml index a1209d76de2a..7f44753b8d29 100644 --- a/install/kubernetes/helm/istio-remote/charts/security/templates/deployment.yaml +++ b/install/kubernetes/helm/istio-remote/charts/security/templates/deployment.yaml @@ -23,7 +23,7 @@ spec: containers: - name: citadel image: "{{ .Values.global.hub }}/{{ .Values.image }}:{{ .Values.global.tag }}" - imagePullPolicy: {{ .Values.imagePullPolicy }} + imagePullPolicy: {{ .Values.global.imagePullPolicy }} args: - --append-dns-names=true - --grpc-port=8060 diff --git a/install/kubernetes/helm/istio-remote/values.yaml b/install/kubernetes/helm/istio-remote/values.yaml index 7ac53c72648a..4035203df7a7 100644 --- a/install/kubernetes/helm/istio-remote/values.yaml +++ b/install/kubernetes/helm/istio-remote/values.yaml @@ -28,17 +28,10 @@ global: # Should track latest released version. # Currently using nightly build, for testing tag: circleci-nightly - proxy: - image: proxyv2 # imagePullPolicy is applied to istio control plane components. imagePullPolicy: IfNotPresent - # Not recommended for user to configure this. Hyperkube image to use when creating custom resources - hyperkube: - repository: quay.io/coreos/hyperkube - tag: v1.7.6_coreos.0 - # create RBAC resources. Must be set for any cluster configured with rbac. rbacEnabled: true @@ -63,7 +56,6 @@ security: serviceAccountName: default # used only if RBAC is not enabled replicaCount: 1 image: citadel - imagePullPolicy: IfNotPresent resources: {} # limits: # cpu: 100m