[incubator/istio] #1785 namespace defined templates with chart name

incubator/istio/Chart.yaml

@@ -1,12 +1,12 @@
 apiVersion: v1
 description: Istio Helm chart for Kubernetes
 name: istio
-version: 0.1.6-chart5
+version: 0.2.6-chart5
 appVersion: 0.1.6
 home: https://istio.io/
 icon: https://raw.githubusercontent.com/istio/istio.github.io/master/favicons/mstile-150x150.png
 sources:
-  - https://github.com/istio/istio
+- https://github.com/istio/istio
 maintainers:
-  - name: lachie83
-    email: [email protected]
+- name: lachie83
+  email: [email protected]

incubator/istio/templates/NOTES.txt

@@ -1,4 +1,4 @@
-{{- $serviceName := include "fullname" . -}}
+{{- $serviceName := include "istio.fullname" . -}}
 Verify all Pods are running
 
   kubectl get pods --namespace {{ .Release.Namespace }}

incubator/istio/templates/_helpers.tpl

@@ -2,15 +2,15 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "istio.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "fullname" -}}
+{{- define "istio.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -21,11 +21,11 @@ https://github.com/technosophos/common-chart/
 labels.standard prints the standard Helm labels.
 The standard labels are frequently used in metadata.
 */ -}}
-{{- define "labels.standard" -}}
-app: {{ template "name" . }}
+{{- define "istio.labels.standard" -}}
+app: {{ template "istio.name" . }}
 heritage: {{ .Release.Service | quote }}
 release: {{ .Release.Name | quote }}
-chart: {{ template "chartref" . }}
+chart: {{ template "istio.chartref" . }}
 {{- end -}}
 
 {{- /*
@@ -37,6 +37,6 @@ Example output:
   zookeeper-1.2.3
   wordpress-3.2.1_20170219
 */ -}}
-{{- define "chartref" -}}
+{{- define "istio.chartref" -}}
   {{- replace "+" "_" .Chart.Version | printf "%s-%s" .Chart.Name -}}
 {{- end -}}

incubator/istio/templates/addons-grafana-deployment.yaml

@@ -1,11 +1,11 @@
 {{ if .Values.addons.grafana.enabled }}
-{{- $serviceName := include "fullname" . -}}
+{{- $serviceName := include "istio.fullname" . -}}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: {{ $serviceName }}-{{ .Values.addons.grafana.deployment.name }}
   labels:
-{{ include "labels.standard" . | indent 4 }}
+{{ include "istio.labels.standard" . | indent 4 }}
     component: {{ $serviceName }}-{{ .Values.addons.grafana.deployment.name }}
 spec:
   replicas: {{ .Values.addons.grafana.deployment.replicas }}
@@ -16,7 +16,7 @@ spec:
           {{ $key }}: {{ $value | quote }}
         {{- end }}
       labels:
-{{ include "labels.standard" . | indent 8 }}
+{{ include "istio.labels.standard" . | indent 8 }}
         component: {{ $serviceName }}-{{ .Values.addons.grafana.deployment.name }}
     spec:
       containers:

incubator/istio/templates/addons-grafana-svc.yaml

@@ -1,19 +1,19 @@
 {{ if .Values.addons.grafana.enabled }}
-{{- $serviceName := include "fullname" . -}}
+{{- $serviceName := include "istio.fullname" . -}}
 apiVersion: v1
 kind: Service
 metadata:
   name: {{ $serviceName }}-{{ .Values.addons.grafana.deployment.name }}
   labels:
-{{ include "labels.standard" . | indent 4 }}
+{{ include "istio.labels.standard" . | indent 4 }}
 spec:
   type: {{ .Values.addons.grafana.service.type }}
   ports:
   - port: {{ .Values.addons.grafana.service.externalPort }}
     protocol: TCP
     name: grafana
   selector:
-    app: {{ include "name" . }}
+    app: {{ include "istio.name" . }}
     component: {{ $serviceName }}-{{ .Values.addons.grafana.deployment.name }}
     release: {{ .Release.Name }}
 {{ end }}

incubator/istio/templates/addons-prometheus-configmap.yaml

@@ -1,11 +1,11 @@
 {{ if .Values.addons.prometheus.enabled }}
-{{- $serviceName := include "fullname" . -}}
+{{- $serviceName := include "istio.fullname" . -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ $serviceName }}-{{ .Values.addons.prometheus.deployment.name }}
   labels:
-{{ include "labels.standard" . | indent 4 }}
+{{ include "istio.labels.standard" . | indent 4 }}
 data:
   prometheus.yml: |-
     global:
@@ -18,5 +18,5 @@ data:
       # metrics_path defaults to '/metrics'
       # scheme defaults to 'http'.
       static_configs:
-      - targets: ['{{ template "fullname" . }}-mixer:{{ .Values.mixer.service.externalPrometheusPort }}']
+      - targets: ['{{ template "istio.fullname" . }}-mixer:{{ .Values.mixer.service.externalPrometheusPort }}']
 {{ end }}

incubator/istio/templates/addons-prometheus-deployment.yaml

@@ -1,17 +1,17 @@
 {{ if .Values.addons.prometheus.enabled }}
-{{- $serviceName := include "fullname" . -}}
+{{- $serviceName := include "istio.fullname" . -}}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: {{ $serviceName }}-{{ .Values.addons.prometheus.deployment.name }}
   labels:
-{{ include "labels.standard" . | indent 4 }}
+{{ include "istio.labels.standard" . | indent 4 }}
     component: {{ $serviceName }}-{{ .Values.addons.prometheus.deployment.name }}
 spec:
   replicas: {{ .Values.addons.prometheus.deployment.replicas }}
   selector:
     matchLabels:
-{{ include "labels.standard" . | indent 6 }}
+{{ include "istio.labels.standard" . | indent 6 }}
       component: {{ $serviceName }}-{{ .Values.addons.prometheus.deployment.name }}
   template:
     metadata:
@@ -21,7 +21,7 @@ spec:
         {{- end }}
       name: {{ $serviceName }}-{{ .Values.addons.prometheus.deployment.name }}
       labels:
-{{ include "labels.standard" . | indent 8 }}
+{{ include "istio.labels.standard" . | indent 8 }}
         component: {{ $serviceName }}-{{ .Values.addons.prometheus.deployment.name }}
     spec:
       containers:

incubator/istio/templates/addons-prometheus-svc.yaml

@@ -1,13 +1,13 @@
 {{ if .Values.addons.prometheus.enabled }}
-{{- $serviceName := include "fullname" . -}}
+{{- $serviceName := include "istio.fullname" . -}}
 apiVersion: v1
 kind: Service
 metadata:
   # Grafana datasource config is hardcoded to prometheus:9090
   # name: {{ $serviceName }}-prometheus
   name: {{ .Values.addons.prometheus.deployment.name }}
   labels:
-{{ include "labels.standard" . | indent 4 }}
+{{ include "istio.labels.standard" . | indent 4 }}
   annotations:
     {{- range $key, $value := .Values.addons.prometheus.service.annotations }}
       {{ $key }}: {{ $value | quote }}
@@ -19,7 +19,7 @@ spec:
     protocol: TCP
     port: {{ .Values.addons.prometheus.service.externalPort }}
   selector:
-    app: {{ include "name" . }}
+    app: {{ include "istio.name" . }}
     component: {{ $serviceName }}-{{ .Values.addons.prometheus.deployment.name }}
     release: {{ .Release.Name }}
 {{ end }}

incubator/istio/templates/addons-servicegraph-deployment.yaml

@@ -1,11 +1,11 @@
 {{ if .Values.addons.servicegraph.enabled }}
-{{- $serviceName := include "fullname" . -}}
+{{- $serviceName := include "istio.fullname" . -}}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: {{ $serviceName }}-{{ .Values.addons.servicegraph.deployment.name }}
   labels:
-{{ include "labels.standard" . | indent 4 }}
+{{ include "istio.labels.standard" . | indent 4 }}
     component: {{ $serviceName }}-{{ .Values.addons.servicegraph.deployment.name }}
 spec:
   replicas: {{ .Values.addons.servicegraph.deployment.replicas }}
@@ -16,7 +16,7 @@ spec:
           {{ $key }}: {{ $value | quote }}
         {{- end }}
       labels:
-{{ include "labels.standard" . | indent 8 }}
+{{ include "istio.labels.standard" . | indent 8 }}
         component: {{ $serviceName }}-{{ .Values.addons.servicegraph.deployment.name }}
     spec:
       containers:

incubator/istio/templates/addons-servicegraph-svc.yaml

@@ -1,18 +1,18 @@
 {{ if .Values.addons.servicegraph.enabled }}
-{{- $serviceName := include "fullname" . -}}
+{{- $serviceName := include "istio.fullname" . -}}
 apiVersion: v1
 kind: Service
 metadata:
   name: {{ $serviceName }}-{{ .Values.addons.servicegraph.deployment.name }}
   labels:
-{{ include "labels.standard" . | indent 4 }}
+{{ include "istio.labels.standard" . | indent 4 }}
 spec:
   type: {{ .Values.addons.servicegraph.service.type }}
   ports:
   - name: http
     port: {{ .Values.addons.servicegraph.service.externalPort }}
   selector:
-    app: {{ include "name" . }}
+    app: {{ include "istio.name" . }}
     component: {{ $serviceName }}-{{ .Values.addons.servicegraph.deployment.name }}
     release: {{ .Release.Name }}
 {{ end }}

incubator/istio/templates/addons-zipkin-deployment.yaml

@@ -1,11 +1,11 @@
 {{ if .Values.addons.zipkin.enabled }}
-{{- $serviceName := include "fullname" . -}}
+{{- $serviceName := include "istio.fullname" . -}}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: {{ $serviceName }}-{{ .Values.addons.zipkin.deployment.name }}
   labels:
-{{ include "labels.standard" . | indent 4 }}
+{{ include "istio.labels.standard" . | indent 4 }}
     component: {{ $serviceName }}-{{ .Values.addons.zipkin.deployment.name }}
 spec:
   replicas: {{ .Values.addons.zipkin.deployment.replicas }}
@@ -16,7 +16,7 @@ spec:
           {{ $key }}: {{ $value | quote }}
         {{- end }}
       labels:
-{{ include "labels.standard" . | indent 8 }}
+{{ include "istio.labels.standard" . | indent 8 }}
         component: {{ $serviceName }}-{{ .Values.addons.zipkin.deployment.name }}
     spec:
       containers:

incubator/istio/templates/addons-zipkin-svc.yaml

@@ -1,18 +1,18 @@
 {{ if .Values.addons.zipkin.enabled }}
-{{- $serviceName := include "fullname" . -}}
+{{- $serviceName := include "istio.fullname" . -}}
 apiVersion: v1
 kind: Service
 metadata:
   name: {{ $serviceName }}-zipkin
   labels:
-{{ include "labels.standard" . | indent 4 }}
+{{ include "istio.labels.standard" . | indent 4 }}
 spec:
   type: {{ .Values.addons.zipkin.service.type }}
   ports:
   - name: http
     port: {{ .Values.addons.zipkin.service.externalPort }}
   selector:
-    app: {{ include "name" . }}
+    app: {{ include "istio.name" . }}
     component: {{ $serviceName }}-{{ .Values.addons.zipkin.deployment.name }}
     release: {{ .Release.Name }}
 {{ end }}

incubator/istio/templates/ca-deployment.yaml

@@ -1,12 +1,12 @@
 {{ if .Values.auth.enabled }}
-{{- $serviceName := include "fullname" . -}}
+{{- $serviceName := include "istio.fullname" . -}}
 apiVersion: v1
 kind: Deployment
 apiVersion: extensions/v1beta1
 metadata:
   name: {{ $serviceName }}-{{ .Values.ca.deployment.name }}
   labels:
-{{ include "labels.standard" . | indent 4 }}
+{{ include "istio.labels.standard" . | indent 4 }}
     component: {{ $serviceName }}-{{ .Values.ca.deployment.name }}
     istio: {{ $serviceName }}-{{ .Values.ca.deployment.name }}
 spec:
@@ -18,7 +18,7 @@ spec:
           {{ $key }}: {{ $value | quote }}
         {{- end }}
       labels:
-{{ include "labels.standard" . | indent 8 }}
+{{ include "istio.labels.standard" . | indent 8 }}
         component: {{ $serviceName }}-{{ .Values.ca.deployment.name }}
         istio: {{ $serviceName }}-{{ .Values.ca.deployment.name }}
     spec:

incubator/istio/templates/ca-service-account.yaml

@@ -1,10 +1,10 @@
 {{ if .Values.auth.enabled }}
-{{- $serviceName := include "fullname" . -}}
+{{- $serviceName := include "istio.fullname" . -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ $serviceName }}-ca-service-account
   labels:
-{{ include "labels.standard" . | indent 4 }}
+{{ include "istio.labels.standard" . | indent 4 }}
     istio: {{ $serviceName }}-ca
 {{ end }}

incubator/istio/templates/configmap.yaml

@@ -1,11 +1,11 @@
 {{- if not .Values.pilot.customConfigMap }}
-{{- $serviceName := include "fullname" . -}}
+{{- $serviceName := include "istio.fullname" . -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: istio
   labels:
-{{ include "labels.standard" . | indent 4 }}
+{{ include "istio.labels.standard" . | indent 4 }}
 data:
   mesh: |-
 {{ if .Values.auth.enabled }}

incubator/istio/templates/egress-deployment.yaml

@@ -1,10 +1,10 @@
-{{- $serviceName := include "fullname" . -}}
+{{- $serviceName := include "istio.fullname" . -}}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: {{ $serviceName }}-{{ .Values.egress.deployment.name }}
   labels:
-{{ include "labels.standard" . | indent 4 }}
+{{ include "istio.labels.standard" . | indent 4 }}
     component: {{ $serviceName }}-{{ .Values.egress.deployment.name }}
     istio: {{ $serviceName }}-egress
 spec:
@@ -16,7 +16,7 @@ spec:
           {{ $key }}: {{ $value | quote }}
         {{- end }}
       labels:
-{{ include "labels.standard" . | indent 8 }}
+{{ include "istio.labels.standard" . | indent 8 }}
         component: {{ $serviceName }}-{{ .Values.egress.deployment.name }}
         istio: {{ $serviceName }}-{{ .Values.egress.deployment.name }}
     spec:

incubator/istio/templates/egress-svc.yaml

@@ -1,17 +1,17 @@
-{{- $serviceName := include "fullname" . -}}
+{{- $serviceName := include "istio.fullname" . -}}
 apiVersion: v1
 kind: Service
 metadata:
   name: istio-egress
   labels:
-{{ include "labels.standard" . | indent 4 }}
+{{ include "istio.labels.standard" . | indent 4 }}
     istio: {{ $serviceName }}-egress
 spec:
   type: {{ .Values.egress.service.type }}
   ports:
   - port: {{ .Values.egress.service.externalHttpPort }}
   selector:
-    app: {{ include "name" . }}
+    app: {{ include "istio.name" . }}
     component: {{ $serviceName }}-{{ .Values.egress.deployment.name }}
     release: {{ .Release.Name }}
     istio: {{ $serviceName }}-{{ .Values.egress.deployment.name }}

incubator/istio/templates/ingress-deployment.yaml

@@ -1,10 +1,10 @@
-{{- $serviceName := include "fullname" . -}}
+{{- $serviceName := include "istio.fullname" . -}}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: {{ $serviceName }}-{{ .Values.ingress.deployment.name }}
   labels:
-{{ include "labels.standard" . | indent 4 }}
+{{ include "istio.labels.standard" . | indent 4 }}
     component: {{ $serviceName }}-{{ .Values.ingress.deployment.name }}
     istio: {{ $serviceName }}-{{ .Values.ingress.deployment.name }}
 spec:
@@ -16,7 +16,7 @@ spec:
           {{ $key }}: {{ $value | quote }}
         {{- end }}
       labels:
-{{ include "labels.standard" . | indent 8 }}
+{{ include "istio.labels.standard" . | indent 8 }}
         component: {{ $serviceName }}-{{ .Values.ingress.deployment.name }}
         istio: {{ $serviceName }}-{{ .Values.ingress.deployment.name }}
     spec: