From ccd36b9f0a76ce4d5bc4898f69682b80117a15b1 Mon Sep 17 00:00:00 2001 From: kevinschumacher Date: Sat, 26 Aug 2017 00:16:31 -0400 Subject: [PATCH] [incubator/istio] #1785 namespace defined templates with chart name (#1839) --- incubator/istio/Chart.yaml | 8 ++++---- incubator/istio/templates/NOTES.txt | 2 +- incubator/istio/templates/_helpers.tpl | 12 ++++++------ .../istio/templates/addons-grafana-deployment.yaml | 6 +++--- incubator/istio/templates/addons-grafana-svc.yaml | 6 +++--- .../istio/templates/addons-prometheus-configmap.yaml | 6 +++--- .../templates/addons-prometheus-deployment.yaml | 8 ++++---- incubator/istio/templates/addons-prometheus-svc.yaml | 6 +++--- .../templates/addons-servicegraph-deployment.yaml | 6 +++--- .../istio/templates/addons-servicegraph-svc.yaml | 6 +++--- .../istio/templates/addons-zipkin-deployment.yaml | 6 +++--- incubator/istio/templates/addons-zipkin-svc.yaml | 6 +++--- incubator/istio/templates/ca-deployment.yaml | 6 +++--- incubator/istio/templates/ca-service-account.yaml | 4 ++-- incubator/istio/templates/configmap.yaml | 4 ++-- incubator/istio/templates/egress-deployment.yaml | 6 +++--- incubator/istio/templates/egress-svc.yaml | 6 +++--- incubator/istio/templates/ingress-deployment.yaml | 6 +++--- .../istio/templates/ingress-service-account.yaml | 4 ++-- incubator/istio/templates/ingress-svc.yaml | 6 +++--- incubator/istio/templates/mixer-deployment.yaml | 6 +++--- incubator/istio/templates/mixer-svc.yaml | 6 +++--- incubator/istio/templates/pilot-deployment.yaml | 6 +++--- incubator/istio/templates/pilot-service-account.yaml | 4 ++-- incubator/istio/templates/pilot-svc.yaml | 6 +++--- incubator/istio/templates/rbac.yaml | 2 +- 26 files changed, 75 insertions(+), 75 deletions(-) diff --git a/incubator/istio/Chart.yaml b/incubator/istio/Chart.yaml index 2d8cb79e97..d276d1b979 100644 --- a/incubator/istio/Chart.yaml +++ b/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: lachlan.evenson@microsoft.com +- name: lachie83 + email: lachlan.evenson@microsoft.com diff --git a/incubator/istio/templates/NOTES.txt b/incubator/istio/templates/NOTES.txt index 055f63b09e..193f178d6d 100644 --- a/incubator/istio/templates/NOTES.txt +++ b/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 }} diff --git a/incubator/istio/templates/_helpers.tpl b/incubator/istio/templates/_helpers.tpl index 81b03cdf5f..202e44663d 100644 --- a/incubator/istio/templates/_helpers.tpl +++ b/incubator/istio/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} +{{- define "istio.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -10,7 +10,7 @@ Expand the name of the chart. 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 -}} \ No newline at end of file diff --git a/incubator/istio/templates/addons-grafana-deployment.yaml b/incubator/istio/templates/addons-grafana-deployment.yaml index ad0980082c..184dfd1e24 100644 --- a/incubator/istio/templates/addons-grafana-deployment.yaml +++ b/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: diff --git a/incubator/istio/templates/addons-grafana-svc.yaml b/incubator/istio/templates/addons-grafana-svc.yaml index 2176176acb..4eab77f61c 100644 --- a/incubator/istio/templates/addons-grafana-svc.yaml +++ b/incubator/istio/templates/addons-grafana-svc.yaml @@ -1,11 +1,11 @@ {{ 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: @@ -13,7 +13,7 @@ spec: protocol: TCP name: grafana selector: - app: {{ include "name" . }} + app: {{ include "istio.name" . }} component: {{ $serviceName }}-{{ .Values.addons.grafana.deployment.name }} release: {{ .Release.Name }} {{ end }} diff --git a/incubator/istio/templates/addons-prometheus-configmap.yaml b/incubator/istio/templates/addons-prometheus-configmap.yaml index c83bf7d5bc..c4fdc96ce0 100644 --- a/incubator/istio/templates/addons-prometheus-configmap.yaml +++ b/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 }} \ No newline at end of file diff --git a/incubator/istio/templates/addons-prometheus-deployment.yaml b/incubator/istio/templates/addons-prometheus-deployment.yaml index 74c5f6c9eb..621cbf8335 100644 --- a/incubator/istio/templates/addons-prometheus-deployment.yaml +++ b/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: diff --git a/incubator/istio/templates/addons-prometheus-svc.yaml b/incubator/istio/templates/addons-prometheus-svc.yaml index e300056215..e52676bb09 100644 --- a/incubator/istio/templates/addons-prometheus-svc.yaml +++ b/incubator/istio/templates/addons-prometheus-svc.yaml @@ -1,5 +1,5 @@ {{ if .Values.addons.prometheus.enabled }} -{{- $serviceName := include "fullname" . -}} +{{- $serviceName := include "istio.fullname" . -}} apiVersion: v1 kind: Service metadata: @@ -7,7 +7,7 @@ metadata: # 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 }} diff --git a/incubator/istio/templates/addons-servicegraph-deployment.yaml b/incubator/istio/templates/addons-servicegraph-deployment.yaml index 7b974a2347..08cd796784 100644 --- a/incubator/istio/templates/addons-servicegraph-deployment.yaml +++ b/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: diff --git a/incubator/istio/templates/addons-servicegraph-svc.yaml b/incubator/istio/templates/addons-servicegraph-svc.yaml index c477540ab5..56b4453baf 100644 --- a/incubator/istio/templates/addons-servicegraph-svc.yaml +++ b/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 }} diff --git a/incubator/istio/templates/addons-zipkin-deployment.yaml b/incubator/istio/templates/addons-zipkin-deployment.yaml index 358522b6bb..b6837b5690 100644 --- a/incubator/istio/templates/addons-zipkin-deployment.yaml +++ b/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: diff --git a/incubator/istio/templates/addons-zipkin-svc.yaml b/incubator/istio/templates/addons-zipkin-svc.yaml index eac630ffa6..681c87175d 100644 --- a/incubator/istio/templates/addons-zipkin-svc.yaml +++ b/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 }} \ No newline at end of file diff --git a/incubator/istio/templates/ca-deployment.yaml b/incubator/istio/templates/ca-deployment.yaml index cc2a76f3cf..57326d550b 100644 --- a/incubator/istio/templates/ca-deployment.yaml +++ b/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: diff --git a/incubator/istio/templates/ca-service-account.yaml b/incubator/istio/templates/ca-service-account.yaml index 580b09aad5..3cc4b4a109 100644 --- a/incubator/istio/templates/ca-service-account.yaml +++ b/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 }} \ No newline at end of file diff --git a/incubator/istio/templates/configmap.yaml b/incubator/istio/templates/configmap.yaml index 2b72f338ec..d85384f455 100644 --- a/incubator/istio/templates/configmap.yaml +++ b/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 }} diff --git a/incubator/istio/templates/egress-deployment.yaml b/incubator/istio/templates/egress-deployment.yaml index 871854ac27..aea67c213b 100644 --- a/incubator/istio/templates/egress-deployment.yaml +++ b/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: diff --git a/incubator/istio/templates/egress-svc.yaml b/incubator/istio/templates/egress-svc.yaml index 1cc324a9f2..bfbb8cfb3b 100644 --- a/incubator/istio/templates/egress-svc.yaml +++ b/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 }} \ No newline at end of file diff --git a/incubator/istio/templates/ingress-deployment.yaml b/incubator/istio/templates/ingress-deployment.yaml index 3106192e79..3a03d5907a 100644 --- a/incubator/istio/templates/ingress-deployment.yaml +++ b/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: diff --git a/incubator/istio/templates/ingress-service-account.yaml b/incubator/istio/templates/ingress-service-account.yaml index ea032c4b05..fce2e2d4a3 100644 --- a/incubator/istio/templates/ingress-service-account.yaml +++ b/incubator/istio/templates/ingress-service-account.yaml @@ -1,8 +1,8 @@ -{{- $serviceName := include "fullname" . -}} +{{- $serviceName := include "istio.fullname" . -}} apiVersion: v1 kind: ServiceAccount metadata: name: {{ $serviceName }}-ingress-service-account labels: -{{ include "labels.standard" . | indent 4 }} +{{ include "istio.labels.standard" . | indent 4 }} istio: {{ $serviceName }}-ingress \ No newline at end of file diff --git a/incubator/istio/templates/ingress-svc.yaml b/incubator/istio/templates/ingress-svc.yaml index f6ef6e85e3..ce593ac330 100644 --- a/incubator/istio/templates/ingress-svc.yaml +++ b/incubator/istio/templates/ingress-svc.yaml @@ -1,10 +1,10 @@ -{{- $serviceName := include "fullname" . -}} +{{- $serviceName := include "istio.fullname" . -}} apiVersion: v1 kind: Service metadata: name: istio-ingress labels: -{{ include "labels.standard" . | indent 4 }} +{{ include "istio.labels.standard" . | indent 4 }} istio: {{ $serviceName }}-{{ .Values.ingress.deployment.name }} spec: type: {{ .Values.ingress.service.type }} @@ -14,7 +14,7 @@ spec: - port: {{ .Values.ingress.service.externalHttpsPort }} name: https selector: - app: {{ include "name" . }} + app: {{ include "istio.name" . }} component: {{ $serviceName }}-{{ .Values.ingress.deployment.name }} release: {{ .Release.Name }} istio: {{ $serviceName }}-{{ .Values.ingress.deployment.name }} \ No newline at end of file diff --git a/incubator/istio/templates/mixer-deployment.yaml b/incubator/istio/templates/mixer-deployment.yaml index f239fe6a76..8d00984133 100644 --- a/incubator/istio/templates/mixer-deployment.yaml +++ b/incubator/istio/templates/mixer-deployment.yaml @@ -1,10 +1,10 @@ -{{- $serviceName := include "fullname" . -}} +{{- $serviceName := include "istio.fullname" . -}} apiVersion: extensions/v1beta1 kind: Deployment metadata: name: {{ $serviceName }}-{{ .Values.mixer.deployment.name }} labels: -{{ include "labels.standard" . | indent 4 }} +{{ include "istio.labels.standard" . | indent 4 }} component: {{ $serviceName }}-{{ .Values.mixer.deployment.name }} istio: {{ $serviceName }}-{{ .Values.mixer.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.mixer.deployment.name }} istio: {{ $serviceName }}-{{ .Values.mixer.deployment.name }} spec: diff --git a/incubator/istio/templates/mixer-svc.yaml b/incubator/istio/templates/mixer-svc.yaml index 87633e6396..02583cad7e 100644 --- a/incubator/istio/templates/mixer-svc.yaml +++ b/incubator/istio/templates/mixer-svc.yaml @@ -1,10 +1,10 @@ -{{- $serviceName := include "fullname" . -}} +{{- $serviceName := include "istio.fullname" . -}} apiVersion: v1 kind: Service metadata: name: {{ $serviceName }}-{{ .Values.mixer.deployment.name }} labels: -{{ include "labels.standard" . | indent 4 }} +{{ include "istio.labels.standard" . | indent 4 }} istio: {{ $serviceName }}-{{ .Values.mixer.deployment.name }} annotations: {{- range $key, $value := .Values.mixer.service.annotations }} @@ -20,7 +20,7 @@ spec: - name: prometheus port: {{ .Values.mixer.service.externalPrometheusPort }} selector: - app: {{ include "name" . }} + app: {{ include "istio.name" . }} component: {{ $serviceName }}-{{ .Values.mixer.deployment.name }} release: {{ .Release.Name }} istio: {{ $serviceName }}-{{ .Values.mixer.deployment.name }} \ No newline at end of file diff --git a/incubator/istio/templates/pilot-deployment.yaml b/incubator/istio/templates/pilot-deployment.yaml index fdf3e8f265..5c56b5be9c 100644 --- a/incubator/istio/templates/pilot-deployment.yaml +++ b/incubator/istio/templates/pilot-deployment.yaml @@ -1,10 +1,10 @@ -{{- $serviceName := include "fullname" . -}} +{{- $serviceName := include "istio.fullname" . -}} apiVersion: extensions/v1beta1 kind: Deployment metadata: name: {{ $serviceName }}-{{ .Values.pilot.name }} labels: -{{ include "labels.standard" . | indent 4 }} +{{ include "istio.labels.standard" . | indent 4 }} component: {{ $serviceName }}-{{ .Values.pilot.name }} istio: {{ $serviceName }}-{{ .Values.pilot.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.pilot.name }} istio: {{ $serviceName }}-{{ .Values.pilot.name }} spec: diff --git a/incubator/istio/templates/pilot-service-account.yaml b/incubator/istio/templates/pilot-service-account.yaml index 3ebf7463c9..64480bb80f 100644 --- a/incubator/istio/templates/pilot-service-account.yaml +++ b/incubator/istio/templates/pilot-service-account.yaml @@ -1,8 +1,8 @@ -{{- $serviceName := include "fullname" . -}} +{{- $serviceName := include "istio.fullname" . -}} apiVersion: v1 kind: ServiceAccount metadata: name: {{ $serviceName }}-pilot-service-account labels: -{{ include "labels.standard" . | indent 4 }} +{{ include "istio.labels.standard" . | indent 4 }} istio: {{ $serviceName }}-pilot \ No newline at end of file diff --git a/incubator/istio/templates/pilot-svc.yaml b/incubator/istio/templates/pilot-svc.yaml index c9ed5e5396..0a4e213458 100644 --- a/incubator/istio/templates/pilot-svc.yaml +++ b/incubator/istio/templates/pilot-svc.yaml @@ -1,10 +1,10 @@ -{{- $serviceName := include "fullname" . -}} +{{- $serviceName := include "istio.fullname" . -}} apiVersion: v1 kind: Service metadata: name: {{ .Values.pilot.name }} labels: -{{ include "labels.standard" . | indent 4 }} +{{ include "istio.labels.standard" . | indent 4 }} istio: {{ $serviceName }}-{{ .Values.pilot.name }} spec: type: {{ .Values.pilot.service.type }} @@ -14,7 +14,7 @@ spec: - port: {{ .Values.pilot.service.externalHttpApiServer }} name: http-apiserver selector: - app: {{ include "name" . }} + app: {{ include "istio.name" . }} component: {{ $serviceName }}-{{ .Values.pilot.name }} release: {{ .Release.Name }} istio: {{ $serviceName }}-{{ .Values.pilot.name }} diff --git a/incubator/istio/templates/rbac.yaml b/incubator/istio/templates/rbac.yaml index ffa5bb7ae4..e44400e63c 100644 --- a/incubator/istio/templates/rbac.yaml +++ b/incubator/istio/templates/rbac.yaml @@ -1,5 +1,5 @@ {{ if .Values.rbac.install }} -{{- $serviceName := include "fullname" . -}} +{{- $serviceName := include "istio.fullname" . -}} kind: ClusterRole apiVersion: rbac.authorization.k8s.io/{{ required "A valid .Values.rbac.apiVersion entry required!" .Values.rbac.apiVersion }} metadata: