Refine Helm Charts: Add missing namespaces. (istio#4606)

Automatic merge from submit-queue. Refine Helm Charts: Add missing namespaces.
mbhavya · Mar 30, 2018 · 429838b · 429838b
1 parent 1fbc1ab
commit 429838b
Show file tree

Hide file tree

Showing 39 changed files with 51 additions and 7 deletions.
diff --git a/install/kubernetes/helm/istio/charts/grafana/templates/deployment.yaml b/install/kubernetes/helm/istio/charts/grafana/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: grafana
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "grafana.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/charts/grafana/templates/ingress.yaml b/install/kubernetes/helm/istio/charts/grafana/templates/ingress.yaml
@@ -5,6 +5,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ template "grafana.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "grafana.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/charts/grafana/templates/service.yaml b/install/kubernetes/helm/istio/charts/grafana/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: grafana
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "grafana.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/charts/ingress/templates/autoscale.yaml b/install/kubernetes/helm/istio/charts/ingress/templates/autoscale.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
     name: istio-ingress
+    namespace: {{ .Release.Namespace }}
 spec:
     maxReplicas: {{ .Values.autoscaleMax }}
     minReplicas: {{ .Values.autoscaleMin }}

diff --git a/install/kubernetes/helm/istio/charts/ingress/templates/deployment.yaml b/install/kubernetes/helm/istio/charts/ingress/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: istio-ingress
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "istio.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/charts/ingress/templates/service.yaml b/install/kubernetes/helm/istio/charts/ingress/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: istio-ingress
+  namespace: {{ .Release.Namespace }}
   labels:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
@@ -24,6 +25,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: istio-ingress-nodeport
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "istio.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/charts/ingress/templates/serviceaccount.yaml b/install/kubernetes/helm/istio/charts/ingress/templates/serviceaccount.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: istio-ingress-service-account
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "istio.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}

diff --git a/install/kubernetes/helm/istio/charts/mixer/templates/clusterrole.yaml b/install/kubernetes/helm/istio/charts/mixer/templates/clusterrole.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   name: istio-mixer-{{ .Release.Namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "mixer.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}

diff --git a/install/kubernetes/helm/istio/charts/mixer/templates/configmap.yaml b/install/kubernetes/helm/istio/charts/mixer/templates/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: istio-statsd-prom-bridge
+  namespace: {{ .Release.Namespace }}
   labels:
     app: istio-statsd-prom-bridge
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -15,6 +16,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: istio-mixer-custom-resources
+  namespace: {{ .Release.Namespace }}
   labels:
     app: istio-mixer
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/charts/mixer/templates/create-custom-resources-job.yaml b/install/kubernetes/helm/istio/charts/mixer/templates/create-custom-resources-job.yaml
@@ -2,6 +2,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: istio-mixer-create-cr
+  namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook": post-install
     "helm.sh/hook-delete-policy": hook-succeeded

diff --git a/install/kubernetes/helm/istio/charts/mixer/templates/deployment.yaml b/install/kubernetes/helm/istio/charts/mixer/templates/deployment.yaml
@@ -58,6 +58,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: istio-{{ $mname }}
+  namespace: {{ $.Release.Namespace }}
   labels:
     chart: {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}
     release: {{ $.Release.Name }}

diff --git a/install/kubernetes/helm/istio/charts/mixer/templates/service.yaml b/install/kubernetes/helm/istio/charts/mixer/templates/service.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: istio-{{ $mname }}
+  namespace: {{ $.Release.Namespace }}
   labels:
     chart: {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}
     release: {{ $.Release.Name }}

diff --git a/install/kubernetes/helm/istio/charts/mixer/templates/serviceaccount.yaml b/install/kubernetes/helm/istio/charts/mixer/templates/serviceaccount.yaml
@@ -1,9 +1,10 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
+  name: istio-mixer-service-account
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "mixer.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: istio-mixer-service-account
+    release: {{ .Release.Name }}
diff --git a/install/kubernetes/helm/istio/charts/mixer/templates/statsdtoprom.yaml b/install/kubernetes/helm/istio/charts/mixer/templates/statsdtoprom.yaml
@@ -5,6 +5,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: istio-{{ $statsdname }}
+  namespace: {{ .Release.Namespace }}
   labels:
     chart: {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}
     release: {{ $.Release.Name }}
@@ -25,6 +26,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: istio-{{ $statsdname }}
+  namespace: {{ .Release.Namespace }}
   labels:
     chart: {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}
     release: {{ $.Release.Name }}

diff --git a/install/kubernetes/helm/istio/charts/pilot/templates/clusterrole.yaml b/install/kubernetes/helm/istio/charts/pilot/templates/clusterrole.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   name: istio-pilot-{{ .Release.Namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: istio-pilot
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}

diff --git a/install/kubernetes/helm/istio/charts/pilot/templates/deployment.yaml b/install/kubernetes/helm/istio/charts/pilot/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: istio-pilot
+  namespace: {{ .Release.Namespace }}
   # TODO: default tempate doesn't have this, which one is right ?
   labels:
     app: istio-pilot

diff --git a/install/kubernetes/helm/istio/charts/pilot/templates/service.yaml b/install/kubernetes/helm/istio/charts/pilot/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: istio-pilot
+  namespace: {{ .Release.Namespace }}
   labels:
     app: istio-pilot
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/charts/pilot/templates/serviceaccount.yaml b/install/kubernetes/helm/istio/charts/pilot/templates/serviceaccount.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: istio-pilot-service-account
+  namespace: {{ .Release.Namespace }}
   labels:
     app: istio-pilot
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}

diff --git a/install/kubernetes/helm/istio/charts/prometheus/templates/clusterrole.yaml b/install/kubernetes/helm/istio/charts/prometheus/templates/clusterrole.yaml
@@ -4,6 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   name: prometheus-{{ .Release.Namespace }}
+  namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups: [""]
   resources:
@@ -24,6 +25,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   name: prometheus-{{ .Release.Namespace }}
+  namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

diff --git a/install/kubernetes/helm/istio/charts/prometheus/templates/configmap.yaml b/install/kubernetes/helm/istio/charts/prometheus/templates/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: prometheus
+  namespace: {{ .Release.Namespace }}
   labels:
     app: prometheus
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/charts/prometheus/templates/deployment.yaml b/install/kubernetes/helm/istio/charts/prometheus/templates/deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: prometheus
+  namespace: {{ .Release.Namespace }}
   labels:
     app: prometheus
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/charts/prometheus/templates/ingress.yaml b/install/kubernetes/helm/istio/charts/prometheus/templates/ingress.yaml
@@ -3,6 +3,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: prometheus
+  namespace: {{ .Release.Namespace }}
   labels:
     app: prometheus
   annotations:

diff --git a/install/kubernetes/helm/istio/charts/prometheus/templates/service.yaml b/install/kubernetes/helm/istio/charts/prometheus/templates/service.yaml
@@ -1,11 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
+  name: prometheus
+  namespace: {{ .Release.Namespace }}
   annotations:
     prometheus.io/scrape: 'true'
   labels:
     name: prometheus
-  name: prometheus
 spec:
   selector:
     app: prometheus
@@ -21,6 +22,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: prometheus-nodeport
+  namespace: {{ .Release.Namespace }}
   labels:
     name: prometheus
 spec:

diff --git a/install/kubernetes/helm/istio/charts/prometheus/templates/serviceaccount.yaml b/install/kubernetes/helm/istio/charts/prometheus/templates/serviceaccount.yaml
@@ -2,3 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: prometheus
+  namespace: {{ .Release.Namespace }}
diff --git a/install/kubernetes/helm/istio/charts/security/templates/clusterrole.yaml b/install/kubernetes/helm/istio/charts/security/templates/clusterrole.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   name: istio-ca-{{ .Release.Namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "security.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}

diff --git a/install/kubernetes/helm/istio/charts/security/templates/deployment.yaml b/install/kubernetes/helm/istio/charts/security/templates/deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: istio-ca
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "security.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/charts/security/templates/service.yaml b/install/kubernetes/helm/istio/charts/security/templates/service.yaml
@@ -4,6 +4,7 @@ metadata:
   # we use the normal name here (e.g. 'prometheus')
   # as grafana is configured to use this as a data source
   name: istio-ca
+  namespace: {{ .Release.Namespace }}
   labels:
     app: istio-ca
 spec:

diff --git a/install/kubernetes/helm/istio/charts/security/templates/serviceaccount.yaml b/install/kubernetes/helm/istio/charts/security/templates/serviceaccount.yaml
@@ -1,9 +1,10 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
+  name: istio-ca-service-account
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "security.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: istio-ca-service-account
+    release: {{ .Release.Name }}
diff --git a/install/kubernetes/helm/istio/charts/servicegraph/templates/deployment.yaml b/install/kubernetes/helm/istio/charts/servicegraph/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: servicegraph
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "servicegraph.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/charts/servicegraph/templates/ingress.yaml b/install/kubernetes/helm/istio/charts/servicegraph/templates/ingress.yaml
@@ -5,6 +5,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ template "servicegraph.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "servicegraph.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/charts/servicegraph/templates/service.yaml b/install/kubernetes/helm/istio/charts/servicegraph/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: servicegraph
+  namespace: {{ .Release.Namespace }}
   labels:
     app: servicegraph
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/charts/sidecar-injector/templates/configmap.yaml b/install/kubernetes/helm/istio/charts/sidecar-injector/templates/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: istio-sidecar-injector
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "sidecar-injector.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/charts/sidecar-injector/templates/deployment.yaml b/install/kubernetes/helm/istio/charts/sidecar-injector/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: istio-sidecar-injector
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "sidecar-injector.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/charts/sidecar-injector/templates/mutatingwebhook.yaml b/install/kubernetes/helm/istio/charts/sidecar-injector/templates/mutatingwebhook.yaml
@@ -2,11 +2,12 @@ apiVersion: admissionregistration.k8s.io/v1beta1
 kind: MutatingWebhookConfiguration
 metadata:
   name: istio-sidecar-injector
+  namespace: {{ .Release.Namespace }}
   labels:
     app: istio-sidecar-injector
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}    
+    heritage: {{ .Release.Service }}
 webhooks:
   - name: sidecar-injector.istio.io
     clientConfig:
@@ -23,4 +24,4 @@ webhooks:
     failurePolicy: Fail
     namespaceSelector:
       matchLabels:
-        istio-injection: enabled
+        istio-injection: enabled
diff --git a/install/kubernetes/helm/istio/charts/sidecar-injector/templates/service.yaml b/install/kubernetes/helm/istio/charts/sidecar-injector/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: istio-sidecar-injector
+  namespace: {{ .Release.Namespace }}
   labels:
     istio: sidecar-injector
 spec:

diff --git a/install/kubernetes/helm/istio/charts/zipkin/templates/deployment.yaml b/install/kubernetes/helm/istio/charts/zipkin/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: zipkin
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zipkin.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/charts/zipkin/templates/ingress.yaml b/install/kubernetes/helm/istio/charts/zipkin/templates/ingress.yaml
@@ -5,6 +5,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ template "zipkin.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zipkin.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/charts/zipkin/templates/service.yaml b/install/kubernetes/helm/istio/charts/zipkin/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: zipkin
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "zipkin.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/install/kubernetes/helm/istio/templates/configmap.yaml b/install/kubernetes/helm/istio/templates/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: istio
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "istio.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}