From f5c75f0b11d8afcec9d7d327e281ad8916fce7a6 Mon Sep 17 00:00:00 2001 From: Kevin Schumacher Date: Sun, 17 Sep 2017 15:42:05 -0400 Subject: [PATCH] [stable/mediawiki] #1785 namespace defined templates with chart name --- stable/mediawiki/Chart.yaml | 5 +++-- stable/mediawiki/templates/NOTES.txt | 10 +++++----- stable/mediawiki/templates/_helpers.tpl | 6 +++--- stable/mediawiki/templates/apache-pvc.yaml | 4 ++-- stable/mediawiki/templates/deployment.yaml | 20 +++++++++---------- stable/mediawiki/templates/mediawiki-pvc.yaml | 4 ++-- stable/mediawiki/templates/secrets.yaml | 4 ++-- stable/mediawiki/templates/svc.yaml | 6 +++--- 8 files changed, 30 insertions(+), 29 deletions(-) diff --git a/stable/mediawiki/Chart.yaml b/stable/mediawiki/Chart.yaml index 8b6bd303e37c..b8be9bba064a 100644 --- a/stable/mediawiki/Chart.yaml +++ b/stable/mediawiki/Chart.yaml @@ -1,7 +1,8 @@ name: mediawiki -version: 0.4.16 +version: 0.5.0 appVersion: 1.29.1 -description: Extremely powerful, scalable software and a feature-rich wiki implementation that uses PHP to process and display data stored in a database. +description: Extremely powerful, scalable software and a feature-rich wiki implementation + that uses PHP to process and display data stored in a database. keywords: - mediawiki - wiki diff --git a/stable/mediawiki/templates/NOTES.txt b/stable/mediawiki/templates/NOTES.txt index 879ae2230963..241c272a7634 100644 --- a/stable/mediawiki/templates/NOTES.txt +++ b/stable/mediawiki/templates/NOTES.txt @@ -3,20 +3,20 @@ {{- if contains "NodePort" .Values.serviceType }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "fullname" . }}) + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "mediawiki.fullname" . }}) export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") echo http://$NODE_IP:$NODE_PORT/ {{- else if contains "LoadBalancer" .Values.serviceType }} NOTE: It may take a few minutes for the LoadBalancer IP to be available. - Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}' + Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "mediawiki.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "mediawiki.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') echo http://$SERVICE_IP/ {{- else if contains "ClusterIP" .Values.serviceType }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "fullname" . }}" -o jsonpath="{.items[0].metadata.name}") + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "mediawiki.fullname" . }}" -o jsonpath="{.items[0].metadata.name}") echo http://127.0.0.1:8080/ kubectl port-forward $POD_NAME 8080:80 {{- end }} @@ -24,4 +24,4 @@ 2. Get your MediaWiki login credentials by running: echo Username: {{ .Values.mediawikiUser }} - echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.mediawiki-password}" | base64 --decode) + echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mediawiki.fullname" . }} -o jsonpath="{.data.mediawiki-password}" | base64 --decode) diff --git a/stable/mediawiki/templates/_helpers.tpl b/stable/mediawiki/templates/_helpers.tpl index 1e52d321ca4a..74e25d3f8bfa 100644 --- a/stable/mediawiki/templates/_helpers.tpl +++ b/stable/mediawiki/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} +{{- define "mediawiki.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 "mediawiki.fullname" -}} {{- $name := default .Chart.Name .Values.nameOverride -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -19,6 +19,6 @@ 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 "mariadb.fullname" -}} +{{- define "mediawiki.mariadb.fullname" -}} {{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}} {{- end -}} diff --git a/stable/mediawiki/templates/apache-pvc.yaml b/stable/mediawiki/templates/apache-pvc.yaml index 166feb8b9f47..6f00da98a251 100644 --- a/stable/mediawiki/templates/apache-pvc.yaml +++ b/stable/mediawiki/templates/apache-pvc.yaml @@ -2,9 +2,9 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: {{ template "fullname" . }}-apache + name: {{ template "mediawiki.fullname" . }}-apache labels: - app: {{ template "fullname" . }} + app: {{ template "mediawiki.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/stable/mediawiki/templates/deployment.yaml b/stable/mediawiki/templates/deployment.yaml index 6ce6a5a13066..d6d20dd39328 100644 --- a/stable/mediawiki/templates/deployment.yaml +++ b/stable/mediawiki/templates/deployment.yaml @@ -1,9 +1,9 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "fullname" . }} + name: {{ template "mediawiki.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "mediawiki.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -12,28 +12,28 @@ spec: template: metadata: labels: - app: {{ template "fullname" . }} + app: {{ template "mediawiki.fullname" . }} spec: containers: - - name: {{ template "fullname" . }} + - name: {{ template "mediawiki.fullname" . }} image: "{{ .Values.image }}" imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }} env: - name: MARIADB_HOST - value: {{ template "mariadb.fullname" . }} + value: {{ template "mediawiki.mariadb.fullname" . }} - name: MARIADB_PORT_NUMBER value: "3306" - name: MARIADB_PASSWORD valueFrom: secretKeyRef: - name: {{ template "mariadb.fullname" . }} + name: {{ template "mediawiki.mariadb.fullname" . }} key: mariadb-root-password - name: MEDIAWIKI_USERNAME value: {{ default "" .Values.mediawikiUser | quote }} - name: MEDIAWIKI_PASSWORD valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "mediawiki.fullname" . }} key: mediawiki-password - name: MEDIAWIKI_EMAIL value: {{ default "" .Values.mediawikiEmail | quote }} @@ -50,7 +50,7 @@ spec: - name: SMTP_PASSWORD valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "mediawiki.fullname" . }} key: smtp-password ports: - name: http @@ -78,14 +78,14 @@ spec: - name: mediawiki-data {{- if .Values.persistence.enabled }} persistentVolumeClaim: - claimName: {{ template "fullname" . }}-mediawiki + claimName: {{ template "mediawiki.fullname" . }}-mediawiki {{- else }} emptyDir: {} {{- end }} - name: apache-data {{- if .Values.persistence.enabled }} persistentVolumeClaim: - claimName: {{ template "fullname" . }}-apache + claimName: {{ template "mediawiki.fullname" . }}-apache {{- else }} emptyDir: {} {{- end }} diff --git a/stable/mediawiki/templates/mediawiki-pvc.yaml b/stable/mediawiki/templates/mediawiki-pvc.yaml index 5c260594d0e6..7bcac832ce8b 100644 --- a/stable/mediawiki/templates/mediawiki-pvc.yaml +++ b/stable/mediawiki/templates/mediawiki-pvc.yaml @@ -2,9 +2,9 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: {{ template "fullname" . }}-mediawiki + name: {{ template "mediawiki.fullname" . }}-mediawiki labels: - app: {{ template "fullname" . }} + app: {{ template "mediawiki.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/stable/mediawiki/templates/secrets.yaml b/stable/mediawiki/templates/secrets.yaml index b061a9e831ad..fa6746205692 100644 --- a/stable/mediawiki/templates/secrets.yaml +++ b/stable/mediawiki/templates/secrets.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "fullname" . }} + name: {{ template "mediawiki.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "mediawiki.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/stable/mediawiki/templates/svc.yaml b/stable/mediawiki/templates/svc.yaml index 6736e047692a..b34dca16020d 100644 --- a/stable/mediawiki/templates/svc.yaml +++ b/stable/mediawiki/templates/svc.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "fullname" . }} + name: {{ template "mediawiki.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "mediawiki.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -17,4 +17,4 @@ spec: port: 443 targetPort: https selector: - app: {{ template "fullname" . }} + app: {{ template "mediawiki.fullname" . }}