remove unused parameters for istio remote chart. (istio#6226)

* remove unused parameters for istio remote chart. * update security subchart to use global imagePullPolicy.
xun1009 · Jun 13, 2018 · 4b904ed · 4b904ed
1 parent 8e599d7
commit 4b904ed
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 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
@@ -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
@@ -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