diff --git a/stable/gcloud-sqlproxy/Chart.yaml b/stable/gcloud-sqlproxy/Chart.yaml index 2b733bee61de..7dd7753313af 100644 --- a/stable/gcloud-sqlproxy/Chart.yaml +++ b/stable/gcloud-sqlproxy/Chart.yaml @@ -1,5 +1,5 @@ name: gcloud-sqlproxy -version: 0.1.1 +version: 0.2.0 description: Google Cloud SQL Proxy keywords: - google diff --git a/stable/gcloud-sqlproxy/templates/NOTES.txt b/stable/gcloud-sqlproxy/templates/NOTES.txt index 4389d0d06d6f..8822510503a9 100644 --- a/stable/gcloud-sqlproxy/templates/NOTES.txt +++ b/stable/gcloud-sqlproxy/templates/NOTES.txt @@ -24,7 +24,7 @@ settings were not provided. The SQL server instance can be accessed via port {{ .Values.cloudsql.port }} on the following DNS name from within your cluster: -- {{ template "fullname" . }}.{{ .Release.Namespace }} +- {{ template "gcloud-sqlproxy.fullname" . }}.{{ .Release.Namespace }} {{- else -}} diff --git a/stable/gcloud-sqlproxy/templates/_helpers.tpl b/stable/gcloud-sqlproxy/templates/_helpers.tpl index f0d83d2edba6..60c5d361e893 100644 --- a/stable/gcloud-sqlproxy/templates/_helpers.tpl +++ b/stable/gcloud-sqlproxy/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} +{{- define "gcloud-sqlproxy.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 "gcloud-sqlproxy.fullname" -}} {{- $name := default .Chart.Name .Values.nameOverride -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} diff --git a/stable/gcloud-sqlproxy/templates/deployment.yaml b/stable/gcloud-sqlproxy/templates/deployment.yaml index b6581c21525e..9c88b63d3354 100644 --- a/stable/gcloud-sqlproxy/templates/deployment.yaml +++ b/stable/gcloud-sqlproxy/templates/deployment.yaml @@ -2,9 +2,9 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "fullname" . }} + name: {{ template "gcloud-sqlproxy.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "gcloud-sqlproxy.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -13,7 +13,7 @@ spec: template: metadata: labels: - app: {{ template "fullname" . }} + app: {{ template "gcloud-sqlproxy.fullname" . }} spec: containers: - name: sqlproxy @@ -37,7 +37,7 @@ spec: volumes: - name: cloudsql-oauth-credentials secret: - secretName: {{ template "fullname" . }} + secretName: {{ template "gcloud-sqlproxy.fullname" . }} - name: ssl-certs hostPath: path: /etc/ssl/certs diff --git a/stable/gcloud-sqlproxy/templates/secrets.yaml b/stable/gcloud-sqlproxy/templates/secrets.yaml index cd407497881b..29603da5e6b5 100644 --- a/stable/gcloud-sqlproxy/templates/secrets.yaml +++ b/stable/gcloud-sqlproxy/templates/secrets.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "fullname" . }} + name: {{ template "gcloud-sqlproxy.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "gcloud-sqlproxy.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/stable/gcloud-sqlproxy/templates/svc.yaml b/stable/gcloud-sqlproxy/templates/svc.yaml index 6e286b17146f..58699cd3c71e 100644 --- a/stable/gcloud-sqlproxy/templates/svc.yaml +++ b/stable/gcloud-sqlproxy/templates/svc.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "fullname" . }} + name: {{ template "gcloud-sqlproxy.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "gcloud-sqlproxy.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -14,4 +14,4 @@ spec: port: {{ .Values.cloudsql.port }} targetPort: sqlproxy selector: - app: {{ template "fullname" . }} + app: {{ template "gcloud-sqlproxy.fullname" . }}