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

Revert "[stable/moodle] Standardize 'fullname' and 'name' macros (#15440)" (#15593)

Browse Source 
This reverts commit 4d1ca2afa6.

Signed-off-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>
This commit is contained in:
Carlos Rodríguez Hernández
2019-07-17 06:59:00 -07:00
committed by Kubernetes Prow Robot
parent 8ac9e8bffe
commit 41379e90ba
5 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/moodle/Chart.yaml
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: moodle
version: 4.2.9
version: 4.2.10
appVersion: 3.7.1
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:
stable/moodle/README.md
-2
View File
@@ -56,8 +56,6 @@ The following table lists the configurable parameters of the Moodle chart and th
| `image.tag` | Moodle Image tag | `{TAG_NAME}` |
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
| `nameOverride` | String to partially override moodle.fullname template with a string (will prepend the release name) | `nil` |
| `fullnameOverride` | String to fully override moodle.fullname template with a string | `nil` |
| `moodleUsername` | User of the application | `user` |
| `moodlePassword` | Application password | _random 10 character alphanumeric string_ |
| `moodleEmail` | Admin email | `user@example.com` |
stable/moodle/templates/_helpers.tpl
+7 -16
View File
@@ -11,33 +11,24 @@ 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" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
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.mariadb.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- printf "%s-%s" .Values.fullnameOverride "mariadb" | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s-%s" .Release.Name $name "mariadb" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{/*
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.moodle.fullname" -}}
{{- printf "%s-%s" .Release.Name "moodle" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
stable/moodle/templates/deployment.yaml
+1 -1
View File
@@ -154,7 +154,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 }}
stable/moodle/values.yaml
-8
View File
@@ -26,14 +26,6 @@ image:
# pullSecrets:
# - myRegistryKeySecretName
## String to partially override moodle.fullname template (will maintain the release name)
##
# nameOverride:
## String to fully override moodle.fullname template
##
# fullnameOverride:
## User of the application
## ref: https://github.com/bitnami/bitnami-docker-moodle#configuration
##