From 99f4b8a5826cf1e7e37ae4b6e86d75322ae6f954 Mon Sep 17 00:00:00 2001 From: Kevin Schumacher Date: Tue, 28 Nov 2017 11:35:20 -0500 Subject: [PATCH] [stable/moodle] #1785 namespace defined templates with chart name (#2175) --- stable/moodle/Chart.yaml | 8 +++++--- stable/moodle/templates/NOTES.txt | 12 ++++++------ stable/moodle/templates/_helpers.tpl | 8 ++++---- stable/moodle/templates/deployment.yaml | 18 +++++++++--------- stable/moodle/templates/ingress.yaml | 6 +++--- stable/moodle/templates/pvc.yaml | 4 ++-- stable/moodle/templates/secrets.yaml | 4 ++-- stable/moodle/templates/svc.yaml | 6 +++--- 8 files changed, 34 insertions(+), 32 deletions(-) diff --git a/stable/moodle/Chart.yaml b/stable/moodle/Chart.yaml index 3ae04c4c29..0ae7995d9a 100644 --- a/stable/moodle/Chart.yaml +++ b/stable/moodle/Chart.yaml @@ -1,7 +1,9 @@ name: moodle -version: 0.3.2 -appVersion: 3.4.0 -description: Moodle is a learning platform designed to provide educators, administrators and learners with a single robust, secure and integrated system to create personalised learning environments +version: 0.4.0 +appVersion: 3.4.2 +description: Moodle is a learning platform designed to provide educators, administrators + and learners with a single robust, secure and integrated system to create personalised + learning environments keywords: - moodle - learning diff --git a/stable/moodle/templates/NOTES.txt b/stable/moodle/templates/NOTES.txt index 4592225d25..f6b7160c86 100644 --- a/stable/moodle/templates/NOTES.txt +++ b/stable/moodle/templates/NOTES.txt @@ -17,20 +17,20 @@ {{- end }} {{- end }} {{- else 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 "moodle.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 "moodle.fullname" . }} service before proceeding ** +** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "moodle.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 "moodle.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 "moodle.fullname" . }}" -o jsonpath="{.items[0].metadata.name}") echo http://127.0.0.1:8080/ kubectl port-forward $POD_NAME 8080:80 {{- end }} @@ -38,4 +38,4 @@ 2. Login with the following credentials echo Username: {{ .Values.moodleUsername }} - echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.moodle-password}" | base64 --decode) + echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "moodle.fullname" . }} -o jsonpath="{.data.moodle-password}" | base64 --decode) diff --git a/stable/moodle/templates/_helpers.tpl b/stable/moodle/templates/_helpers.tpl index 8d9dcbe3f4..f21bc9cc9f 100644 --- a/stable/moodle/templates/_helpers.tpl +++ b/stable/moodle/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} +{{- define "moodle.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 "moodle.fullname" -}} {{- $name := default .Chart.Name .Values.nameOverride -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -19,7 +19,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 "mariadb.fullname" -}} +{{- define "moodle.mariadb.fullname" -}} {{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -27,7 +27,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 "moodle.fullname" -}} +{{- define "moodle.moodle.fullname" -}} {{- printf "%s-%s" .Release.Name "moodle" | trunc 63 | trimSuffix "-" -}} {{- end -}} diff --git a/stable/moodle/templates/deployment.yaml b/stable/moodle/templates/deployment.yaml index 12a13a784e..cbdb198181 100644 --- a/stable/moodle/templates/deployment.yaml +++ b/stable/moodle/templates/deployment.yaml @@ -1,9 +1,9 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "fullname" . }} + name: {{ template "moodle.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "moodle.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -11,32 +11,32 @@ spec: template: metadata: labels: - app: {{ template "fullname" . }} + app: {{ template "moodle.fullname" . }} spec: {{- if .Values.affinity }} affinity: {{ toYaml .Values.affinity | indent 8 }} {{- end }} containers: - - name: {{ template "fullname" . }} + - name: {{ template "moodle.fullname" . }} image: "{{ .Values.image }}" imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }} env: - name: MARIADB_HOST - value: {{ template "mariadb.fullname" . }} + value: {{ template "moodle.mariadb.fullname" . }} - name: MARIADB_PORT_NUMBER value: "3306" - name: MARIADB_PASSWORD valueFrom: secretKeyRef: - name: {{ template "mariadb.fullname" . }} + name: {{ template "moodle.mariadb.fullname" . }} key: mariadb-root-password - name: MOODLE_USERNAME value: {{ default "" .Values.moodleUsername | quote }} - name: MOODLE_PASSWORD valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "moodle.fullname" . }} key: moodle-password - name: MOODLE_EMAIL value: {{ default "" .Values.moodleEmail | quote }} @@ -49,7 +49,7 @@ spec: - name: SMTP_PASSWORD valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "moodle.fullname" . }} key: smtp-password - name: SMTP_PROTOCOL value: {{ default "" .Values.smtpProtocol | quote }} @@ -81,7 +81,7 @@ spec: - name: moodle-data {{- if .Values.persistence.enabled }} persistentVolumeClaim: - claimName: {{ .Values.persistence.existingClaim | default (include "moodle.fullname" . ) }} + claimName: {{ .Values.persistence.existingClaim | default (include "moodle.moodle.fullname" . ) }} {{- else }} emptyDir: {} {{- end }} diff --git a/stable/moodle/templates/ingress.yaml b/stable/moodle/templates/ingress.yaml index 633a383e8f..a2a7e08c0d 100644 --- a/stable/moodle/templates/ingress.yaml +++ b/stable/moodle/templates/ingress.yaml @@ -1,6 +1,6 @@ {{- if .Values.ingress.enabled -}} {{- $releaseName := .Release.Name -}} -{{- $serviceName := include "fullname" . }} +{{- $serviceName := include "moodle.fullname" . }} apiVersion: extensions/v1beta1 kind: Ingress metadata: @@ -9,12 +9,12 @@ metadata: {{ toYaml .Values.ingress.annotations | indent 4}} {{- end }} labels: - app: {{ template "fullname" . }} + app: {{ template "moodle.fullname" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version }} component: "{{ .Values.name }}" heritage: {{ .Release.Service }} release: {{ .Release.Name }} - name: {{ template "fullname" . }} + name: {{ template "moodle.fullname" . }} spec: rules: {{- range .Values.ingress.hosts }} diff --git a/stable/moodle/templates/pvc.yaml b/stable/moodle/templates/pvc.yaml index 980d494c54..c05976a75d 100644 --- a/stable/moodle/templates/pvc.yaml +++ b/stable/moodle/templates/pvc.yaml @@ -2,9 +2,9 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: {{ template "fullname" . }} + name: {{ template "moodle.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "moodle.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/stable/moodle/templates/secrets.yaml b/stable/moodle/templates/secrets.yaml index 2f56022708..fa37912229 100644 --- a/stable/moodle/templates/secrets.yaml +++ b/stable/moodle/templates/secrets.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "fullname" . }} + name: {{ template "moodle.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "moodle.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/stable/moodle/templates/svc.yaml b/stable/moodle/templates/svc.yaml index 6736e04769..67522ddc22 100644 --- a/stable/moodle/templates/svc.yaml +++ b/stable/moodle/templates/svc.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "fullname" . }} + name: {{ template "moodle.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "moodle.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 "moodle.fullname" . }}