From 2fe07a10fc7594650a41956ed742fafede6fe895 Mon Sep 17 00:00:00 2001 From: Kevin Schumacher Date: Tue, 19 Sep 2017 05:58:18 -0400 Subject: [PATCH] [stable/dokuwiki] #1785 namespace defined templates with chart name (#2128) --- stable/dokuwiki/Chart.yaml | 6 ++++-- stable/dokuwiki/templates/NOTES.txt | 12 ++++++------ stable/dokuwiki/templates/_helpers.tpl | 4 ++-- stable/dokuwiki/templates/apache-pvc.yaml | 4 ++-- stable/dokuwiki/templates/deployment.yaml | 14 +++++++------- stable/dokuwiki/templates/dokuwiki-pvc.yaml | 4 ++-- stable/dokuwiki/templates/secrets.yaml | 4 ++-- stable/dokuwiki/templates/svc.yaml | 6 +++--- 8 files changed, 28 insertions(+), 26 deletions(-) diff --git a/stable/dokuwiki/Chart.yaml b/stable/dokuwiki/Chart.yaml index 77e431bddc..28f47b7243 100644 --- a/stable/dokuwiki/Chart.yaml +++ b/stable/dokuwiki/Chart.yaml @@ -1,6 +1,8 @@ name: dokuwiki -version: 0.1.5 -description: DokuWiki is a standards-compliant, simple to use wiki optimized for creating documentation. It is targeted at developer teams, workgroups, and small companies. All data is stored in plain text files, so no database is required. +version: 0.2.0 +description: DokuWiki is a standards-compliant, simple to use wiki optimized for creating + documentation. It is targeted at developer teams, workgroups, and small companies. + All data is stored in plain text files, so no database is required. keywords: - dokuwiki - wiki diff --git a/stable/dokuwiki/templates/NOTES.txt b/stable/dokuwiki/templates/NOTES.txt index 3f87941af2..33d5704b9b 100644 --- a/stable/dokuwiki/templates/NOTES.txt +++ b/stable/dokuwiki/templates/NOTES.txt @@ -5,20 +5,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 "dokuwiki.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 }} -** Please ensure an external IP is associated to the {{ template "fullname" . }} service before proceeding ** -** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }} ** +** Please ensure an external IP is associated to the {{ template "dokuwiki.fullname" . }} service before proceeding ** +** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "dokuwiki.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 "dokuwiki.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 "dokuwiki.fullname" . }}" -o jsonpath="{.items[0].metadata.name}") echo http://127.0.0.1:8080/ kubectl port-forward $POD_NAME 8080:80 {{- end }} @@ -26,4 +26,4 @@ 2. Login with the following credentials echo Username: {{ .Values.dokuwikiUsername }} - echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.dokuwiki-password}" | base64 --decode) + echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "dokuwiki.fullname" . }} -o jsonpath="{.data.dokuwiki-password}" | base64 --decode) diff --git a/stable/dokuwiki/templates/_helpers.tpl b/stable/dokuwiki/templates/_helpers.tpl index f0d83d2edb..7d03216e94 100644 --- a/stable/dokuwiki/templates/_helpers.tpl +++ b/stable/dokuwiki/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} +{{- define "dokuwiki.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 "dokuwiki.fullname" -}} {{- $name := default .Chart.Name .Values.nameOverride -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} diff --git a/stable/dokuwiki/templates/apache-pvc.yaml b/stable/dokuwiki/templates/apache-pvc.yaml index 166feb8b9f..e478e72691 100644 --- a/stable/dokuwiki/templates/apache-pvc.yaml +++ b/stable/dokuwiki/templates/apache-pvc.yaml @@ -2,9 +2,9 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: {{ template "fullname" . }}-apache + name: {{ template "dokuwiki.fullname" . }}-apache labels: - app: {{ template "fullname" . }} + app: {{ template "dokuwiki.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/stable/dokuwiki/templates/deployment.yaml b/stable/dokuwiki/templates/deployment.yaml index 5576760758..6ad3329302 100644 --- a/stable/dokuwiki/templates/deployment.yaml +++ b/stable/dokuwiki/templates/deployment.yaml @@ -1,9 +1,9 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "fullname" . }} + name: {{ template "dokuwiki.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "dokuwiki.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -11,10 +11,10 @@ spec: template: metadata: labels: - app: {{ template "fullname" . }} + app: {{ template "dokuwiki.fullname" . }} spec: containers: - - name: {{ template "fullname" . }} + - name: {{ template "dokuwiki.fullname" . }} image: "{{ .Values.image }}" imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }} env: @@ -25,7 +25,7 @@ spec: - name: DOKUWIKI_PASSWORD valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "dokuwiki.fullname" . }} key: dokuwiki-password - name: DOKUWIKI_EMAIL value: {{ default "" .Values.dokuwikiEmail | quote }} @@ -61,14 +61,14 @@ spec: - name: dokuwiki-data {{- if .Values.persistence.enabled }} persistentVolumeClaim: - claimName: {{ template "fullname" . }}-dokuwiki + claimName: {{ template "dokuwiki.fullname" . }}-dokuwiki {{- else }} emptyDir: {} {{- end }} - name: apache-data {{- if .Values.persistence.enabled }} persistentVolumeClaim: - claimName: {{ template "fullname" . }}-apache + claimName: {{ template "dokuwiki.fullname" . }}-apache {{- else }} emptyDir: {} {{- end }} diff --git a/stable/dokuwiki/templates/dokuwiki-pvc.yaml b/stable/dokuwiki/templates/dokuwiki-pvc.yaml index 56582718ec..9cdef4fbe3 100644 --- a/stable/dokuwiki/templates/dokuwiki-pvc.yaml +++ b/stable/dokuwiki/templates/dokuwiki-pvc.yaml @@ -2,9 +2,9 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: {{ template "fullname" . }}-dokuwiki + name: {{ template "dokuwiki.fullname" . }}-dokuwiki labels: - app: {{ template "fullname" . }} + app: {{ template "dokuwiki.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/stable/dokuwiki/templates/secrets.yaml b/stable/dokuwiki/templates/secrets.yaml index 441f746bb9..c26feeec1e 100644 --- a/stable/dokuwiki/templates/secrets.yaml +++ b/stable/dokuwiki/templates/secrets.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "fullname" . }} + name: {{ template "dokuwiki.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "dokuwiki.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/stable/dokuwiki/templates/svc.yaml b/stable/dokuwiki/templates/svc.yaml index 6736e04769..b4b299101e 100644 --- a/stable/dokuwiki/templates/svc.yaml +++ b/stable/dokuwiki/templates/svc.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "fullname" . }} + name: {{ template "dokuwiki.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "dokuwiki.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 "dokuwiki.fullname" . }}