[stable/percona] #1785 namespace defined templates with chart name (#2163)

This commit is contained in:
Kevin Schumacher
2017-10-05 00:30:42 +05:30
committed by Dhilip
parent 80f65b1dd0
commit 587fb325db
7 changed files with 24 additions and 23 deletions
+5 -4
View File
@@ -1,6 +1,7 @@
name: percona
version: 0.2.2
description: free, fully compatible, enhanced, open source drop-in replacement for MySQL
name: percona
version: 0.3.0
description: free, fully compatible, enhanced, open source drop-in replacement for
MySQL
keywords:
- mysql
- percona
@@ -13,5 +14,5 @@ sources:
- https://github.com/docker-library/percona
maintainers:
- name: Patrick Galbraith
email: patg@patg.net
email: patg@patg.net
engine: gotpl
+3 -3
View File
@@ -1,9 +1,9 @@
Percona can be accessed via port 3306 on the following DNS name from within your cluster:
{{ template "fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
{{ template "percona.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
To get your root password run:
kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.mysql-root-password}" | base64 --decode; echo
kubectl get secret --namespace {{ .Release.Namespace }} {{ template "percona.fullname" . }} -o jsonpath="{.data.mysql-root-password}" | base64 --decode; echo
To connect to your database:
@@ -12,5 +12,5 @@ To connect to your database:
kubectl run -i --tty percona-client --image=percona:5.7 --restart=Never -- bash -il
2. Connect using the mysql cli, then provide your password:
$ mysql -h {{ template "fullname" . }} -p
$ mysql -h {{ template "percona.fullname" . }} -p
+2 -2
View File
@@ -3,7 +3,7 @@
Expand the name of the chart.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
*/}}
{{- define "name" -}}
{{- define "percona.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
@@ -11,7 +11,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
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 "percona.fullname" -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
+7 -7
View File
@@ -1,9 +1,9 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: {{ template "fullname" . }}
name: {{ template "percona.fullname" . }}
labels:
app: {{ template "fullname" . }}
app: {{ template "percona.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
@@ -11,7 +11,7 @@ spec:
template:
metadata:
labels:
app: {{ template "fullname" . }}
app: {{ template "percona.fullname" . }}
spec:
initContainers:
- name: "remove-lost-found"
@@ -25,7 +25,7 @@ spec:
- name: data
mountPath: /var/lib/mysql
containers:
- name: {{ template "fullname" . }}
- name: {{ template "percona.fullname" . }}
image: "mysql:{{ .Values.imageTag }}"
imagePullPolicy: {{ .Values.imagePullPolicy | quote }}
resources:
@@ -38,12 +38,12 @@ spec:
- name: MYSQL_ROOT_PASSWORD
valueFrom:
secretKeyRef:
name: {{ template "fullname" . }}
name: {{ template "percona.fullname" . }}
key: mysql-root-password
- name: MYSQL_PASSWORD
valueFrom:
secretKeyRef:
name: {{ template "fullname" . }}
name: {{ template "percona.fullname" . }}
key: mysql-password
{{- end }}
- name: MYSQL_USER
@@ -74,7 +74,7 @@ spec:
- name: data
{{- if .Values.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ template "fullname" . }}
claimName: {{ template "percona.fullname" . }}
{{- else }}
emptyDir: {}
{{- end -}}
+2 -2
View File
@@ -2,9 +2,9 @@
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ template "fullname" . }}
name: {{ template "percona.fullname" . }}
labels:
app: {{ template "fullname" . }}
app: {{ template "percona.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
+2 -2
View File
@@ -1,9 +1,9 @@
apiVersion: v1
kind: Secret
metadata:
name: {{ template "fullname" . }}
name: {{ template "percona.fullname" . }}
labels:
app: {{ template "fullname" . }}
app: {{ template "percona.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
+3 -3
View File
@@ -1,9 +1,9 @@
apiVersion: v1
kind: Service
metadata:
name: {{ template "fullname" . }}
name: {{ template "percona.fullname" . }}
labels:
app: {{ template "fullname" . }}
app: {{ template "percona.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
@@ -13,4 +13,4 @@ spec:
port: 3306
targetPort: mysql
selector:
app: {{ template "fullname" . }}
app: {{ template "percona.fullname" . }}