github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/dokuwiki] #1785 namespace defined templates with chart name (#2128)

Browse Source
This commit is contained in:
Kevin Schumacher
2017-09-19 15:28:18 +05:30
committed by Dhilip
parent fd0db6adee
commit 2fe07a10fc
8 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/dokuwiki/Chart.yaml
+4 -2
View File
@@ -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
stable/dokuwiki/templates/NOTES.txt
+6 -6
View File
@@ -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)
stable/dokuwiki/templates/_helpers.tpl
+2 -2
View File
@@ -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 -}}
stable/dokuwiki/templates/apache-pvc.yaml
+2 -2
View File
@@ -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 }}"
stable/dokuwiki/templates/deployment.yaml
+7 -7
View File
@@ -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 }}
stable/dokuwiki/templates/dokuwiki-pvc.yaml
+2 -2
View File
@@ -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 }}"
stable/dokuwiki/templates/secrets.yaml
+2 -2
View File
@@ -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 }}"
stable/dokuwiki/templates/svc.yaml
+3 -3
View File
@@ -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" . }}