From 8823f6eff6fd0a02f004f10eec43b5d7ee4653db Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Thu, 24 Nov 2016 18:02:30 +0100 Subject: [PATCH 01/36] Initial Moodle version --- incubator/moodle/.helmignore | 1 + incubator/moodle/Chart.yaml | 16 ++++ incubator/moodle/README.md | 96 ++++++++++++++++++++++ incubator/moodle/requirements.lock | 6 ++ incubator/moodle/requirements.yaml | 4 + incubator/moodle/templates/NOTES.txt | 27 ++++++ incubator/moodle/templates/_helpers.tpl | 24 ++++++ incubator/moodle/templates/apache-pvc.yaml | 14 ++++ incubator/moodle/templates/deployment.yaml | 91 ++++++++++++++++++++ incubator/moodle/templates/moodle-pvc.yaml | 14 ++++ incubator/moodle/templates/secrets.yaml | 17 ++++ incubator/moodle/templates/svc.yaml | 20 +++++ incubator/moodle/values.yaml | 82 ++++++++++++++++++ 13 files changed, 412 insertions(+) create mode 100644 incubator/moodle/.helmignore create mode 100644 incubator/moodle/Chart.yaml create mode 100644 incubator/moodle/README.md create mode 100644 incubator/moodle/requirements.lock create mode 100644 incubator/moodle/requirements.yaml create mode 100644 incubator/moodle/templates/NOTES.txt create mode 100644 incubator/moodle/templates/_helpers.tpl create mode 100644 incubator/moodle/templates/apache-pvc.yaml create mode 100644 incubator/moodle/templates/deployment.yaml create mode 100644 incubator/moodle/templates/moodle-pvc.yaml create mode 100644 incubator/moodle/templates/secrets.yaml create mode 100644 incubator/moodle/templates/svc.yaml create mode 100644 incubator/moodle/values.yaml diff --git a/incubator/moodle/.helmignore b/incubator/moodle/.helmignore new file mode 100644 index 000000000..6b8710a71 --- /dev/null +++ b/incubator/moodle/.helmignore @@ -0,0 +1 @@ +.git diff --git a/incubator/moodle/Chart.yaml b/incubator/moodle/Chart.yaml new file mode 100644 index 000000000..7f60b8388 --- /dev/null +++ b/incubator/moodle/Chart.yaml @@ -0,0 +1,16 @@ +name: moodle +version: 0.0.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: +- moodle +- lms +- http +- php +home: http://www.moodle.org/ +sources: +- https://github.com/bitnami/bitnami-docker-moodle +maintainers: +- name: Bitnami + email: containers@bitnami.com +engine: gotpl +icon: https://moodle.org/theme/image.php/moodleorgcleaned_moodleorg/theme_moodleorgcleaned/1479806622/moodle-logo diff --git a/incubator/moodle/README.md b/incubator/moodle/README.md new file mode 100644 index 000000000..865e9189c --- /dev/null +++ b/incubator/moodle/README.md @@ -0,0 +1,96 @@ +# moodle + +[moodle](https://www.moodle.org) 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 + +## TL;DR; + +```console +$ helm install . +``` + +## Introduction + +This chart bootstraps a [moodle](https://github.com/bitnami/bitnami-docker-moodle) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. + +It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment for the database requirements of the moodle application. + +## Prerequisites + +- Kubernetes 1.4+ with Beta APIs enabled +- PV provisioner support in the underlying infrastructure + +## Installing the Chart + +To install the chart with the release name `my-release`: + +```console +$ helm install --name my-release stable/moodle +``` + +The command deploys moodle on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. + +> **Tip**: List all releases using `helm list` + +## Uninstalling the Chart + +To uninstall/delete the `my-release` deployment: + +```console +$ helm delete my-release +``` + +The command removes all the Kubernetes components associated with the chart and deletes the release. + +## Configuration + +The following tables lists the configurable parameters of the moodle chart and their default values. + +| Parameter | Description | Default | +|--------------------------------------|------------------------------------------|---------------------------------------------------------| +| `image` | moodle image | `bitnami/moodle:{VERSION}` | +| `imagePullPolicy` | Image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | +| `moodleUser` | User of the application | `user` | +| `moodlePassword` | Application password | _random 10 character long alphanumeric string_ | +| `moodleEmail` | Admin email | `user@example.com` | +| `smtpHost` | SMTP host | `nil` | +| `smtpPort` | SMTP port | `nil` | +| `smtpHostID` | SMTP host ID | `nil` | +| `smtpUser` | SMTP user | `nil` | +| `smtpPassword` | SMTP password | `nil` | +| `mariadb.mariadbRootPassword` | MariaDB admin password | `nil` | +| `serviceType` | Kubernetes Service type | `LoadBalancer` | +| `persistence.enabled` | Enable persistence using PVC | `true` | +| `persistence.apache.storageClass` | PVC Storage Class for Apache volume | `generic` | +| `persistence.apache.accessMode` | PVC Access Mode for Apache volume | `ReadWriteOnce` | +| `persistence.apache.size` | PVC Storage Request for Apache volume | `1Gi` | +| `persistence.moodle.storageClass` | PVC Storage Class for moodle volume | `generic` | +| `persistence.moodle.accessMode` | PVC Access Mode for moodle volume | `ReadWriteOnce` | +| `persistence.moodle.size` | PVC Storage Request for moodle volume | `8Gi` | +| `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | + +The above parameters map to the env variables defined in [bitnami/moodle](http://github.com/bitnami/bitnami-docker-moodle). For more information please refer to the [bitnami/moodle](http://github.com/bitnami/bitnami-docker-moodle) image documentation. + +Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, + +```console +$ helm install --name my-release \ + --set moodleUser=admin,moodlePassword=password,mariadb.mariadbRootPassword=secretpassword \ + stable/moodle +``` + +The above command sets the moodle administrator account username and password to `admin` and `password` respectively. Additionally it sets the MariaDB `root` user password to `secretpassword`. + +Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, + +```console +$ helm install --name my-release -f values.yaml stable/moodle +``` + +> **Tip**: You can use the default [values.yaml](values.yaml) + +## Persistence + +The [Bitnami moodle](https://github.com/bitnami/bitnami-docker-moodle) image stores the moodle data and configurations at the `/bitnami/moodle` and `/bitnami/apache` paths of the container. + +Persistent Volume Claims are used to keep the data across deployments. This is known to work in GCE, AWS, and minikube. +See the [Configuration](#configuration) section to configure the PVC or to disable persistence. diff --git a/incubator/moodle/requirements.lock b/incubator/moodle/requirements.lock new file mode 100644 index 000000000..d486f0e9d --- /dev/null +++ b/incubator/moodle/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: mariadb + repository: https://kubernetes-charts.storage.googleapis.com/ + version: 0.5.2 +digest: sha256:ae046856c4ffb4d8eafbf3c0f7281dd28b28f32323115e045336674cfe1ccc56 +generated: 2016-11-18T16:08:14.967212355-08:00 diff --git a/incubator/moodle/requirements.yaml b/incubator/moodle/requirements.yaml new file mode 100644 index 000000000..9590b3779 --- /dev/null +++ b/incubator/moodle/requirements.yaml @@ -0,0 +1,4 @@ +dependencies: +- name: mariadb + version: 0.5.2 + repository: https://kubernetes-charts.storage.googleapis.com/ diff --git a/incubator/moodle/templates/NOTES.txt b/incubator/moodle/templates/NOTES.txt new file mode 100644 index 000000000..1405a8b28 --- /dev/null +++ b/incubator/moodle/templates/NOTES.txt @@ -0,0 +1,27 @@ + +1. Get the moodle URL by running: + +{{- if contains "NodePort" .Values.serviceType }} + + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "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 -w {{ template "fullname" . }}' + + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "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}") + echo http://127.0.0.1:8080/ + kubectl port-forward $POD_NAME 8080:80 +{{- end }} + +2. Get your moodle login credentials by running: + + echo Username: {{ .Values.moodleUser }} + echo Password: $(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.moodle-password[*]}"`)) diff --git a/incubator/moodle/templates/_helpers.tpl b/incubator/moodle/templates/_helpers.tpl new file mode 100644 index 000000000..4355810df --- /dev/null +++ b/incubator/moodle/templates/_helpers.tpl @@ -0,0 +1,24 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 24 -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +*/}} +{{- define "fullname" -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- printf "%s-%s" .Release.Name $name | trunc 24 -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +*/}} +{{- define "mariadb.fullname" -}} +{{- printf "%s-%s" .Release.Name "mariadb" | trunc 24 -}} +{{- end -}} diff --git a/incubator/moodle/templates/apache-pvc.yaml b/incubator/moodle/templates/apache-pvc.yaml new file mode 100644 index 000000000..c4cbd9e11 --- /dev/null +++ b/incubator/moodle/templates/apache-pvc.yaml @@ -0,0 +1,14 @@ +{{- if .Values.persistence.enabled -}} +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: {{ template "fullname" . }}-apache + annotations: + volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }} +spec: + accessModes: + - {{ .Values.persistence.apache.accessMode | quote }} + resources: + requests: + storage: {{ .Values.persistence.apache.size | quote }} +{{- end -}} diff --git a/incubator/moodle/templates/deployment.yaml b/incubator/moodle/templates/deployment.yaml new file mode 100644 index 000000000..19c9f55f9 --- /dev/null +++ b/incubator/moodle/templates/deployment.yaml @@ -0,0 +1,91 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: {{ template "fullname" . }} + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +spec: + replicas: 1 + template: + metadata: + labels: + app: {{ template "fullname" . }} + spec: + containers: + - name: {{ template "fullname" . }} + image: "{{ .Values.image }}" + imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }} + env: + - name: MARIADB_HOST + value: {{ template "mariadb.fullname" . }} + - name: MARIADB_PORT + value: "3306" + - name: MARIADB_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "mariadb.fullname" . }} + key: mariadb-root-password + - name: MOODLE_USERNAME + value: {{ default "" .Values.moodleUser | quote }} + - name: MOODLE_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "fullname" . }} + key: moodle-password + - name: MOODLE_EMAIL + value: {{ default "" .Values.moodleEmail | quote }} + - name: SMTP_HOST_ID + value: {{ default "" .Values.smtpHostID | quote }} + - name: SMTP_HOST + value: {{ default "" .Values.smtpHost | quote }} + - name: SMTP_PORT + value: {{ default "" .Values.smtpPort | quote }} + - name: SMTP_USER + value: {{ default "" .Values.smtpUser | quote }} + - name: SMTP_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "fullname" . }} + key: smtp-password + ports: + - name: http + containerPort: 80 + - name: https + containerPort: 443 + livenessProbe: + httpGet: + path: / + port: http + initialDelaySeconds: 120 + timeoutSeconds: 5 + readinessProbe: + httpGet: + path: / + port: http + initialDelaySeconds: 5 + timeoutSeconds: 1 + resources: +{{ toYaml .Values.resources | indent 10 }} + volumeMounts: + - name: moodle-data + mountPath: /bitnami/moodle + - name: apache-data + mountPath: /bitnami/apache + volumes: + - name: moodle-data + {{- if .Values.persistence.enabled }} + persistentVolumeClaim: + claimName: {{ template "fullname" . }}-moodle + {{- else }} + emptyDir: {} + {{- end }} + - name: apache-data + {{- if .Values.persistence.enabled }} + persistentVolumeClaim: + claimName: {{ template "fullname" . }}-apache + {{- else }} + emptyDir: {} + {{- end }} diff --git a/incubator/moodle/templates/moodle-pvc.yaml b/incubator/moodle/templates/moodle-pvc.yaml new file mode 100644 index 000000000..a68e65b28 --- /dev/null +++ b/incubator/moodle/templates/moodle-pvc.yaml @@ -0,0 +1,14 @@ +{{- if .Values.persistence.enabled -}} +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: {{ template "fullname" . }}-moodle + annotations: + volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.moodle.storageClass | quote }} +spec: + accessModes: + - {{ .Values.persistence.moodle.accessMode | quote }} + resources: + requests: + storage: {{ .Values.persistence.moodle.size | quote }} +{{- end -}} diff --git a/incubator/moodle/templates/secrets.yaml b/incubator/moodle/templates/secrets.yaml new file mode 100644 index 000000000..9fe37bee9 --- /dev/null +++ b/incubator/moodle/templates/secrets.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Secret +metadata: + name: {{ template "fullname" . }} + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +type: Opaque +data: + {{ if .Values.moodlePassword }} + moodle-password: {{ .Values.moodlePassword | b64enc | quote }} + {{ else }} + moodle-password: {{ randAlphaNum 10 | b64enc | quote }} + {{ end }} + smtp-password: {{ default "" .Values.smtpPassword | b64enc | quote }} diff --git a/incubator/moodle/templates/svc.yaml b/incubator/moodle/templates/svc.yaml new file mode 100644 index 000000000..6736e0476 --- /dev/null +++ b/incubator/moodle/templates/svc.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ template "fullname" . }} + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +spec: + type: {{ .Values.serviceType }} + ports: + - name: http + port: 80 + targetPort: http + - name: https + port: 443 + targetPort: https + selector: + app: {{ template "fullname" . }} diff --git a/incubator/moodle/values.yaml b/incubator/moodle/values.yaml new file mode 100644 index 000000000..3249c3517 --- /dev/null +++ b/incubator/moodle/values.yaml @@ -0,0 +1,82 @@ +## Bitnami moodle image version +## ref: https://hub.docker.com/r/bitnami/moodle/tags/ +## +image: bitnami/moodle + +## Specify a imagePullPolicy +## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' +## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images +## +# imagePullPolicy: + +## User of the application +## ref: https://github.com/bitnami/bitnami-docker-moodle#environment-variables +## +moodleUser: user + +## Application password +## Defaults to a random 10-character alphanumeric string if not set +## ref: https://github.com/bitnami/bitnami-docker-moodle#environment-variables +## +moodlePassword: password + +## Admin email +## ref: https://github.com/bitnami/bitnami-docker-moodle#environment-variables +## +moodleEmail: user@example.com + + +## SMTP mail delivery configuration +## ref: https://github.com/bitnami/bitnami-docker-moodle#smtp-configuration +## +# smtpHost: +# smtpPort: +# smtpHostID: +# smtpUser: +# smtpPassword: +# smtpProtocol: + +## +## MariaDB chart configuration +## +mariadb: + ## MariaDB admin password + ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#setting-the-root-password-on-first-run + ## + mariadbRootPassword: secretpassword + + ## Enable persistence using Persistent Volume Claims + ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ + ## + persistence: + enabled: false + storageClass: generic + accessMode: ReadWriteOnce + size: 8Gi + +## Kubernetes configuration +## For minikube, set this to NodePort, elsewhere use LoadBalancer +## +serviceType: LoadBalancer + +## Enable persistence using Persistent Volume Claims +## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ +## +persistence: + enabled: false + apache: + storageClass: generic + accessMode: ReadWriteOnce + size: 1Gi + moodle: + storageClass: generic + accessMode: ReadWriteOnce + size: 8Gi + +## Configure resource requests and limits +## ref: http://kubernetes.io/docs/user-guide/compute-resources/ +## +resources: + requests: + memory: 512Mi + cpu: 300m From c685517cabac8c3376cb0945cd7588746e1b6d59 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Fri, 25 Nov 2016 10:42:12 +0100 Subject: [PATCH 02/36] simplyfing configuration and README.md --- incubator/moodle/README.md | 11 ++++++----- incubator/moodle/values.yaml | 6 ++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/incubator/moodle/README.md b/incubator/moodle/README.md index 865e9189c..6aa92c9da 100644 --- a/incubator/moodle/README.md +++ b/incubator/moodle/README.md @@ -1,16 +1,16 @@ # moodle -[moodle](https://www.moodle.org) 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 +[Moodle](https://www.moodle.org) 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 ## TL;DR; ```console -$ helm install . +$ helm install ./moodle ``` ## Introduction -This chart bootstraps a [moodle](https://github.com/bitnami/bitnami-docker-moodle) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +This chart bootstraps a [Moodle](https://github.com/bitnami/bitnami-docker-moodle) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment for the database requirements of the moodle application. @@ -24,7 +24,7 @@ It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/chart To install the chart with the release name `my-release`: ```console -$ helm install --name my-release stable/moodle +$ helm install --name my-release ./moodle ``` The command deploys moodle on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. @@ -47,7 +47,8 @@ The following tables lists the configurable parameters of the moodle chart and t | Parameter | Description | Default | |--------------------------------------|------------------------------------------|---------------------------------------------------------| -| `image` | moodle image | `bitnami/moodle:{VERSION}` | +| `image` | moodle image | `bitnami/moodle:{VERSION}` | +| `imageTag` | moodle image Tag | `3.1.3` | | `imagePullPolicy` | Image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | | `moodleUser` | User of the application | `user` | | `moodlePassword` | Application password | _random 10 character long alphanumeric string_ | diff --git a/incubator/moodle/values.yaml b/incubator/moodle/values.yaml index 3249c3517..e8a63eaa1 100644 --- a/incubator/moodle/values.yaml +++ b/incubator/moodle/values.yaml @@ -17,8 +17,7 @@ moodleUser: user ## Application password ## Defaults to a random 10-character alphanumeric string if not set ## ref: https://github.com/bitnami/bitnami-docker-moodle#environment-variables -## -moodlePassword: password +## moodlePassword: password ## Admin email ## ref: https://github.com/bitnami/bitnami-docker-moodle#environment-variables @@ -42,8 +41,7 @@ moodleEmail: user@example.com mariadb: ## MariaDB admin password ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#setting-the-root-password-on-first-run - ## - mariadbRootPassword: secretpassword + ## mariadbRootPassword: secretpassword ## Enable persistence using Persistent Volume Claims ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ From 44907051605ad80f4b22ca740279134ba8138f6a Mon Sep 17 00:00:00 2001 From: dgonzalezruiz Date: Fri, 25 Nov 2016 11:01:03 +0100 Subject: [PATCH 03/36] Bump Jenkins chart version --- incubator/jenkins/Chart.yaml | 2 +- incubator/jenkins/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/incubator/jenkins/Chart.yaml b/incubator/jenkins/Chart.yaml index 458f91879..b368e9e23 100644 --- a/incubator/jenkins/Chart.yaml +++ b/incubator/jenkins/Chart.yaml @@ -1,5 +1,5 @@ name: jenkins -version: 0.3.6 +version: 0.3.7 description: The leading open source automation server keywords: - jenkins diff --git a/incubator/jenkins/values.yaml b/incubator/jenkins/values.yaml index 060c2caa5..15c096f1f 100644 --- a/incubator/jenkins/values.yaml +++ b/incubator/jenkins/values.yaml @@ -1,7 +1,7 @@ ## Bitnami Jenkins image version ## ref: https://hub.docker.com/r/bitnami/jenkins/tags/ ## -imageTag: 2.30-r0 +imageTag: 2.33-r0 ## Specify a imagePullPolicy ## Defaults to 'Always' if imageTag is 'latest', else set to 'IfNotPresent' From 85b594d274278de7a3ee237eab5cacd3a301a243 Mon Sep 17 00:00:00 2001 From: dgonzalezruiz Date: Fri, 25 Nov 2016 15:01:36 +0100 Subject: [PATCH 04/36] Bump apache and opencart versions --- incubator/apache/Chart.yaml | 2 +- incubator/apache/values.yaml | 2 +- incubator/opencart/Chart.yaml | 2 +- incubator/opencart/values.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/incubator/apache/Chart.yaml b/incubator/apache/Chart.yaml index b5453bc7c..77eb0a76e 100644 --- a/incubator/apache/Chart.yaml +++ b/incubator/apache/Chart.yaml @@ -1,5 +1,5 @@ name: apache -version: 0.3.4 +version: 0.3.5 description: Chart for Apache HTTP Server keywords: - apache diff --git a/incubator/apache/values.yaml b/incubator/apache/values.yaml index 3947d9390..f3208f357 100644 --- a/incubator/apache/values.yaml +++ b/incubator/apache/values.yaml @@ -1,7 +1,7 @@ ## Bitnami Apache image version ## ref: https://hub.docker.com/r/bitnami/apache/tags/ ## -imageTag: 2.4.23-r9 +imageTag: 2.4.23-r10 ## Specify a imagePullPolicy ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/opencart/Chart.yaml b/incubator/opencart/Chart.yaml index 2d38af76f..0bb6a7789 100644 --- a/incubator/opencart/Chart.yaml +++ b/incubator/opencart/Chart.yaml @@ -1,5 +1,5 @@ name: opencart -version: 0.3.3 +version: 0.3.4 description: A free and open source e-commerce platform for online merchants. It provides a professional and reliable foundation for a successful online store. keywords: - opencart diff --git a/incubator/opencart/values.yaml b/incubator/opencart/values.yaml index 83b8b496e..ff41a7659 100644 --- a/incubator/opencart/values.yaml +++ b/incubator/opencart/values.yaml @@ -1,7 +1,7 @@ ## Bitnami OpenCart image version ## ref: https://hub.docker.com/r/bitnami/opencart/tags/ ## -imageTag: 2.3.0.2-r5 +imageTag: 2.3.0.2-r6 ## Specify a imagePullPolicy ## Defaults to 'Always' if imageTag is 'latest', else set to 'IfNotPresent' From b91bb4e91340cdca50f58b9797183b51d3da0921 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Mon, 28 Nov 2016 12:27:39 +0100 Subject: [PATCH 05/36] Initial RC --- incubator/moodle/Chart.yaml | 4 ++-- incubator/moodle/README.md | 2 +- incubator/moodle/requirements.lock | 6 ------ incubator/moodle/requirements.yaml | 2 +- incubator/moodle/templates/deployment.yaml | 4 ++-- incubator/moodle/templates/secrets.yaml | 6 +++--- incubator/moodle/values.yaml | 6 +++--- 7 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 incubator/moodle/requirements.lock diff --git a/incubator/moodle/Chart.yaml b/incubator/moodle/Chart.yaml index 7f60b8388..749aa6712 100644 --- a/incubator/moodle/Chart.yaml +++ b/incubator/moodle/Chart.yaml @@ -3,9 +3,9 @@ version: 0.0.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: - moodle -- lms -- http +- learning - php +- mariadb home: http://www.moodle.org/ sources: - https://github.com/bitnami/bitnami-docker-moodle diff --git a/incubator/moodle/README.md b/incubator/moodle/README.md index 6aa92c9da..a43975251 100644 --- a/incubator/moodle/README.md +++ b/incubator/moodle/README.md @@ -5,7 +5,7 @@ ## TL;DR; ```console -$ helm install ./moodle +$ helm install . ``` ## Introduction diff --git a/incubator/moodle/requirements.lock b/incubator/moodle/requirements.lock deleted file mode 100644 index d486f0e9d..000000000 --- a/incubator/moodle/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: mariadb - repository: https://kubernetes-charts.storage.googleapis.com/ - version: 0.5.2 -digest: sha256:ae046856c4ffb4d8eafbf3c0f7281dd28b28f32323115e045336674cfe1ccc56 -generated: 2016-11-18T16:08:14.967212355-08:00 diff --git a/incubator/moodle/requirements.yaml b/incubator/moodle/requirements.yaml index 9590b3779..31911a028 100644 --- a/incubator/moodle/requirements.yaml +++ b/incubator/moodle/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: mariadb - version: 0.5.2 + version: 0.5.4 repository: https://kubernetes-charts.storage.googleapis.com/ diff --git a/incubator/moodle/templates/deployment.yaml b/incubator/moodle/templates/deployment.yaml index 19c9f55f9..c2d9053ad 100644 --- a/incubator/moodle/templates/deployment.yaml +++ b/incubator/moodle/templates/deployment.yaml @@ -65,8 +65,8 @@ spec: httpGet: path: / port: http - initialDelaySeconds: 5 - timeoutSeconds: 1 + initialDelaySeconds: 60 + timeoutSeconds: 5 resources: {{ toYaml .Values.resources | indent 10 }} volumeMounts: diff --git a/incubator/moodle/templates/secrets.yaml b/incubator/moodle/templates/secrets.yaml index 9fe37bee9..a76f0da3b 100644 --- a/incubator/moodle/templates/secrets.yaml +++ b/incubator/moodle/templates/secrets.yaml @@ -9,9 +9,9 @@ metadata: heritage: "{{ .Release.Service }}" type: Opaque data: - {{ if .Values.moodlePassword }} + {{- if .Values.moodlePassword }} moodle-password: {{ .Values.moodlePassword | b64enc | quote }} - {{ else }} + {{- else }} moodle-password: {{ randAlphaNum 10 | b64enc | quote }} - {{ end }} + {{- end }} smtp-password: {{ default "" .Values.smtpPassword | b64enc | quote }} diff --git a/incubator/moodle/values.yaml b/incubator/moodle/values.yaml index e8a63eaa1..bae119fe0 100644 --- a/incubator/moodle/values.yaml +++ b/incubator/moodle/values.yaml @@ -17,7 +17,7 @@ moodleUser: user ## Application password ## Defaults to a random 10-character alphanumeric string if not set ## ref: https://github.com/bitnami/bitnami-docker-moodle#environment-variables -## moodlePassword: password +moodlePassword: password ## Admin email ## ref: https://github.com/bitnami/bitnami-docker-moodle#environment-variables @@ -47,7 +47,7 @@ mariadb: ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ ## persistence: - enabled: false + enabled: true storageClass: generic accessMode: ReadWriteOnce size: 8Gi @@ -61,7 +61,7 @@ serviceType: LoadBalancer ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ ## persistence: - enabled: false + enabled: true apache: storageClass: generic accessMode: ReadWriteOnce From 610fb8aa68ab1fd50edc80f4bd5eab556a87b9d0 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Tue, 29 Nov 2016 18:40:11 +0100 Subject: [PATCH 06/36] Initial commit JasperReports chart --- incubator/jasperserver/.helmignore | 1 + incubator/jasperserver/Chart.yaml | 20 ++++ incubator/jasperserver/README.md | 94 +++++++++++++++++++ incubator/jasperserver/requirements.yaml | 4 + incubator/jasperserver/templates/NOTES.txt | 27 ++++++ incubator/jasperserver/templates/_helpers.tpl | 24 +++++ .../jasperserver/templates/deployment.yaml | 80 ++++++++++++++++ .../templates/jasperserver-pvc.yaml | 14 +++ incubator/jasperserver/templates/secrets.yaml | 17 ++++ incubator/jasperserver/templates/svc.yaml | 20 ++++ incubator/jasperserver/values.yaml | 70 ++++++++++++++ 11 files changed, 371 insertions(+) create mode 100644 incubator/jasperserver/.helmignore create mode 100644 incubator/jasperserver/Chart.yaml create mode 100644 incubator/jasperserver/README.md create mode 100644 incubator/jasperserver/requirements.yaml create mode 100644 incubator/jasperserver/templates/NOTES.txt create mode 100644 incubator/jasperserver/templates/_helpers.tpl create mode 100644 incubator/jasperserver/templates/deployment.yaml create mode 100644 incubator/jasperserver/templates/jasperserver-pvc.yaml create mode 100644 incubator/jasperserver/templates/secrets.yaml create mode 100644 incubator/jasperserver/templates/svc.yaml create mode 100644 incubator/jasperserver/values.yaml diff --git a/incubator/jasperserver/.helmignore b/incubator/jasperserver/.helmignore new file mode 100644 index 000000000..6b8710a71 --- /dev/null +++ b/incubator/jasperserver/.helmignore @@ -0,0 +1 @@ +.git diff --git a/incubator/jasperserver/Chart.yaml b/incubator/jasperserver/Chart.yaml new file mode 100644 index 000000000..9e2927d28 --- /dev/null +++ b/incubator/jasperserver/Chart.yaml @@ -0,0 +1,20 @@ +name: jasperserver +version: 0.0.1 +description: The JasperReports server can be used as a stand-alone or embedded reporting and BI server that offers web-based reporting, analytic tools and visualization, and a dashboard feature for compiling multiple custom views +keywords: +- BI +- java +- jasper +- reporting +- analytic +- visualization +- dashboard +- mariadb +home: http://community.jaspersoft.com/project/jasperreports-server +sources: +- https://github.com/bitnami/bitnami-docker-jasperserver +maintainers: +- name: Bitnami + email: containers@bitnami.com +engine: gotpl +icon: http://community-static.jaspersoft.com/sites/default/files/styles/project_icon/public/projects/icons/js_reports-server_rg2_0.png diff --git a/incubator/jasperserver/README.md b/incubator/jasperserver/README.md new file mode 100644 index 000000000..59556b4fe --- /dev/null +++ b/incubator/jasperserver/README.md @@ -0,0 +1,94 @@ +# jasperserver + +[jasperserver](http://community.jaspersoft.com/project/jasperreports-server) The JasperReports server can be used as a stand-alone or embedded reporting and BI server that offers web-based reporting, analytic tools and visualization, and a dashboard feature for compiling multiple custom views + + +## TL;DR; + +```console +$ helm install . +``` + +## Introduction + +This chart bootstraps a [jasperserver](https://github.com/bitnami/bitnami-docker-jasperserver) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. + +It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment for the database requirements of the jasperserver application. + +## Prerequisites + +- Kubernetes 1.4+ with Beta APIs enabled +- PV provisioner support in the underlying infrastructure + +## Installing the Chart + +To install the chart with the release name `my-release`: + +```console +$ helm install --name my-release ./jasperserver +``` + +The command deploys jasperserver on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. + +> **Tip**: List all releases using `helm list` + +## Uninstalling the Chart + +To uninstall/delete the `my-release` deployment: + +```console +$ helm delete my-release +``` + +The command removes all the Kubernetes components associated with the chart and deletes the release. + +## Configuration + +The following tables lists the configurable parameters of the jasperserver chart and their default values. + +| Parameter Description | Default | +|------------------------------------------|----------------------------------------------|---------------------------------------------------------| +| `image` | jasperserver image | `bitnami/jasperserver:{VERSION}` | +| `imageTag` | jasperserver image Tag | `3.1.3` | +| `imagePullPolicy` | Image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | +| `jasperserverUser` | User of the application | `user` | +| `jasperserverPassword` | Application password | _random 10 character long alphanumeric string_ | +| `smtpHost` | SMTP host | `nil` | +| `smtpPort` | SMTP port | `nil` | +| `smtpHostID` | SMTP host ID | `nil` | +| `smtpUser` | SMTP user | `nil` | +| `smtpPassword` | SMTP password | `nil` | +| `mariadb.mariadbRootPassword` | MariaDB admin password | `nil` | +| `serviceType` | Kubernetes Service type | `LoadBalancer` | +| `persistence.enabled` | Enable persistence using PVC | `true` | +| `persistence.jasperserver.storageClass` | PVC Storage Class for jasperserver volume | `generic` | +| `persistence.jasperserver.accessMode` | PVC Access Mode for jasperserver volume | `ReadWriteOnce` | +| `persistence.jasperserver.size` | PVC Storage Request for jasperserver volume | `8Gi` | +| `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | + +The above parameters map to the env variables defined in [bitnami/jasperserver](http://github.com/bitnami/bitnami-docker-jasperserver). For more information please refer to the [bitnami/jasperserver](http://github.com/bitnami/bitnami-docker-jasperserver) image documentation. + +Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, + +```console +$ helm install --name my-release \ + --set jasperserverUser=admin,jasperserverPassword=password,mariadb.mariadbRootPassword=secretpassword \ + stable/jasperserver +``` + +The above command sets the jasperserver administrator account username and password to `admin` and `password` respectively. Additionally it sets the MariaDB `root` user password to `secretpassword`. + +Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, + +```console +$ helm install --name my-release -f values.yaml stable/jasperserver +``` + +> **Tip**: You can use the default [values.yaml](values.yaml) + +## Persistence + +The [Bitnami jasperserver](https://github.com/bitnami/bitnami-docker-jasperserver) image stores the jasperserver data and configurations at the `/bitnami/jasperserver` path of the container. + +Persistent Volume Claims are used to keep the data across deployments. This is known to work in GCE, AWS, and minikube. +See the [Configuration](#configuration) section to configure the PVC or to disable persistence. diff --git a/incubator/jasperserver/requirements.yaml b/incubator/jasperserver/requirements.yaml new file mode 100644 index 000000000..31911a028 --- /dev/null +++ b/incubator/jasperserver/requirements.yaml @@ -0,0 +1,4 @@ +dependencies: +- name: mariadb + version: 0.5.4 + repository: https://kubernetes-charts.storage.googleapis.com/ diff --git a/incubator/jasperserver/templates/NOTES.txt b/incubator/jasperserver/templates/NOTES.txt new file mode 100644 index 000000000..ead1527aa --- /dev/null +++ b/incubator/jasperserver/templates/NOTES.txt @@ -0,0 +1,27 @@ + +1. Get the jasperserver URL by running: + +{{- if contains "NodePort" .Values.serviceType }} + + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "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 -w {{ template "fullname" . }}' + + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "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}") + echo http://127.0.0.1:8080/ + kubectl port-forward $POD_NAME 8080:8080 +{{- end }} + +2. Get your jasperserver login credentials by running: + + echo Username: {{ .Values.jasperserverUser }} + echo Password: $(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.jasperserver-password[*]}"`)) diff --git a/incubator/jasperserver/templates/_helpers.tpl b/incubator/jasperserver/templates/_helpers.tpl new file mode 100644 index 000000000..4355810df --- /dev/null +++ b/incubator/jasperserver/templates/_helpers.tpl @@ -0,0 +1,24 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 24 -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +*/}} +{{- define "fullname" -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- printf "%s-%s" .Release.Name $name | trunc 24 -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +*/}} +{{- define "mariadb.fullname" -}} +{{- printf "%s-%s" .Release.Name "mariadb" | trunc 24 -}} +{{- end -}} diff --git a/incubator/jasperserver/templates/deployment.yaml b/incubator/jasperserver/templates/deployment.yaml new file mode 100644 index 000000000..59bf357f9 --- /dev/null +++ b/incubator/jasperserver/templates/deployment.yaml @@ -0,0 +1,80 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: {{ template "fullname" . }} + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +spec: + replicas: 1 + template: + metadata: + labels: + app: {{ template "fullname" . }} + spec: + containers: + - name: {{ template "fullname" . }} + image: "{{ .Values.image }}" + imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }} + env: + - name: MARIADB_HOST + value: {{ template "mariadb.fullname" . }} + - name: MARIADB_PORT + value: "3306" + - name: MARIADB_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "mariadb.fullname" . }} + key: mariadb-root-password + - name: JASPERSERVER_USERNAME + value: {{ default "" .Values.jasperserverUser | quote }} + - name: JASPERSERVER_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "fullname" . }} + key: jasperserver-password + - name: SMTP_HOST_ID + value: {{ default "" .Values.smtpHostID | quote }} + - name: SMTP_HOST + value: {{ default "" .Values.smtpHost | quote }} + - name: SMTP_PORT + value: {{ default "" .Values.smtpPort | quote }} + - name: SMTP_USER + value: {{ default "" .Values.smtpUser | quote }} + - name: SMTP_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "fullname" . }} + key: smtp-password + ports: + - name: http + containerPort: 8080 + - name: https + containerPort: 443 + livenessProbe: + httpGet: + path: / + port: http + initialDelaySeconds: 120 + timeoutSeconds: 5 + readinessProbe: + httpGet: + path: / + port: http + initialDelaySeconds: 60 + timeoutSeconds: 5 + resources: +{{ toYaml .Values.resources | indent 10 }} + volumeMounts: + - name: jasperserver-data + mountPath: /bitnami/jasperserver + volumes: + - name: jasperserver-data + {{- if .Values.persistence.enabled }} + persistentVolumeClaim: + claimName: {{ template "fullname" . }}-jasperserver + {{- else }} + emptyDir: {} + {{- end }} diff --git a/incubator/jasperserver/templates/jasperserver-pvc.yaml b/incubator/jasperserver/templates/jasperserver-pvc.yaml new file mode 100644 index 000000000..3fea74e05 --- /dev/null +++ b/incubator/jasperserver/templates/jasperserver-pvc.yaml @@ -0,0 +1,14 @@ +{{- if .Values.persistence.enabled -}} +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: {{ template "fullname" . }}-jasperserver + annotations: + volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.jasperserver.storageClass | quote }} +spec: + accessModes: + - {{ .Values.persistence.jasperserver.accessMode | quote }} + resources: + requests: + storage: {{ .Values.persistence.jasperserver.size | quote }} +{{- end -}} diff --git a/incubator/jasperserver/templates/secrets.yaml b/incubator/jasperserver/templates/secrets.yaml new file mode 100644 index 000000000..0a0a29c8b --- /dev/null +++ b/incubator/jasperserver/templates/secrets.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Secret +metadata: + name: {{ template "fullname" . }} + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +type: Opaque +data: + {{- if .Values.jasperserverPassword }} + jasperserver-password: {{ .Values.jasperserverPassword | b64enc | quote }} + {{- else }} + jasperserver-password: {{ randAlphaNum 10 | b64enc | quote }} + {{- end }} + smtp-password: {{ default "" .Values.smtpPassword | b64enc | quote }} diff --git a/incubator/jasperserver/templates/svc.yaml b/incubator/jasperserver/templates/svc.yaml new file mode 100644 index 000000000..6736e0476 --- /dev/null +++ b/incubator/jasperserver/templates/svc.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ template "fullname" . }} + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +spec: + type: {{ .Values.serviceType }} + ports: + - name: http + port: 80 + targetPort: http + - name: https + port: 443 + targetPort: https + selector: + app: {{ template "fullname" . }} diff --git a/incubator/jasperserver/values.yaml b/incubator/jasperserver/values.yaml new file mode 100644 index 000000000..425a20aae --- /dev/null +++ b/incubator/jasperserver/values.yaml @@ -0,0 +1,70 @@ +## Bitnami jasperserver image version +## ref: https://hub.docker.com/r/bitnami/jasperserver/tags/ +## +image: bitnami/jasperserver + +## Specify a imagePullPolicy +## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' +## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images +## +# imagePullPolicy: + +## User of the application +## ref: https://github.com/bitnami/bitnami-docker-jasperserver#environment-variables +## +jasperserverUser: user + +## Application password +## Defaults to a random 10-character alphanumeric string if not set +## ref: https://github.com/bitnami/bitnami-docker-jasperserver#environment-variables +jasperserverPassword: password + +## SMTP mail delivery configuration +## ref: https://github.com/bitnami/bitnami-docker-jasperserver#smtp-configuration +## +# smtpHost: +# smtpPort: +# smtpHostID: +# smtpUser: +# smtpPassword: +# smtpProtocol: + +## +## MariaDB chart configuration +## +mariadb: + ## MariaDB admin password + ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#setting-the-root-password-on-first-run + ## mariadbRootPassword: secretpassword + + ## Enable persistence using Persistent Volume Claims + ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ + ## + persistence: + enabled: true + storageClass: generic + accessMode: ReadWriteOnce + size: 8Gi + +## Kubernetes configuration +## For minikube, set this to NodePort, elsewhere use LoadBalancer +## +serviceType: LoadBalancer + +## Enable persistence using Persistent Volume Claims +## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ +## +persistence: + enabled: true + jasperserver: + storageClass: generic + accessMode: ReadWriteOnce + size: 8Gi + +## Configure resource requests and limits +## ref: http://kubernetes.io/docs/user-guide/compute-resources/ +## +resources: + requests: + memory: 512Mi + cpu: 300m From f9c51783f3517e7462d4a6801d1d735ebaacacbc Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Thu, 1 Dec 2016 10:56:20 +0100 Subject: [PATCH 07/36] applied fixes propossed on PR --- incubator/jasperserver/Chart.yaml | 4 +--- incubator/jasperserver/README.md | 7 +++--- incubator/jasperserver/templates/NOTES.txt | 4 ++-- .../jasperserver/templates/deployment.yaml | 23 +++++++++---------- .../{jasperserver-pvc.yaml => pvc.yaml} | 7 +++++- incubator/jasperserver/templates/svc.yaml | 3 --- incubator/jasperserver/values.yaml | 10 +++++--- 7 files changed, 31 insertions(+), 27 deletions(-) rename incubator/jasperserver/templates/{jasperserver-pvc.yaml => pvc.yaml} (66%) diff --git a/incubator/jasperserver/Chart.yaml b/incubator/jasperserver/Chart.yaml index 9e2927d28..e3ab56b7f 100644 --- a/incubator/jasperserver/Chart.yaml +++ b/incubator/jasperserver/Chart.yaml @@ -1,5 +1,5 @@ name: jasperserver -version: 0.0.1 +version: 0.1.0 description: The JasperReports server can be used as a stand-alone or embedded reporting and BI server that offers web-based reporting, analytic tools and visualization, and a dashboard feature for compiling multiple custom views keywords: - BI @@ -8,8 +8,6 @@ keywords: - reporting - analytic - visualization -- dashboard -- mariadb home: http://community.jaspersoft.com/project/jasperreports-server sources: - https://github.com/bitnami/bitnami-docker-jasperserver diff --git a/incubator/jasperserver/README.md b/incubator/jasperserver/README.md index 59556b4fe..6f81aae78 100644 --- a/incubator/jasperserver/README.md +++ b/incubator/jasperserver/README.md @@ -51,12 +51,13 @@ The following tables lists the configurable parameters of the jasperserver chart | `image` | jasperserver image | `bitnami/jasperserver:{VERSION}` | | `imageTag` | jasperserver image Tag | `3.1.3` | | `imagePullPolicy` | Image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | -| `jasperserverUser` | User of the application | `user` | +| `jasperserverUsername` | User of the application | `user` | | `jasperserverPassword` | Application password | _random 10 character long alphanumeric string_ | | `smtpHost` | SMTP host | `nil` | | `smtpPort` | SMTP port | `nil` | -| `smtpHostID` | SMTP host ID | `nil` | +| `smtpEmail` | SMTP Email | `nil` | | `smtpUser` | SMTP user | `nil` | +| `smtpProtocol` | SMTP protocol | `nil` | | `smtpPassword` | SMTP password | `nil` | | `mariadb.mariadbRootPassword` | MariaDB admin password | `nil` | | `serviceType` | Kubernetes Service type | `LoadBalancer` | @@ -72,7 +73,7 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm ```console $ helm install --name my-release \ - --set jasperserverUser=admin,jasperserverPassword=password,mariadb.mariadbRootPassword=secretpassword \ + --set jasperserverUsername=admin,jasperserverPassword=bitnami,mariadb.mariadbRootPassword=secretpassword \ stable/jasperserver ``` diff --git a/incubator/jasperserver/templates/NOTES.txt b/incubator/jasperserver/templates/NOTES.txt index ead1527aa..9c435a837 100644 --- a/incubator/jasperserver/templates/NOTES.txt +++ b/incubator/jasperserver/templates/NOTES.txt @@ -10,7 +10,7 @@ {{- 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 -w {{ template "fullname" . }}' + Watch the status with: 'kubectl get svc -w {{ template "fullname" . }} --namespace {{ .Release.Namespace }} ' export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') echo http://$SERVICE_IP/ @@ -23,5 +23,5 @@ 2. Get your jasperserver login credentials by running: - echo Username: {{ .Values.jasperserverUser }} + echo Username: {{ .Values.jasperserverUsername }} echo Password: $(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.jasperserver-password[*]}"`)) diff --git a/incubator/jasperserver/templates/deployment.yaml b/incubator/jasperserver/templates/deployment.yaml index 59bf357f9..319855309 100644 --- a/incubator/jasperserver/templates/deployment.yaml +++ b/incubator/jasperserver/templates/deployment.yaml @@ -8,7 +8,6 @@ metadata: release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" spec: - replicas: 1 template: metadata: labels: @@ -16,7 +15,7 @@ spec: spec: containers: - name: {{ template "fullname" . }} - image: "{{ .Values.image }}" + image: "{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }} env: - name: MARIADB_HOST @@ -29,20 +28,22 @@ spec: name: {{ template "mariadb.fullname" . }} key: mariadb-root-password - name: JASPERSERVER_USERNAME - value: {{ default "" .Values.jasperserverUser | quote }} + value: {{ default "" .Values.jasperserverUsername | quote }} - name: JASPERSERVER_PASSWORD valueFrom: secretKeyRef: name: {{ template "fullname" . }} key: jasperserver-password - - name: SMTP_HOST_ID - value: {{ default "" .Values.smtpHostID | quote }} + - name: SMTP_EMAIL + value: {{ default "" .Values.smtpEmail| quote }} - name: SMTP_HOST value: {{ default "" .Values.smtpHost | quote }} - name: SMTP_PORT value: {{ default "" .Values.smtpPort | quote }} - name: SMTP_USER value: {{ default "" .Values.smtpUser | quote }} + - name: SMTP_PROTOCOL + value: {{ default "" .Values.smtpProtocol | quote }} - name: SMTP_PASSWORD valueFrom: secretKeyRef: @@ -51,20 +52,18 @@ spec: ports: - name: http containerPort: 8080 - - name: https - containerPort: 443 livenessProbe: httpGet: - path: / + path: /jasperserver/ port: http initialDelaySeconds: 120 timeoutSeconds: 5 readinessProbe: httpGet: - path: / + path: /jasperserver/ port: http - initialDelaySeconds: 60 - timeoutSeconds: 5 + initialDelaySeconds: 5 + timeoutSeconds: 1 resources: {{ toYaml .Values.resources | indent 10 }} volumeMounts: @@ -74,7 +73,7 @@ spec: - name: jasperserver-data {{- if .Values.persistence.enabled }} persistentVolumeClaim: - claimName: {{ template "fullname" . }}-jasperserver + claimName: {{ template "fullname" . }} {{- else }} emptyDir: {} {{- end }} diff --git a/incubator/jasperserver/templates/jasperserver-pvc.yaml b/incubator/jasperserver/templates/pvc.yaml similarity index 66% rename from incubator/jasperserver/templates/jasperserver-pvc.yaml rename to incubator/jasperserver/templates/pvc.yaml index 3fea74e05..97a98ea42 100644 --- a/incubator/jasperserver/templates/jasperserver-pvc.yaml +++ b/incubator/jasperserver/templates/pvc.yaml @@ -1,8 +1,13 @@ {{- if .Values.persistence.enabled -}} kind: PersistentVolumeClaim apiVersion: v1 +labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" metadata: - name: {{ template "fullname" . }}-jasperserver + name: {{ template "fullname" . }} annotations: volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.jasperserver.storageClass | quote }} spec: diff --git a/incubator/jasperserver/templates/svc.yaml b/incubator/jasperserver/templates/svc.yaml index 6736e0476..cf77abe82 100644 --- a/incubator/jasperserver/templates/svc.yaml +++ b/incubator/jasperserver/templates/svc.yaml @@ -13,8 +13,5 @@ spec: - name: http port: 80 targetPort: http - - name: https - port: 443 - targetPort: https selector: app: {{ template "fullname" . }} diff --git a/incubator/jasperserver/values.yaml b/incubator/jasperserver/values.yaml index 425a20aae..a7cbdcc75 100644 --- a/incubator/jasperserver/values.yaml +++ b/incubator/jasperserver/values.yaml @@ -3,6 +3,10 @@ ## image: bitnami/jasperserver +## Bitnami image Tag +# +imageTag: 6.3.0-r3 + ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -12,19 +16,19 @@ image: bitnami/jasperserver ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-jasperserver#environment-variables ## -jasperserverUser: user +jasperserverUsername: user ## Application password ## Defaults to a random 10-character alphanumeric string if not set ## ref: https://github.com/bitnami/bitnami-docker-jasperserver#environment-variables -jasperserverPassword: password +# jasperserverPassword: ## SMTP mail delivery configuration ## ref: https://github.com/bitnami/bitnami-docker-jasperserver#smtp-configuration ## # smtpHost: # smtpPort: -# smtpHostID: +# smtpEmail: # smtpUser: # smtpPassword: # smtpProtocol: From 5fdb5da4e2d691ffec87a41416092a126c6af4fe Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Thu, 1 Dec 2016 11:19:40 +0100 Subject: [PATCH 08/36] fixes PR proposed by Sameer --- incubator/moodle/Chart.yaml | 3 +-- incubator/moodle/README.md | 6 +++--- incubator/moodle/templates/NOTES.txt | 4 ++-- incubator/moodle/templates/apache-pvc.yaml | 5 +++++ incubator/moodle/templates/deployment.yaml | 13 ++++++------- incubator/moodle/templates/moodle-pvc.yaml | 5 +++++ incubator/moodle/values.yaml | 5 ++--- 7 files changed, 24 insertions(+), 17 deletions(-) diff --git a/incubator/moodle/Chart.yaml b/incubator/moodle/Chart.yaml index 749aa6712..a617fd082 100644 --- a/incubator/moodle/Chart.yaml +++ b/incubator/moodle/Chart.yaml @@ -1,11 +1,10 @@ name: moodle -version: 0.0.1 +version: 0.1.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 keywords: - moodle - learning - php -- mariadb home: http://www.moodle.org/ sources: - https://github.com/bitnami/bitnami-docker-moodle diff --git a/incubator/moodle/README.md b/incubator/moodle/README.md index a43975251..5b9522399 100644 --- a/incubator/moodle/README.md +++ b/incubator/moodle/README.md @@ -50,12 +50,12 @@ The following tables lists the configurable parameters of the moodle chart and t | `image` | moodle image | `bitnami/moodle:{VERSION}` | | `imageTag` | moodle image Tag | `3.1.3` | | `imagePullPolicy` | Image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | -| `moodleUser` | User of the application | `user` | +| `moodleUsername` | User of the application | `user` | | `moodlePassword` | Application password | _random 10 character long alphanumeric string_ | | `moodleEmail` | Admin email | `user@example.com` | | `smtpHost` | SMTP host | `nil` | | `smtpPort` | SMTP port | `nil` | -| `smtpHostID` | SMTP host ID | `nil` | +| `smtpProtocol` | SMTP Protocol | `nil` | | `smtpUser` | SMTP user | `nil` | | `smtpPassword` | SMTP password | `nil` | | `mariadb.mariadbRootPassword` | MariaDB admin password | `nil` | @@ -75,7 +75,7 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm ```console $ helm install --name my-release \ - --set moodleUser=admin,moodlePassword=password,mariadb.mariadbRootPassword=secretpassword \ + --set moodleUsername=admin,moodlePassword=password,mariadb.mariadbRootPassword=secretpassword \ stable/moodle ``` diff --git a/incubator/moodle/templates/NOTES.txt b/incubator/moodle/templates/NOTES.txt index 1405a8b28..de1a9afd1 100644 --- a/incubator/moodle/templates/NOTES.txt +++ b/incubator/moodle/templates/NOTES.txt @@ -10,7 +10,7 @@ {{- 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 -w {{ template "fullname" . }}' + Watch the status with: 'kubectl get svc -w {{ template "fullname" . }} --namespace {{ .Release.Namespace }}' export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') echo http://$SERVICE_IP/ @@ -23,5 +23,5 @@ 2. Get your moodle login credentials by running: - echo Username: {{ .Values.moodleUser }} + echo Username: {{ .Values.moodleUsername }} echo Password: $(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.moodle-password[*]}"`)) diff --git a/incubator/moodle/templates/apache-pvc.yaml b/incubator/moodle/templates/apache-pvc.yaml index c4cbd9e11..95a0e576c 100644 --- a/incubator/moodle/templates/apache-pvc.yaml +++ b/incubator/moodle/templates/apache-pvc.yaml @@ -2,6 +2,11 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" name: {{ template "fullname" . }}-apache annotations: volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }} diff --git a/incubator/moodle/templates/deployment.yaml b/incubator/moodle/templates/deployment.yaml index c2d9053ad..1ba04de58 100644 --- a/incubator/moodle/templates/deployment.yaml +++ b/incubator/moodle/templates/deployment.yaml @@ -8,7 +8,6 @@ metadata: release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" spec: - replicas: 1 template: metadata: labels: @@ -16,7 +15,7 @@ spec: spec: containers: - name: {{ template "fullname" . }} - image: "{{ .Values.image }}" + image: "{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }} env: - name: MARIADB_HOST @@ -29,7 +28,7 @@ spec: name: {{ template "mariadb.fullname" . }} key: mariadb-root-password - name: MOODLE_USERNAME - value: {{ default "" .Values.moodleUser | quote }} + value: {{ default "" .Values.moodleUsername | quote }} - name: MOODLE_PASSWORD valueFrom: secretKeyRef: @@ -37,8 +36,8 @@ spec: key: moodle-password - name: MOODLE_EMAIL value: {{ default "" .Values.moodleEmail | quote }} - - name: SMTP_HOST_ID - value: {{ default "" .Values.smtpHostID | quote }} + - name: SMTP_PROTOCOL + value: {{ default "" .Values.smtpProtocol | quote }} - name: SMTP_HOST value: {{ default "" .Values.smtpHost | quote }} - name: SMTP_PORT @@ -65,8 +64,8 @@ spec: httpGet: path: / port: http - initialDelaySeconds: 60 - timeoutSeconds: 5 + initialDelaySeconds: 30 + timeoutSeconds: 1 resources: {{ toYaml .Values.resources | indent 10 }} volumeMounts: diff --git a/incubator/moodle/templates/moodle-pvc.yaml b/incubator/moodle/templates/moodle-pvc.yaml index a68e65b28..46a8d470e 100644 --- a/incubator/moodle/templates/moodle-pvc.yaml +++ b/incubator/moodle/templates/moodle-pvc.yaml @@ -2,6 +2,11 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" name: {{ template "fullname" . }}-moodle annotations: volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.moodle.storageClass | quote }} diff --git a/incubator/moodle/values.yaml b/incubator/moodle/values.yaml index bae119fe0..f74d724bc 100644 --- a/incubator/moodle/values.yaml +++ b/incubator/moodle/values.yaml @@ -12,12 +12,12 @@ image: bitnami/moodle ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-moodle#environment-variables ## -moodleUser: user +moodleUsername: user ## Application password ## Defaults to a random 10-character alphanumeric string if not set ## ref: https://github.com/bitnami/bitnami-docker-moodle#environment-variables -moodlePassword: password +#moodlePassword: ## Admin email ## ref: https://github.com/bitnami/bitnami-docker-moodle#environment-variables @@ -30,7 +30,6 @@ moodleEmail: user@example.com ## # smtpHost: # smtpPort: -# smtpHostID: # smtpUser: # smtpPassword: # smtpProtocol: From 510d82bdfb0ec632157f48ce6b9ab4ad43d4b1df Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Thu, 1 Dec 2016 16:05:27 +0100 Subject: [PATCH 09/36] fixes for PR --- incubator/moodle/README.md | 6 +----- incubator/moodle/templates/apache-pvc.yaml | 19 ------------------- incubator/moodle/templates/deployment.yaml | 13 ++----------- .../templates/{moodle-pvc.yaml => pvc.yaml} | 2 +- incubator/moodle/values.yaml | 4 ---- 5 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 incubator/moodle/templates/apache-pvc.yaml rename incubator/moodle/templates/{moodle-pvc.yaml => pvc.yaml} (92%) diff --git a/incubator/moodle/README.md b/incubator/moodle/README.md index 5b9522399..db651bba6 100644 --- a/incubator/moodle/README.md +++ b/incubator/moodle/README.md @@ -48,7 +48,6 @@ The following tables lists the configurable parameters of the moodle chart and t | Parameter | Description | Default | |--------------------------------------|------------------------------------------|---------------------------------------------------------| | `image` | moodle image | `bitnami/moodle:{VERSION}` | -| `imageTag` | moodle image Tag | `3.1.3` | | `imagePullPolicy` | Image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | | `moodleUsername` | User of the application | `user` | | `moodlePassword` | Application password | _random 10 character long alphanumeric string_ | @@ -61,9 +60,6 @@ The following tables lists the configurable parameters of the moodle chart and t | `mariadb.mariadbRootPassword` | MariaDB admin password | `nil` | | `serviceType` | Kubernetes Service type | `LoadBalancer` | | `persistence.enabled` | Enable persistence using PVC | `true` | -| `persistence.apache.storageClass` | PVC Storage Class for Apache volume | `generic` | -| `persistence.apache.accessMode` | PVC Access Mode for Apache volume | `ReadWriteOnce` | -| `persistence.apache.size` | PVC Storage Request for Apache volume | `1Gi` | | `persistence.moodle.storageClass` | PVC Storage Class for moodle volume | `generic` | | `persistence.moodle.accessMode` | PVC Access Mode for moodle volume | `ReadWriteOnce` | | `persistence.moodle.size` | PVC Storage Request for moodle volume | `8Gi` | @@ -91,7 +87,7 @@ $ helm install --name my-release -f values.yaml stable/moodle ## Persistence -The [Bitnami moodle](https://github.com/bitnami/bitnami-docker-moodle) image stores the moodle data and configurations at the `/bitnami/moodle` and `/bitnami/apache` paths of the container. +The [Bitnami moodle](https://github.com/bitnami/bitnami-docker-moodle) image stores the moodle data and configurations at the `/bitnami/moodle` path of the container. Persistent Volume Claims are used to keep the data across deployments. This is known to work in GCE, AWS, and minikube. See the [Configuration](#configuration) section to configure the PVC or to disable persistence. diff --git a/incubator/moodle/templates/apache-pvc.yaml b/incubator/moodle/templates/apache-pvc.yaml deleted file mode 100644 index 95a0e576c..000000000 --- a/incubator/moodle/templates/apache-pvc.yaml +++ /dev/null @@ -1,19 +0,0 @@ -{{- if .Values.persistence.enabled -}} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - labels: - app: {{ template "fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" - name: {{ template "fullname" . }}-apache - annotations: - volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }} -spec: - accessModes: - - {{ .Values.persistence.apache.accessMode | quote }} - resources: - requests: - storage: {{ .Values.persistence.apache.size | quote }} -{{- end -}} diff --git a/incubator/moodle/templates/deployment.yaml b/incubator/moodle/templates/deployment.yaml index 1ba04de58..ee9c7c867 100644 --- a/incubator/moodle/templates/deployment.yaml +++ b/incubator/moodle/templates/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: {{ template "fullname" . }} - image: "{{ .Values.image }}:{{ .Values.imageTag }}" + image: "{{ .Values.image }}" imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }} env: - name: MARIADB_HOST @@ -71,20 +71,11 @@ spec: volumeMounts: - name: moodle-data mountPath: /bitnami/moodle - - name: apache-data - mountPath: /bitnami/apache volumes: - name: moodle-data {{- if .Values.persistence.enabled }} persistentVolumeClaim: - claimName: {{ template "fullname" . }}-moodle - {{- else }} - emptyDir: {} - {{- end }} - - name: apache-data - {{- if .Values.persistence.enabled }} - persistentVolumeClaim: - claimName: {{ template "fullname" . }}-apache + claimName: {{ template "fullname" . }} {{- else }} emptyDir: {} {{- end }} diff --git a/incubator/moodle/templates/moodle-pvc.yaml b/incubator/moodle/templates/pvc.yaml similarity index 92% rename from incubator/moodle/templates/moodle-pvc.yaml rename to incubator/moodle/templates/pvc.yaml index 46a8d470e..90b3beb58 100644 --- a/incubator/moodle/templates/moodle-pvc.yaml +++ b/incubator/moodle/templates/pvc.yaml @@ -7,7 +7,7 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" - name: {{ template "fullname" . }}-moodle + name: {{ template "fullname" . }} annotations: volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.moodle.storageClass | quote }} spec: diff --git a/incubator/moodle/values.yaml b/incubator/moodle/values.yaml index f74d724bc..84383fc2b 100644 --- a/incubator/moodle/values.yaml +++ b/incubator/moodle/values.yaml @@ -61,10 +61,6 @@ serviceType: LoadBalancer ## persistence: enabled: true - apache: - storageClass: generic - accessMode: ReadWriteOnce - size: 1Gi moodle: storageClass: generic accessMode: ReadWriteOnce From b005090b6d91d80b63898e515531e7c79a41c0b1 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Thu, 1 Dec 2016 16:07:56 +0100 Subject: [PATCH 10/36] Fixes for PR --- incubator/jasperserver/README.md | 1 - incubator/jasperserver/templates/deployment.yaml | 2 +- incubator/jasperserver/values.yaml | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/incubator/jasperserver/README.md b/incubator/jasperserver/README.md index 6f81aae78..8af7e4c00 100644 --- a/incubator/jasperserver/README.md +++ b/incubator/jasperserver/README.md @@ -49,7 +49,6 @@ The following tables lists the configurable parameters of the jasperserver chart | Parameter Description | Default | |------------------------------------------|----------------------------------------------|---------------------------------------------------------| | `image` | jasperserver image | `bitnami/jasperserver:{VERSION}` | -| `imageTag` | jasperserver image Tag | `3.1.3` | | `imagePullPolicy` | Image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | | `jasperserverUsername` | User of the application | `user` | | `jasperserverPassword` | Application password | _random 10 character long alphanumeric string_ | diff --git a/incubator/jasperserver/templates/deployment.yaml b/incubator/jasperserver/templates/deployment.yaml index 319855309..9823c9567 100644 --- a/incubator/jasperserver/templates/deployment.yaml +++ b/incubator/jasperserver/templates/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: {{ template "fullname" . }} - image: "{{ .Values.image }}:{{ .Values.imageTag }}" + image: "{{ .Values.image }}" imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }} env: - name: MARIADB_HOST diff --git a/incubator/jasperserver/values.yaml b/incubator/jasperserver/values.yaml index a7cbdcc75..caad09945 100644 --- a/incubator/jasperserver/values.yaml +++ b/incubator/jasperserver/values.yaml @@ -3,9 +3,6 @@ ## image: bitnami/jasperserver -## Bitnami image Tag -# -imageTag: 6.3.0-r3 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' From de975ac86b9d332d01e967271a798564cd5ba384 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Thu, 1 Dec 2016 16:17:26 +0100 Subject: [PATCH 11/36] add tag for image --- incubator/jasperserver/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubator/jasperserver/values.yaml b/incubator/jasperserver/values.yaml index caad09945..276687c08 100644 --- a/incubator/jasperserver/values.yaml +++ b/incubator/jasperserver/values.yaml @@ -1,7 +1,7 @@ ## Bitnami jasperserver image version ## ref: https://hub.docker.com/r/bitnami/jasperserver/tags/ ## -image: bitnami/jasperserver +image: bitnami/jasperserver:6.3.0-r3 ## Specify a imagePullPolicy From 3b0a63b4d1f9bfd0199ee4a576084bacd58ef1ed Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Thu, 1 Dec 2016 16:49:22 +0100 Subject: [PATCH 12/36] apache-data and moodle-data as PVCs --- incubator/moodle/templates/apache-pvc.yaml | 19 +++++++++++++++++++ incubator/moodle/templates/deployment.yaml | 11 ++++++++++- .../templates/{pvc.yaml => moodle-pvc.yaml} | 2 +- incubator/moodle/templates/secrets.yaml | 2 +- incubator/moodle/values.yaml | 6 +++++- 5 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 incubator/moodle/templates/apache-pvc.yaml rename incubator/moodle/templates/{pvc.yaml => moodle-pvc.yaml} (92%) diff --git a/incubator/moodle/templates/apache-pvc.yaml b/incubator/moodle/templates/apache-pvc.yaml new file mode 100644 index 000000000..95a0e576c --- /dev/null +++ b/incubator/moodle/templates/apache-pvc.yaml @@ -0,0 +1,19 @@ +{{- if .Values.persistence.enabled -}} +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" + name: {{ template "fullname" . }}-apache + annotations: + volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }} +spec: + accessModes: + - {{ .Values.persistence.apache.accessMode | quote }} + resources: + requests: + storage: {{ .Values.persistence.apache.size | quote }} +{{- end -}} diff --git a/incubator/moodle/templates/deployment.yaml b/incubator/moodle/templates/deployment.yaml index ee9c7c867..5d39e4905 100644 --- a/incubator/moodle/templates/deployment.yaml +++ b/incubator/moodle/templates/deployment.yaml @@ -71,11 +71,20 @@ spec: volumeMounts: - name: moodle-data mountPath: /bitnami/moodle + - name: apache-data + mountPath: /bitnami/apache volumes: - name: moodle-data {{- if .Values.persistence.enabled }} persistentVolumeClaim: - claimName: {{ template "fullname" . }} + claimName: {{ template "fullname" . }}-moodle {{- else }} emptyDir: {} {{- end }} + - name: apache-data + {{- if .Values.persistence.enabled }} + persistentVolumeClaim: + claimName: {{ template "fullname" . }}-apache + {{- else }} + emptyDir: {} + {{- end }} diff --git a/incubator/moodle/templates/pvc.yaml b/incubator/moodle/templates/moodle-pvc.yaml similarity index 92% rename from incubator/moodle/templates/pvc.yaml rename to incubator/moodle/templates/moodle-pvc.yaml index 90b3beb58..46a8d470e 100644 --- a/incubator/moodle/templates/pvc.yaml +++ b/incubator/moodle/templates/moodle-pvc.yaml @@ -7,7 +7,7 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" - name: {{ template "fullname" . }} + name: {{ template "fullname" . }}-moodle annotations: volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.moodle.storageClass | quote }} spec: diff --git a/incubator/moodle/templates/secrets.yaml b/incubator/moodle/templates/secrets.yaml index a76f0da3b..11a8fc791 100644 --- a/incubator/moodle/templates/secrets.yaml +++ b/incubator/moodle/templates/secrets.yaml @@ -10,7 +10,7 @@ metadata: type: Opaque data: {{- if .Values.moodlePassword }} - moodle-password: {{ .Values.moodlePassword | b64enc | quote }} + moodle-password: {{ default "" .Values.moodlePassword | b64enc | quote }} {{- else }} moodle-password: {{ randAlphaNum 10 | b64enc | quote }} {{- end }} diff --git a/incubator/moodle/values.yaml b/incubator/moodle/values.yaml index 84383fc2b..8d5b96a53 100644 --- a/incubator/moodle/values.yaml +++ b/incubator/moodle/values.yaml @@ -1,7 +1,7 @@ ## Bitnami moodle image version ## ref: https://hub.docker.com/r/bitnami/moodle/tags/ ## -image: bitnami/moodle +image: bitnami/moodle:3.1.3-r1 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -61,6 +61,10 @@ serviceType: LoadBalancer ## persistence: enabled: true + apache: + storageClass: generic + accessMode: ReadWriteOnce + size: 1Gi moodle: storageClass: generic accessMode: ReadWriteOnce From f3777cb61fb9b8f79b1b4af6af54839cb89bedf4 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Thu, 1 Dec 2016 17:21:24 +0100 Subject: [PATCH 13/36] updated ewith latest PR comments --- incubator/jasperserver/templates/NOTES.txt | 2 +- incubator/jasperserver/templates/deployment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/incubator/jasperserver/templates/NOTES.txt b/incubator/jasperserver/templates/NOTES.txt index 9c435a837..3872a5538 100644 --- a/incubator/jasperserver/templates/NOTES.txt +++ b/incubator/jasperserver/templates/NOTES.txt @@ -10,7 +10,7 @@ {{- 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 -w {{ template "fullname" . }} --namespace {{ .Release.Namespace }} ' + Watch the status with: 'kubectl get svc -w {{ template "fullname" . }} --namespace {{ .Release.Namespace }}' export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') echo http://$SERVICE_IP/ diff --git a/incubator/jasperserver/templates/deployment.yaml b/incubator/jasperserver/templates/deployment.yaml index 9823c9567..4b2de92a7 100644 --- a/incubator/jasperserver/templates/deployment.yaml +++ b/incubator/jasperserver/templates/deployment.yaml @@ -56,7 +56,7 @@ spec: httpGet: path: /jasperserver/ port: http - initialDelaySeconds: 120 + initialDelaySeconds: 300 timeoutSeconds: 5 readinessProbe: httpGet: From ca96f66bca25d539d31c4452a29de22e38686a78 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Thu, 1 Dec 2016 17:27:49 +0100 Subject: [PATCH 14/36] Added comment to README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6708f83b5..d874d9922 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ Popular applications, provided by [Bitnami](https://bitnami.com), ready to launc - [Apache (incubator)](https://github.com/bitnami/charts/tree/master/incubator/apache) - [MariaDB (stable)](https://github.com/kubernetes/charts/tree/master/stable/mariadb) - [MariaDB Cluster (incubator)](https://github.com/bitnami/charts/tree/master/incubator/mariadb-cluster) +- [JasperReports Server (incubator)](https://github.com/bitnami/charts/tree/master/incubator/jasperserver) ## Before you begin From 6227b7cd70bee9dc73824212bb65c10a06eecd58 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Fri, 2 Dec 2016 09:06:41 +0100 Subject: [PATCH 15/36] Finished all fixes for PR Moodle --- README.md | 1 + incubator/moodle/README.md | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6708f83b5..c14d13090 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ Popular applications, provided by [Bitnami](https://bitnami.com), ready to launc - [Apache (incubator)](https://github.com/bitnami/charts/tree/master/incubator/apache) - [MariaDB (stable)](https://github.com/kubernetes/charts/tree/master/stable/mariadb) - [MariaDB Cluster (incubator)](https://github.com/bitnami/charts/tree/master/incubator/mariadb-cluster) +- [Moodle (incubator)](https://github.com/bitnami/charts/tree/master/incubator/moodle) ## Before you begin diff --git a/incubator/moodle/README.md b/incubator/moodle/README.md index db651bba6..29a024853 100644 --- a/incubator/moodle/README.md +++ b/incubator/moodle/README.md @@ -49,8 +49,8 @@ The following tables lists the configurable parameters of the moodle chart and t |--------------------------------------|------------------------------------------|---------------------------------------------------------| | `image` | moodle image | `bitnami/moodle:{VERSION}` | | `imagePullPolicy` | Image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | -| `moodleUsername` | User of the application | `user` | -| `moodlePassword` | Application password | _random 10 character long alphanumeric string_ | +| `moodleUsername` | User of the application | `user` | +| `moodlePassword` | Application password | _random 10 character alphanumeric string_ | | `moodleEmail` | Admin email | `user@example.com` | | `smtpHost` | SMTP host | `nil` | | `smtpPort` | SMTP port | `nil` | @@ -60,6 +60,9 @@ The following tables lists the configurable parameters of the moodle chart and t | `mariadb.mariadbRootPassword` | MariaDB admin password | `nil` | | `serviceType` | Kubernetes Service type | `LoadBalancer` | | `persistence.enabled` | Enable persistence using PVC | `true` | +| `persistence.apache.storageClass` | PVC Storage Class for apache volume | `generic` | +| `persistence.apache.accessMode` | PVC Access Mode for apache volume | `ReadWriteOnce` | +| `persistence.apache.size` | PVC Storage Request for apache volume | `8Gi` | | `persistence.moodle.storageClass` | PVC Storage Class for moodle volume | `generic` | | `persistence.moodle.accessMode` | PVC Access Mode for moodle volume | `ReadWriteOnce` | | `persistence.moodle.size` | PVC Storage Request for moodle volume | `8Gi` | From e74ad778066fdab6d6c57c206413a7ec5e24d5f8 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Wed, 7 Dec 2016 12:24:13 +0100 Subject: [PATCH 16/36] demo --- incubator/mysql/Chart.yaml | 14 +++ incubator/mysql/README.md | 109 ++++++++++++++++++++++ incubator/mysql/templates/NOTES.txt | 6 ++ incubator/mysql/templates/_helpers.tpl | 16 ++++ incubator/mysql/templates/config-pvc.yaml | 14 +++ incubator/mysql/templates/configmap.yaml | 14 +++ incubator/mysql/templates/data-pvc.yaml | 14 +++ incubator/mysql/templates/deployment.yaml | 86 +++++++++++++++++ incubator/mysql/templates/secrets.yaml | 13 +++ incubator/mysql/templates/svc.yaml | 16 ++++ incubator/mysql/values.yaml | 51 ++++++++++ 11 files changed, 353 insertions(+) create mode 100644 incubator/mysql/Chart.yaml create mode 100644 incubator/mysql/README.md create mode 100644 incubator/mysql/templates/NOTES.txt create mode 100644 incubator/mysql/templates/_helpers.tpl create mode 100644 incubator/mysql/templates/config-pvc.yaml create mode 100644 incubator/mysql/templates/configmap.yaml create mode 100644 incubator/mysql/templates/data-pvc.yaml create mode 100644 incubator/mysql/templates/deployment.yaml create mode 100644 incubator/mysql/templates/secrets.yaml create mode 100644 incubator/mysql/templates/svc.yaml create mode 100644 incubator/mysql/values.yaml diff --git a/incubator/mysql/Chart.yaml b/incubator/mysql/Chart.yaml new file mode 100644 index 000000000..035a7fb23 --- /dev/null +++ b/incubator/mysql/Chart.yaml @@ -0,0 +1,14 @@ +name: mysql +version: 0.1.0 +description: Chart for MySQL +keywords: +- mysql +- database +- sql +home: https://mysql.com +sources: +- https://github.com/bitnami/bitnami-docker-mysql +maintainers: +- name: Bitnami + email: containers@bitnami.com +engine: gotpl diff --git a/incubator/mysql/README.md b/incubator/mysql/README.md new file mode 100644 index 000000000..811692389 --- /dev/null +++ b/incubator/mysql/README.md @@ -0,0 +1,109 @@ +# MySQL + +[MySQL](https://mysql.com ) + +MySQL is developed as open + +## TL;DR; + +```bash +$ helm install stable/mysql +``` + +## Introduction + +This chart bootstraps a [MySQL](https://github.com/bitnami/bitnami-docker-mysql) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. + +## Prerequisites + +- Kubernetes 1.4+ with Beta APIs enabled +- PV provisioner support in the underlying infrastructure + +## Installing the Chart + +To install the chart with the release name `my-release`: + +```bash +$ helm install --name my-release stable/mysql +``` + +The command deploys MySQL on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. + +> **Tip**: List all releases using `helm list` + +## Uninstalling the Chart + +To uninstall/delete the `my-release` deployment: + +```bash +$ helm delete my-release +``` + +The command removes all the Kubernetes components associated with the chart and deletes the release. + +## Configuration + +The following tables lists the configurable parameters of the MySQL chart and their default values. + +| Parameter | Description | Default | +| ----------------------- | ---------------------------------- | ---------------------------------------------------------- | +| `image` | MySQL image | `bitnami/mysql:{VERSION}` | +| `imagePullPolicy` | Image pull policy. | `Always` if `imageTag` is `latest`, else `IfNotPresent`. | +| `mysqlRootPassword` | Password for the `root` user. | `nil` | +| `mysqlUser` | Username of new user to create. | `nil` | +| `mysqlPassword` | Password for the new user. | `nil` | +| `mysqlDatabase` | Name for new database to create. | `nil` | +| `persistence.enabled` | Use a PVC to persist data | `true` | +| `persistence.storageClass` | Storage class of backing PVC | `generic` | +| `persistence.accessMode` | Use volume as ReadOnly or ReadWrite | `ReadWriteOnce` | +| `persistence.size` | Size of data volume | `8Gi` | +| `resources` | CPU/Memory resource requests/limits | Memory: `256Mi`, CPU: `250m` | +| `config` | Multi-line string for my.cnf configuration | `nil` | + +The above parameters map to the env variables defined in [bitnami/mysql](http://github.com/bitnami/bitnami-docker-mysql). For more information please refer to the [bitnami/mysql](http://github.com/bitnami/bitnami-docker-mysql) image documentation. + +Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, + +```bash +$ helm install --name my-release \ + --set mysqlRootPassword=secretpassword,mysqlUser=my-user,mysqlPassword=my-password,mysqlDatabase=my-database \ + stable/mysql +``` + +The above command sets the MySQL `root` account password to `secretpassword`. Additionally it creates a standard database user named `my-user`, with the password `my-password`, who has access to a database named `my-database`. + +Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, + +```bash +$ helm install --name my-release -f values.yaml stable/mysql +``` + +> **Tip**: You can use the default [values.yaml](values.yaml) + +### Custom my.cnf configuration + +The Bitnami MySQL image allows you to provide a custom `my.cnf` file for configuring MySQL. +This Chart uses the `config` value to mount a custom `my.cnf` using a [ConfigMap](http://kubernetes.io/docs/user-guide/configmap/). +You can configure this by creating a YAML file that defines the `config` property as a multi-line string in the format of a `my.cnf` file. +For example: + +```bash +cat > mysql-values.yaml < Date: Wed, 7 Dec 2016 15:38:07 +0100 Subject: [PATCH 17/36] test mysql2 --- incubator/mysql2/.helmignore | 1 + incubator/mysql2/Chart.yaml | 14 +++ incubator/mysql2/README.md | 109 +++++++++++++++++++++ incubator/mysql2/templates/NOTES.txt | 6 ++ incubator/mysql2/templates/_helpers.tpl | 16 +++ incubator/mysql2/templates/configmap.yaml | 14 +++ incubator/mysql2/templates/deployment.yaml | 68 +++++++++++++ incubator/mysql2/templates/pvc.yaml | 14 +++ incubator/mysql2/templates/secrets.yaml | 13 +++ incubator/mysql2/templates/svc.yaml | 16 +++ incubator/mysql2/values.yaml | 51 ++++++++++ 11 files changed, 322 insertions(+) create mode 100644 incubator/mysql2/.helmignore create mode 100644 incubator/mysql2/Chart.yaml create mode 100644 incubator/mysql2/README.md create mode 100644 incubator/mysql2/templates/NOTES.txt create mode 100644 incubator/mysql2/templates/_helpers.tpl create mode 100644 incubator/mysql2/templates/configmap.yaml create mode 100644 incubator/mysql2/templates/deployment.yaml create mode 100644 incubator/mysql2/templates/pvc.yaml create mode 100644 incubator/mysql2/templates/secrets.yaml create mode 100644 incubator/mysql2/templates/svc.yaml create mode 100644 incubator/mysql2/values.yaml diff --git a/incubator/mysql2/.helmignore b/incubator/mysql2/.helmignore new file mode 100644 index 000000000..6b8710a71 --- /dev/null +++ b/incubator/mysql2/.helmignore @@ -0,0 +1 @@ +.git diff --git a/incubator/mysql2/Chart.yaml b/incubator/mysql2/Chart.yaml new file mode 100644 index 000000000..f3b8e861e --- /dev/null +++ b/incubator/mysql2/Chart.yaml @@ -0,0 +1,14 @@ +name: mysql2 +version: 0.1.0 +description: Chart for MySQL +keywords: +- mysql +- database +- sql +home: https://mysql.com +sources: +- https://github.com/bitnami/bitnami-docker-mysql +maintainers: +- name: Bitnami + email: containers@bitnami.com +engine: gotpl diff --git a/incubator/mysql2/README.md b/incubator/mysql2/README.md new file mode 100644 index 000000000..4be5deaa2 --- /dev/null +++ b/incubator/mysql2/README.md @@ -0,0 +1,109 @@ +# MySQL + +[MySQL](https://mysql.org) is one of the most popular database servers in the world. It’s made by the original developers of MySQL and guaranteed to stay open source. Notable users include Wikipedia, Facebook and Google. + +MySQL is developed as open source software and as a relational database it provides an SQL interface for accessing data. The latest versions of MySQL also include GIS and JSON features. + +## TL;DR; + +```bash +$ helm install stable/mysql +``` + +## Introduction + +This chart bootstraps a [MySQL](https://github.com/bitnami/bitnami-docker-mysql) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. + +## Prerequisites + +- Kubernetes 1.4+ with Beta APIs enabled +- PV provisioner support in the underlying infrastructure + +## Installing the Chart + +To install the chart with the release name `my-release`: + +```bash +$ helm install --name my-release stable/mysql +``` + +The command deploys MySQL on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. + +> **Tip**: List all releases using `helm list` + +## Uninstalling the Chart + +To uninstall/delete the `my-release` deployment: + +```bash +$ helm delete my-release +``` + +The command removes all the Kubernetes components associated with the chart and deletes the release. + +## Configuration + +The following tables lists the configurable parameters of the MySQL chart and their default values. + +| Parameter | Description | Default | +| ----------------------- | ---------------------------------- | ---------------------------------------------------------- | +| `image` | MySQL image | `bitnami/mysql:{VERSION}` | +| `imagePullPolicy` | Image pull policy. | `Always` if `imageTag` is `latest`, else `IfNotPresent`. | +| `mysqlRootPassword` | Password for the `root` user. | `nil` | +| `mysqlUser` | Username of new user to create. | `nil` | +| `mysqlPassword` | Password for the new user. | `nil` | +| `mysqlDatabase` | Name for new database to create. | `nil` | +| `persistence.enabled` | Use a PVC to persist data | `true` | +| `persistence.storageClass` | Storage class of backing PVC | `generic` | +| `persistence.accessMode` | Use volume as ReadOnly or ReadWrite | `ReadWriteOnce` | +| `persistence.size` | Size of data volume | `8Gi` | +| `resources` | CPU/Memory resource requests/limits | Memory: `256Mi`, CPU: `250m` | +| `config` | Multi-line string for my.cnf configuration | `nil` | + +The above parameters map to the env variables defined in [bitnami/mysql](http://github.com/bitnami/bitnami-docker-mysql). For more information please refer to the [bitnami/mysql](http://github.com/bitnami/bitnami-docker-mysql) image documentation. + +Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, + +```bash +$ helm install --name my-release \ + --set mysqlRootPassword=secretpassword,mysqlUser=my-user,mysqlPassword=my-password,mysqlDatabase=my-database \ + stable/mysql +``` + +The above command sets the MySQL `root` account password to `secretpassword`. Additionally it creates a standard database user named `my-user`, with the password `my-password`, who has access to a database named `my-database`. + +Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, + +```bash +$ helm install --name my-release -f values.yaml stable/mysql +``` + +> **Tip**: You can use the default [values.yaml](values.yaml) + +### Custom my.cnf configuration + +The Bitnami MySQL image allows you to provide a custom `my.cnf` file for configuring MySQL. +This Chart uses the `config` value to mount a custom `my.cnf` using a [ConfigMap](http://kubernetes.io/docs/user-guide/configmap/). +You can configure this by creating a YAML file that defines the `config` property as a multi-line string in the format of a `my.cnf` file. +For example: + +```bash +cat > mysql-values.yaml < Date: Wed, 7 Dec 2016 16:56:30 +0100 Subject: [PATCH 18/36] Initial version of the DokWiki chart --- incubator/dokuwiki/.helmignore | 21 +++++ incubator/dokuwiki/Chart.yaml | 15 +++ incubator/dokuwiki/README.md | 91 +++++++++++++++++++ incubator/dokuwiki/templates/NOTES.txt | 27 ++++++ incubator/dokuwiki/templates/_helpers.tpl | 24 +++++ incubator/dokuwiki/templates/apache-pvc.yaml | 19 ++++ incubator/dokuwiki/templates/deployment.yaml | 72 +++++++++++++++ .../dokuwiki/templates/dokuwiki-pvc.yaml | 19 ++++ incubator/dokuwiki/templates/secrets.yaml | 16 ++++ incubator/dokuwiki/templates/svc.yaml | 20 ++++ incubator/dokuwiki/values.yaml | 63 +++++++++++++ 11 files changed, 387 insertions(+) create mode 100644 incubator/dokuwiki/.helmignore create mode 100644 incubator/dokuwiki/Chart.yaml create mode 100644 incubator/dokuwiki/README.md create mode 100644 incubator/dokuwiki/templates/NOTES.txt create mode 100644 incubator/dokuwiki/templates/_helpers.tpl create mode 100644 incubator/dokuwiki/templates/apache-pvc.yaml create mode 100644 incubator/dokuwiki/templates/deployment.yaml create mode 100644 incubator/dokuwiki/templates/dokuwiki-pvc.yaml create mode 100644 incubator/dokuwiki/templates/secrets.yaml create mode 100644 incubator/dokuwiki/templates/svc.yaml create mode 100644 incubator/dokuwiki/values.yaml diff --git a/incubator/dokuwiki/.helmignore b/incubator/dokuwiki/.helmignore new file mode 100644 index 000000000..f0c131944 --- /dev/null +++ b/incubator/dokuwiki/.helmignore @@ -0,0 +1,21 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj diff --git a/incubator/dokuwiki/Chart.yaml b/incubator/dokuwiki/Chart.yaml new file mode 100644 index 000000000..05808a5af --- /dev/null +++ b/incubator/dokuwiki/Chart.yaml @@ -0,0 +1,15 @@ +name: dokuwiki +version: 0.1.0 +description: DokuWiki is a simple to use and highly versatile Open Source wiki software that doesn't require a database. It is loved by users for its clean and readable syntax. +keywords: +- dokuwiki +- wiki +- php +home: http://www.dokuwiki.org/ +sources: +- https://github.com/bitnami/bitnami-docker-dokuwiki +maintainers: +- name: Bitnami + email: containers@bitnami.com +engine: gotpl +icon: https://d33np9n32j53g7.cloudfront.net/assets/stacks/dokuwiki/img/dokuwiki-stack-110x117-93f5de05ec90c0139b2b57db66de311e.png diff --git a/incubator/dokuwiki/README.md b/incubator/dokuwiki/README.md new file mode 100644 index 000000000..7940bb4f9 --- /dev/null +++ b/incubator/dokuwiki/README.md @@ -0,0 +1,91 @@ +# DokuWiki + +[DokuWiki](https://www.dokuwiki.org) DokuWiki is a learning platform designed to provide educators, administrators and learners with a single robust, secure and integrated system to create personalised learning environments + +## TL;DR; + +```console +$ helm install . +``` + +## Introduction + +This chart bootstraps a [DokuWiki](https://github.com/bitnami/bitnami-docker-dokuwiki) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. + + +## Prerequisites + +- Kubernetes 1.4+ with Beta APIs enabled +- PV provisioner support in the underlying infrastructure + +## Installing the Chart + +To install the chart with the release name `my-release`: + +```console +$ helm install --name my-release ./dokuwiki +``` + +The command deploys DokuWiki on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. + +> **Tip**: List all releases using `helm list` + +## Uninstalling the Chart + +To uninstall/delete the `my-release` deployment: + +```console +$ helm delete my-release +``` + +The command removes all the Kubernetes components associated with the chart and deletes the release. + +## Configuration + +The following tables lists the configurable parameters of the DokuWiki chart and their default values. + +| Parameter | Description | Default | +|--------------------------------------|------------------------------------------|---------------------------------------------------------| +| `image` | DokuWiki image | `bitnami/dokuwiki:{VERSION}` | +| `imagePullPolicy` | Image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | +| `dokuwikiUsername` | User of the application | `superuser` | +| `dokuwikiFullname` | User's full name | `Full Name` | +| `dokuwikiPassword` | Application password | _random 10 character alphanumeric string_ | +| `dokuwikiEmail` | User email | `user@example.com` | +| `dokuwikiWikiname` | Wiki name | `Bitnami DokuWiki` | +| `serviceType` | Kubernetes Service type | `LoadBalancer` | +| `persistence.enabled` | Enable persistence using PVC | `true` | +| `persistence.apache.storageClass` | PVC Storage Class for apache volume | `generic` | +| `persistence.apache.accessMode` | PVC Access Mode for apache volume | `ReadWriteOnce` | +| `persistence.apache.size` | PVC Storage Request for apache volume | `1Gi` | +| `persistence.dokuwiki.storageClass` | PVC Storage Class for DokuWiki volume | `generic` | +| `persistence.dokuwiki.accessMode` | PVC Access Mode for DokuWiki volume | `ReadWriteOnce` | +| `persistence.dokuwiki.size` | PVC Storage Request for DokuWiki volume | `8Gi` | +| `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | + +The above parameters map to the env variables defined in [bitnami/dokuwiki](http://github.com/bitnami/bitnami-docker-dokuwiki). For more information please refer to the [bitnami/dokuwiki](http://github.com/bitnami/bitnami-docker-dokuwiki) image documentation. + +Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, + +```console +$ helm install --name my-release \ + --set dokuwikiUsername=admin,dokuwikiPassword=password \ + stable/dokuwiki +``` + +The above command sets the DokuWiki administrator account username and password to `admin` and `password` respectively. Additionally it sets the MariaDB `root` user password to `secretpassword`. + +Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, + +```console +$ helm install --name my-release -f values.yaml stable/dokuwiki +``` + +> **Tip**: You can use the default [values.yaml](values.yaml) + +## Persistence + +The [Bitnami DokuWiki](https://github.com/bitnami/bitnami-docker-dokuwiki) image stores the DokuWiki data and configurations at the `/bitnami/dokuwiki` and `/bitnami/apache` paths of the container. + +Persistent Volume Claims are used to keep the data across deployments. This is known to work in GCE, AWS, and minikube. +See the [Configuration](#configuration) section to configure the PVC or to disable persistence. diff --git a/incubator/dokuwiki/templates/NOTES.txt b/incubator/dokuwiki/templates/NOTES.txt new file mode 100644 index 000000000..206654a29 --- /dev/null +++ b/incubator/dokuwiki/templates/NOTES.txt @@ -0,0 +1,27 @@ + +1. Get the dokuwiki URL by running: + +{{- if contains "NodePort" .Values.serviceType }} + + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "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 -w {{ template "fullname" . }} --namespace {{ .Release.Namespace }}' + + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "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}") + echo http://127.0.0.1:8080/ + kubectl port-forward $POD_NAME 8080:80 +{{- end }} + +2. Get your dokuwiki login credentials by running: + + echo Username: {{ .Values.dokuwikiUsername }} + echo Password: $(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.dokuwiki-password[*]}"`)) diff --git a/incubator/dokuwiki/templates/_helpers.tpl b/incubator/dokuwiki/templates/_helpers.tpl new file mode 100644 index 000000000..4355810df --- /dev/null +++ b/incubator/dokuwiki/templates/_helpers.tpl @@ -0,0 +1,24 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 24 -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +*/}} +{{- define "fullname" -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- printf "%s-%s" .Release.Name $name | trunc 24 -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +*/}} +{{- define "mariadb.fullname" -}} +{{- printf "%s-%s" .Release.Name "mariadb" | trunc 24 -}} +{{- end -}} diff --git a/incubator/dokuwiki/templates/apache-pvc.yaml b/incubator/dokuwiki/templates/apache-pvc.yaml new file mode 100644 index 000000000..95a0e576c --- /dev/null +++ b/incubator/dokuwiki/templates/apache-pvc.yaml @@ -0,0 +1,19 @@ +{{- if .Values.persistence.enabled -}} +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" + name: {{ template "fullname" . }}-apache + annotations: + volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }} +spec: + accessModes: + - {{ .Values.persistence.apache.accessMode | quote }} + resources: + requests: + storage: {{ .Values.persistence.apache.size | quote }} +{{- end -}} diff --git a/incubator/dokuwiki/templates/deployment.yaml b/incubator/dokuwiki/templates/deployment.yaml new file mode 100644 index 000000000..67c50d565 --- /dev/null +++ b/incubator/dokuwiki/templates/deployment.yaml @@ -0,0 +1,72 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: {{ template "fullname" . }} + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +spec: + template: + metadata: + labels: + app: {{ template "fullname" . }} + spec: + containers: + - name: {{ template "fullname" . }} + image: "{{ .Values.image }}" + imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }} + env: + - name: DOKUWIKI_USERNAME + value: {{ default "" .Values.dokuwikiUsername | quote }} + - name: DOKUWIKI_FULLNAME + value: {{ default "" .Values.dokuwikiFullname | quote }} + - name: DOKUWIKI_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "fullname" . }} + key: dokuwiki-password + - name: DOKUWIKI_EMAIL + value: {{ default "" .Values.dokuwikiEmail | quote }} + - name: DOKUWIKI_WIKINAME + value: {{ default "" .Values.dokuwikiWikiname | quote }} + ports: + - name: http + containerPort: 80 + - name: https + containerPort: 443 + livenessProbe: + httpGet: + path: / + port: http + initialDelaySeconds: 120 + timeoutSeconds: 5 + readinessProbe: + httpGet: + path: / + port: http + initialDelaySeconds: 30 + timeoutSeconds: 1 + resources: +{{ toYaml .Values.resources | indent 10 }} + volumeMounts: + - name: dokuwiki-data + mountPath: /bitnami/dokuwiki + - name: apache-data + mountPath: /bitnami/apache + volumes: + - name: dokuwiki-data + {{- if .Values.persistence.enabled }} + persistentVolumeClaim: + claimName: {{ template "fullname" . }}-dokuwiki + {{- else }} + emptyDir: {} + {{- end }} + - name: apache-data + {{- if .Values.persistence.enabled }} + persistentVolumeClaim: + claimName: {{ template "fullname" . }}-apache + {{- else }} + emptyDir: {} + {{- end }} diff --git a/incubator/dokuwiki/templates/dokuwiki-pvc.yaml b/incubator/dokuwiki/templates/dokuwiki-pvc.yaml new file mode 100644 index 000000000..bdae89de4 --- /dev/null +++ b/incubator/dokuwiki/templates/dokuwiki-pvc.yaml @@ -0,0 +1,19 @@ +{{- if .Values.persistence.enabled -}} +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" + name: {{ template "fullname" . }}-dokuwiki + annotations: + volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.dokuwiki.storageClass | quote }} +spec: + accessModes: + - {{ .Values.persistence.dokuwiki.accessMode | quote }} + resources: + requests: + storage: {{ .Values.persistence.dokuwiki.size | quote }} +{{- end -}} diff --git a/incubator/dokuwiki/templates/secrets.yaml b/incubator/dokuwiki/templates/secrets.yaml new file mode 100644 index 000000000..ddf855e0c --- /dev/null +++ b/incubator/dokuwiki/templates/secrets.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Secret +metadata: + name: {{ template "fullname" . }} + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +type: Opaque +data: + {{- if .Values.dokuwikiPassword }} + dokuwiki-password: {{ default "" .Values.dokuwikiPassword | b64enc | quote }} + {{- else }} + dokuwiki-password: {{ randAlphaNum 10 | b64enc | quote }} + {{- end }} diff --git a/incubator/dokuwiki/templates/svc.yaml b/incubator/dokuwiki/templates/svc.yaml new file mode 100644 index 000000000..6736e0476 --- /dev/null +++ b/incubator/dokuwiki/templates/svc.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ template "fullname" . }} + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +spec: + type: {{ .Values.serviceType }} + ports: + - name: http + port: 80 + targetPort: http + - name: https + port: 443 + targetPort: https + selector: + app: {{ template "fullname" . }} diff --git a/incubator/dokuwiki/values.yaml b/incubator/dokuwiki/values.yaml new file mode 100644 index 000000000..19db9232c --- /dev/null +++ b/incubator/dokuwiki/values.yaml @@ -0,0 +1,63 @@ +## Bitnami dokuwiki image version +## ref: https://hub.docker.com/r/bitnami/dokuwiki/tags/ +## +image: bitnami/dokuwiki:20160626a-r0 + +## Specify a imagePullPolicy +## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' +## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images +## +# imagePullPolicy: + +## User of the application +## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables +## +dokuwikiUsername: superuser + +## User's Full Name +## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables +## +dokuwikiFullname: FullName + +## Application password +## Defaults to a random 10-character alphanumeric string if not set +## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables +## dokuwikiPassword: + +## Admin email +## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables +## +dokuwikiEmail: user@example.com + +## +## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables +## +dokuwikiWikiname: Bitnami DokuWiki + + +## Kubernetes configuration +## For minikube, set this to NodePort, elsewhere use LoadBalancer +## +serviceType: LoadBalancer + +## Enable persistence using Persistent Volume Claims +## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ +## +persistence: + enabled: true + apache: + storageClass: generic + accessMode: ReadWriteOnce + size: 1Gi + dokuwiki: + storageClass: generic + accessMode: ReadWriteOnce + size: 8Gi + +## Configure resource requests and limits +## ref: http://kubernetes.io/docs/user-guide/compute-resources/ +## +resources: + requests: + memory: 512Mi + cpu: 300m From 94c95f1b9290adb68df731eb1948d87f60ade248 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 8 Dec 2016 15:43:01 +0530 Subject: [PATCH 19/36] update chart image version and bump chart version --- incubator/magento/Chart.yaml | 2 +- incubator/magento/requirements.lock | 8 ++++---- incubator/magento/requirements.yaml | 4 ++-- incubator/magento/values.yaml | 2 +- incubator/mariadb-cluster/Chart.yaml | 2 +- incubator/mariadb-cluster/values.yaml | 2 +- incubator/memcached/Chart.yaml | 2 +- incubator/memcached/values.yaml | 2 +- incubator/moodle/Chart.yaml | 2 +- incubator/moodle/requirements.lock | 6 ++++++ incubator/moodle/values.yaml | 2 +- incubator/odoo/charts/postgresql/Chart.yaml | 2 +- incubator/odoo/charts/postgresql/values.yaml | 2 +- incubator/opencart/Chart.yaml | 2 +- incubator/opencart/requirements.lock | 8 ++++---- incubator/opencart/requirements.yaml | 4 ++-- incubator/opencart/values.yaml | 2 +- incubator/orangehrm/Chart.yaml | 2 +- incubator/orangehrm/requirements.lock | 8 ++++---- incubator/orangehrm/requirements.yaml | 4 ++-- incubator/orangehrm/values.yaml | 2 +- incubator/osclass/Chart.yaml | 2 +- incubator/osclass/requirements.lock | 8 ++++---- incubator/osclass/requirements.yaml | 4 ++-- incubator/osclass/values.yaml | 2 +- incubator/phabricator/Chart.yaml | 2 +- incubator/phabricator/requirements.lock | 8 ++++---- incubator/phabricator/requirements.yaml | 4 ++-- incubator/phabricator/values.yaml | 2 +- incubator/postgresql/Chart.yaml | 2 +- incubator/postgresql/values.yaml | 2 +- incubator/prestashop/Chart.yaml | 2 +- incubator/prestashop/requirements.lock | 8 ++++---- incubator/prestashop/requirements.yaml | 4 ++-- incubator/prestashop/values.yaml | 2 +- incubator/tomcat/Chart.yaml | 2 +- incubator/tomcat/values.yaml | 2 +- incubator/wildfly/Chart.yaml | 2 +- incubator/wildfly/values.yaml | 2 +- 39 files changed, 68 insertions(+), 62 deletions(-) create mode 100644 incubator/moodle/requirements.lock diff --git a/incubator/magento/Chart.yaml b/incubator/magento/Chart.yaml index aa2c02afa..0fabf329b 100644 --- a/incubator/magento/Chart.yaml +++ b/incubator/magento/Chart.yaml @@ -1,5 +1,5 @@ name: magento -version: 0.3.6 +version: 0.3.7 description: A feature-rich flexible e-commerce solution. It includes transaction options, multi-store functionality, loyalty programs, product categorization and shopper filtering, promotion rules, and more. keywords: - magento diff --git a/incubator/magento/requirements.lock b/incubator/magento/requirements.lock index 084010051..7eb30f616 100644 --- a/incubator/magento/requirements.lock +++ b/incubator/magento/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb - repository: http://storage.googleapis.com/kubernetes-charts - version: 0.5.2 -digest: sha256:400ac77ff2337dce024b0225bbfed9f509d77eb6ff6ee10000d59c5f6a367d51 -generated: 2016-10-20T17:55:13.834613554-07:00 + repository: https://kubernetes-charts.storage.googleapis.com/ + version: 0.5.4 +digest: sha256:7388428c9d365911ec0431462cd31a7feb89dd9b8488e387448f598017dea49d +generated: 2016-12-08T15:17:52.50703327+05:30 diff --git a/incubator/magento/requirements.yaml b/incubator/magento/requirements.yaml index 1417e46ef..31911a028 100644 --- a/incubator/magento/requirements.yaml +++ b/incubator/magento/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: mariadb - version: 0.5.2 - repository: http://storage.googleapis.com/kubernetes-charts + version: 0.5.4 + repository: https://kubernetes-charts.storage.googleapis.com/ diff --git a/incubator/magento/values.yaml b/incubator/magento/values.yaml index 9f31b20ac..acbb1cce3 100644 --- a/incubator/magento/values.yaml +++ b/incubator/magento/values.yaml @@ -1,7 +1,7 @@ ## Bitnami Magento image version ## ref: https://hub.docker.com/r/bitnami/magento/tags/ ## -imageTag: 2.1.2-r3 +imageTag: 2.1.2-r6 ## Specify a imagePullPolicy ## Defaults to 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/mariadb-cluster/Chart.yaml b/incubator/mariadb-cluster/Chart.yaml index 3bd299b9f..e5c13c901 100644 --- a/incubator/mariadb-cluster/Chart.yaml +++ b/incubator/mariadb-cluster/Chart.yaml @@ -1,5 +1,5 @@ name: mariadb-cluster -version: 0.3.3 +version: 0.3.4 description: Chart to create a Highly available MariaDB cluster keywords: - mariadb diff --git a/incubator/mariadb-cluster/values.yaml b/incubator/mariadb-cluster/values.yaml index b536c9b52..660768815 100644 --- a/incubator/mariadb-cluster/values.yaml +++ b/incubator/mariadb-cluster/values.yaml @@ -1,7 +1,7 @@ ## Bitnami MariaDB image version ## ref: https://hub.docker.com/r/bitnami/mariadb/tags/ ## -imageTag: 10.1.19-r2 +imageTag: 10.1.19-r3 ## Specify a imagePullPolicy ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/memcached/Chart.yaml b/incubator/memcached/Chart.yaml index d0443574f..340a3244a 100644 --- a/incubator/memcached/Chart.yaml +++ b/incubator/memcached/Chart.yaml @@ -1,5 +1,5 @@ name: memcached -version: 0.3.5 +version: 0.3.6 description: Chart for Memcached keywords: - memcached diff --git a/incubator/memcached/values.yaml b/incubator/memcached/values.yaml index d01593d0e..0d73b61fe 100644 --- a/incubator/memcached/values.yaml +++ b/incubator/memcached/values.yaml @@ -1,7 +1,7 @@ ## Bitnami Memcached image version ## ref: https://hub.docker.com/r/bitnami/mariadb/tags/ ## -imageTag: 1.4.33-r1 +imageTag: 1.4.33-r2 ## Specify a imagePullPolicy ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/moodle/Chart.yaml b/incubator/moodle/Chart.yaml index a617fd082..56cdc867e 100644 --- a/incubator/moodle/Chart.yaml +++ b/incubator/moodle/Chart.yaml @@ -1,5 +1,5 @@ name: moodle -version: 0.1.0 +version: 0.1.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: - moodle diff --git a/incubator/moodle/requirements.lock b/incubator/moodle/requirements.lock new file mode 100644 index 000000000..7eb30f616 --- /dev/null +++ b/incubator/moodle/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: mariadb + repository: https://kubernetes-charts.storage.googleapis.com/ + version: 0.5.4 +digest: sha256:7388428c9d365911ec0431462cd31a7feb89dd9b8488e387448f598017dea49d +generated: 2016-12-08T15:17:52.50703327+05:30 diff --git a/incubator/moodle/values.yaml b/incubator/moodle/values.yaml index 8d5b96a53..9e5e0a24c 100644 --- a/incubator/moodle/values.yaml +++ b/incubator/moodle/values.yaml @@ -1,7 +1,7 @@ ## Bitnami moodle image version ## ref: https://hub.docker.com/r/bitnami/moodle/tags/ ## -image: bitnami/moodle:3.1.3-r1 +image: bitnami/moodle:3.1.3-r3 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/odoo/charts/postgresql/Chart.yaml b/incubator/odoo/charts/postgresql/Chart.yaml index a07148c50..45db7e120 100644 --- a/incubator/odoo/charts/postgresql/Chart.yaml +++ b/incubator/odoo/charts/postgresql/Chart.yaml @@ -1,5 +1,5 @@ name: postgresql -version: 0.3.4 +version: 0.3.5 description: Chart for PostgreSQL keywords: - postgresql diff --git a/incubator/odoo/charts/postgresql/values.yaml b/incubator/odoo/charts/postgresql/values.yaml index 8a9351e75..54ae448c3 100644 --- a/incubator/odoo/charts/postgresql/values.yaml +++ b/incubator/odoo/charts/postgresql/values.yaml @@ -1,7 +1,7 @@ ## Bitnami PostgreSQL image version ## ref: https://hub.docker.com/r/bitnami/postgresql/tags/ ## -imageTag: 9.6.1-r1 +imageTag: 9.6.1-r2 ## Specify a imagePullPolicy ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/opencart/Chart.yaml b/incubator/opencart/Chart.yaml index 0bb6a7789..a819fdec0 100644 --- a/incubator/opencart/Chart.yaml +++ b/incubator/opencart/Chart.yaml @@ -1,5 +1,5 @@ name: opencart -version: 0.3.4 +version: 0.3.5 description: A free and open source e-commerce platform for online merchants. It provides a professional and reliable foundation for a successful online store. keywords: - opencart diff --git a/incubator/opencart/requirements.lock b/incubator/opencart/requirements.lock index 084010051..7eb30f616 100644 --- a/incubator/opencart/requirements.lock +++ b/incubator/opencart/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb - repository: http://storage.googleapis.com/kubernetes-charts - version: 0.5.2 -digest: sha256:400ac77ff2337dce024b0225bbfed9f509d77eb6ff6ee10000d59c5f6a367d51 -generated: 2016-10-20T17:55:13.834613554-07:00 + repository: https://kubernetes-charts.storage.googleapis.com/ + version: 0.5.4 +digest: sha256:7388428c9d365911ec0431462cd31a7feb89dd9b8488e387448f598017dea49d +generated: 2016-12-08T15:17:52.50703327+05:30 diff --git a/incubator/opencart/requirements.yaml b/incubator/opencart/requirements.yaml index 1417e46ef..31911a028 100644 --- a/incubator/opencart/requirements.yaml +++ b/incubator/opencart/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: mariadb - version: 0.5.2 - repository: http://storage.googleapis.com/kubernetes-charts + version: 0.5.4 + repository: https://kubernetes-charts.storage.googleapis.com/ diff --git a/incubator/opencart/values.yaml b/incubator/opencart/values.yaml index ff41a7659..f0e14891a 100644 --- a/incubator/opencart/values.yaml +++ b/incubator/opencart/values.yaml @@ -1,7 +1,7 @@ ## Bitnami OpenCart image version ## ref: https://hub.docker.com/r/bitnami/opencart/tags/ ## -imageTag: 2.3.0.2-r6 +imageTag: 2.3.0.2-r8 ## Specify a imagePullPolicy ## Defaults to 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/orangehrm/Chart.yaml b/incubator/orangehrm/Chart.yaml index 037b23382..ca0fdde03 100644 --- a/incubator/orangehrm/Chart.yaml +++ b/incubator/orangehrm/Chart.yaml @@ -1,5 +1,5 @@ name: orangehrm -version: 0.3.1 +version: 0.3.2 description: OrangeHRM is a free HR management system that offers a wealth of modules to suit the needs of your business. keywords: - orangehrm diff --git a/incubator/orangehrm/requirements.lock b/incubator/orangehrm/requirements.lock index 084010051..7eb30f616 100644 --- a/incubator/orangehrm/requirements.lock +++ b/incubator/orangehrm/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb - repository: http://storage.googleapis.com/kubernetes-charts - version: 0.5.2 -digest: sha256:400ac77ff2337dce024b0225bbfed9f509d77eb6ff6ee10000d59c5f6a367d51 -generated: 2016-10-20T17:55:13.834613554-07:00 + repository: https://kubernetes-charts.storage.googleapis.com/ + version: 0.5.4 +digest: sha256:7388428c9d365911ec0431462cd31a7feb89dd9b8488e387448f598017dea49d +generated: 2016-12-08T15:17:52.50703327+05:30 diff --git a/incubator/orangehrm/requirements.yaml b/incubator/orangehrm/requirements.yaml index 1417e46ef..31911a028 100644 --- a/incubator/orangehrm/requirements.yaml +++ b/incubator/orangehrm/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: mariadb - version: 0.5.2 - repository: http://storage.googleapis.com/kubernetes-charts + version: 0.5.4 + repository: https://kubernetes-charts.storage.googleapis.com/ diff --git a/incubator/orangehrm/values.yaml b/incubator/orangehrm/values.yaml index 507d6e4dc..b9707c817 100644 --- a/incubator/orangehrm/values.yaml +++ b/incubator/orangehrm/values.yaml @@ -1,7 +1,7 @@ ## Bitnami Phabricator image version ## ref: https://hub.docker.com/r/bitnami/orangehrm/tags/ ## -imageTag: 3.3.3-r1 +imageTag: 3.3.3-r3 ## Specify a imagePullPolicy ## Defaults to 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/osclass/Chart.yaml b/incubator/osclass/Chart.yaml index f01959a10..38b196043 100644 --- a/incubator/osclass/Chart.yaml +++ b/incubator/osclass/Chart.yaml @@ -1,5 +1,5 @@ name: osclass -version: 0.3.1 +version: 0.3.2 description: Osclass is a php script that allows you to quickly create and manage your own free classifieds site. keywords: - osclass diff --git a/incubator/osclass/requirements.lock b/incubator/osclass/requirements.lock index 084010051..7eb30f616 100644 --- a/incubator/osclass/requirements.lock +++ b/incubator/osclass/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb - repository: http://storage.googleapis.com/kubernetes-charts - version: 0.5.2 -digest: sha256:400ac77ff2337dce024b0225bbfed9f509d77eb6ff6ee10000d59c5f6a367d51 -generated: 2016-10-20T17:55:13.834613554-07:00 + repository: https://kubernetes-charts.storage.googleapis.com/ + version: 0.5.4 +digest: sha256:7388428c9d365911ec0431462cd31a7feb89dd9b8488e387448f598017dea49d +generated: 2016-12-08T15:17:52.50703327+05:30 diff --git a/incubator/osclass/requirements.yaml b/incubator/osclass/requirements.yaml index 1417e46ef..31911a028 100644 --- a/incubator/osclass/requirements.yaml +++ b/incubator/osclass/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: mariadb - version: 0.5.2 - repository: http://storage.googleapis.com/kubernetes-charts + version: 0.5.4 + repository: https://kubernetes-charts.storage.googleapis.com/ diff --git a/incubator/osclass/values.yaml b/incubator/osclass/values.yaml index 3b5a72aaa..1fd913394 100644 --- a/incubator/osclass/values.yaml +++ b/incubator/osclass/values.yaml @@ -1,7 +1,7 @@ ## Bitnami Osclass image version ## ref: https://hub.docker.com/r/bitnami/osclass/tags/ ## -imageTag: 3.6.1-r0 +imageTag: 3.6.1-r2 ## Specify a imagePullPolicy ## Defaults to 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/phabricator/Chart.yaml b/incubator/phabricator/Chart.yaml index bfa0a3c65..5f5f2c477 100644 --- a/incubator/phabricator/Chart.yaml +++ b/incubator/phabricator/Chart.yaml @@ -1,5 +1,5 @@ name: phabricator -version: 0.3.6 +version: 0.3.7 description: Collection of open source web applications that help software companies build better software. keywords: - phabricator diff --git a/incubator/phabricator/requirements.lock b/incubator/phabricator/requirements.lock index 084010051..7eb30f616 100644 --- a/incubator/phabricator/requirements.lock +++ b/incubator/phabricator/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb - repository: http://storage.googleapis.com/kubernetes-charts - version: 0.5.2 -digest: sha256:400ac77ff2337dce024b0225bbfed9f509d77eb6ff6ee10000d59c5f6a367d51 -generated: 2016-10-20T17:55:13.834613554-07:00 + repository: https://kubernetes-charts.storage.googleapis.com/ + version: 0.5.4 +digest: sha256:7388428c9d365911ec0431462cd31a7feb89dd9b8488e387448f598017dea49d +generated: 2016-12-08T15:17:52.50703327+05:30 diff --git a/incubator/phabricator/requirements.yaml b/incubator/phabricator/requirements.yaml index 1417e46ef..31911a028 100644 --- a/incubator/phabricator/requirements.yaml +++ b/incubator/phabricator/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: mariadb - version: 0.5.2 - repository: http://storage.googleapis.com/kubernetes-charts + version: 0.5.4 + repository: https://kubernetes-charts.storage.googleapis.com/ diff --git a/incubator/phabricator/values.yaml b/incubator/phabricator/values.yaml index c42f4020e..20b8db56f 100644 --- a/incubator/phabricator/values.yaml +++ b/incubator/phabricator/values.yaml @@ -1,7 +1,7 @@ ## Bitnami Phabricator image version ## ref: https://hub.docker.com/r/bitnami/phabricator/tags/ ## -imageTag: 2016.46-r0 +imageTag: 2016.46-r2 ## Specify a imagePullPolicy ## Defaults to 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/postgresql/Chart.yaml b/incubator/postgresql/Chart.yaml index a07148c50..45db7e120 100644 --- a/incubator/postgresql/Chart.yaml +++ b/incubator/postgresql/Chart.yaml @@ -1,5 +1,5 @@ name: postgresql -version: 0.3.4 +version: 0.3.5 description: Chart for PostgreSQL keywords: - postgresql diff --git a/incubator/postgresql/values.yaml b/incubator/postgresql/values.yaml index 8a9351e75..54ae448c3 100644 --- a/incubator/postgresql/values.yaml +++ b/incubator/postgresql/values.yaml @@ -1,7 +1,7 @@ ## Bitnami PostgreSQL image version ## ref: https://hub.docker.com/r/bitnami/postgresql/tags/ ## -imageTag: 9.6.1-r1 +imageTag: 9.6.1-r2 ## Specify a imagePullPolicy ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/prestashop/Chart.yaml b/incubator/prestashop/Chart.yaml index 7f4801ad0..af6b4a5a3 100644 --- a/incubator/prestashop/Chart.yaml +++ b/incubator/prestashop/Chart.yaml @@ -1,5 +1,5 @@ name: prestashop -version: 0.3.5 +version: 0.3.6 description: A popular open source ecommerce solution. Professional tools are easily accessible to increase online sales including instant guest checkout, abandoned cart reminders and automated Email marketing. keywords: - prestashop diff --git a/incubator/prestashop/requirements.lock b/incubator/prestashop/requirements.lock index 084010051..7eb30f616 100644 --- a/incubator/prestashop/requirements.lock +++ b/incubator/prestashop/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb - repository: http://storage.googleapis.com/kubernetes-charts - version: 0.5.2 -digest: sha256:400ac77ff2337dce024b0225bbfed9f509d77eb6ff6ee10000d59c5f6a367d51 -generated: 2016-10-20T17:55:13.834613554-07:00 + repository: https://kubernetes-charts.storage.googleapis.com/ + version: 0.5.4 +digest: sha256:7388428c9d365911ec0431462cd31a7feb89dd9b8488e387448f598017dea49d +generated: 2016-12-08T15:17:52.50703327+05:30 diff --git a/incubator/prestashop/requirements.yaml b/incubator/prestashop/requirements.yaml index 1417e46ef..31911a028 100644 --- a/incubator/prestashop/requirements.yaml +++ b/incubator/prestashop/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: mariadb - version: 0.5.2 - repository: http://storage.googleapis.com/kubernetes-charts + version: 0.5.4 + repository: https://kubernetes-charts.storage.googleapis.com/ diff --git a/incubator/prestashop/values.yaml b/incubator/prestashop/values.yaml index 418de24f0..07fa2f937 100644 --- a/incubator/prestashop/values.yaml +++ b/incubator/prestashop/values.yaml @@ -1,7 +1,7 @@ ## Bitnami PrestaShop image version ## ref: https://hub.docker.com/r/bitnami/prestashop/tags/ ## -imageTag: 1.6.1.9-r0 +imageTag: 1.6.1.9-r2 ## Specify a imagePullPolicy ## Defaults to 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/tomcat/Chart.yaml b/incubator/tomcat/Chart.yaml index bc5a5735a..5565aca40 100644 --- a/incubator/tomcat/Chart.yaml +++ b/incubator/tomcat/Chart.yaml @@ -1,5 +1,5 @@ name: tomcat -version: 0.3.4 +version: 0.3.5 description: Chart for Apache Tomcat keywords: - tomcat diff --git a/incubator/tomcat/values.yaml b/incubator/tomcat/values.yaml index 540a1a4aa..678134ca8 100644 --- a/incubator/tomcat/values.yaml +++ b/incubator/tomcat/values.yaml @@ -1,7 +1,7 @@ ## Bitnami Tomcat image version ## ref: https://hub.docker.com/r/bitnami/tomcat/tags/ ## -imageTag: 8.0.38-r1 +imageTag: 8.0.39-r3 ## Specify a imagePullPolicy ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/wildfly/Chart.yaml b/incubator/wildfly/Chart.yaml index c89cb174a..8a10bc236 100644 --- a/incubator/wildfly/Chart.yaml +++ b/incubator/wildfly/Chart.yaml @@ -1,5 +1,5 @@ name: wildfly -version: 0.3.4 +version: 0.3.5 description: Chart for Wildfly keywords: - wildfly diff --git a/incubator/wildfly/values.yaml b/incubator/wildfly/values.yaml index d48f92832..0ea746b02 100644 --- a/incubator/wildfly/values.yaml +++ b/incubator/wildfly/values.yaml @@ -1,7 +1,7 @@ ## Bitnami Wildfly image version ## ref: https://hub.docker.com/r/bitnami/wildfly/tags/ ## -imageTag: 10.1.0-r1 +imageTag: 10.1.0-r2 ## Specify a imagePullPolicy ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent' From 4bea8db51f36ca855792c7aab5d60806af041655 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Fri, 9 Dec 2016 12:58:25 +0100 Subject: [PATCH 20/36] updated description --- incubator/dokuwiki/Chart.yaml | 2 +- incubator/dokuwiki/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/incubator/dokuwiki/Chart.yaml b/incubator/dokuwiki/Chart.yaml index 05808a5af..2e39dbeef 100644 --- a/incubator/dokuwiki/Chart.yaml +++ b/incubator/dokuwiki/Chart.yaml @@ -1,6 +1,6 @@ name: dokuwiki version: 0.1.0 -description: DokuWiki is a simple to use and highly versatile Open Source wiki software that doesn't require a database. It is loved by users for its clean and readable syntax. +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/incubator/dokuwiki/README.md b/incubator/dokuwiki/README.md index 7940bb4f9..a18151842 100644 --- a/incubator/dokuwiki/README.md +++ b/incubator/dokuwiki/README.md @@ -1,6 +1,6 @@ # DokuWiki -[DokuWiki](https://www.dokuwiki.org) DokuWiki is a learning platform designed to provide educators, administrators and learners with a single robust, secure and integrated system to create personalised learning environments +[DokuWiki](https://www.dokuwiki.org) 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. ## TL;DR; From 789119d3e313e8dfc728febebd5a6be7674173e8 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Fri, 9 Dec 2016 13:01:49 +0100 Subject: [PATCH 21/36] fix Readme --- incubator/dokuwiki/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubator/dokuwiki/README.md b/incubator/dokuwiki/README.md index a18151842..2084d54dd 100644 --- a/incubator/dokuwiki/README.md +++ b/incubator/dokuwiki/README.md @@ -73,7 +73,7 @@ $ helm install --name my-release \ stable/dokuwiki ``` -The above command sets the DokuWiki administrator account username and password to `admin` and `password` respectively. Additionally it sets the MariaDB `root` user password to `secretpassword`. +The above command sets the DokuWiki administrator account username and password to `admin` and `password` respectively. Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, From 8c14e129332ab005dbfd5cae00e43d788b8325a8 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Fri, 9 Dec 2016 13:34:23 +0100 Subject: [PATCH 22/36] initial chart version --- incubator/mysql/Chart.yaml | 3 ++- incubator/mysql/README.md | 15 ++++++------ incubator/mysql/templates/NOTES.txt | 2 +- incubator/mysql/templates/config-pvc.yaml | 14 ----------- incubator/mysql/templates/deployment.yaml | 24 +++++++++---------- .../templates/{data-pvc.yaml => pvc.yaml} | 2 +- incubator/mysql/values.yaml | 2 +- 7 files changed, 24 insertions(+), 38 deletions(-) delete mode 100644 incubator/mysql/templates/config-pvc.yaml rename incubator/mysql/templates/{data-pvc.yaml => pvc.yaml} (89%) diff --git a/incubator/mysql/Chart.yaml b/incubator/mysql/Chart.yaml index 035a7fb23..e6d2f34ef 100644 --- a/incubator/mysql/Chart.yaml +++ b/incubator/mysql/Chart.yaml @@ -1,6 +1,6 @@ name: mysql version: 0.1.0 -description: Chart for MySQL +description: MySQL is a fast, reliable, scalable, and easy to use open-source relational database system. MySQL Server is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software. keywords: - mysql - database @@ -12,3 +12,4 @@ maintainers: - name: Bitnami email: containers@bitnami.com engine: gotpl +icon: https://d33np9n32j53g7.cloudfront.net/assets/stacks/mysql/img/mysql-stack-220x234-9b0b145795a63819818570807023d401.png diff --git a/incubator/mysql/README.md b/incubator/mysql/README.md index 811692389..3b6d6326c 100644 --- a/incubator/mysql/README.md +++ b/incubator/mysql/README.md @@ -1,8 +1,7 @@ # MySQL -[MySQL](https://mysql.com ) +[MySQL](https://mysql.com ) MySQL is a fast, reliable, scalable, and easy to use open-source relational database system. MySQL Server is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software. -MySQL is developed as open ## TL;DR; @@ -46,13 +45,13 @@ The command removes all the Kubernetes components associated with the chart and The following tables lists the configurable parameters of the MySQL chart and their default values. | Parameter | Description | Default | -| ----------------------- | ---------------------------------- | ---------------------------------------------------------- | -| `image` | MySQL image | `bitnami/mysql:{VERSION}` | +| -------------------------- | ------------------------------------------ | ---------------------------------------------------------- | +| `image` | MySQL image | `bitnami/mysql:{VERSION}` | | `imagePullPolicy` | Image pull policy. | `Always` if `imageTag` is `latest`, else `IfNotPresent`. | -| `mysqlRootPassword` | Password for the `root` user. | `nil` | -| `mysqlUser` | Username of new user to create. | `nil` | -| `mysqlPassword` | Password for the new user. | `nil` | -| `mysqlDatabase` | Name for new database to create. | `nil` | +| `mysqlRootPassword` | Password for the `root` user. | `nil` | +| `mysqlUser` | Username of new user to create. | `nil` | +| `mysqlPassword` | Password for the new user. | `nil` | +| `mysqlDatabase` | Name for new database to create. | `nil` | | `persistence.enabled` | Use a PVC to persist data | `true` | | `persistence.storageClass` | Storage class of backing PVC | `generic` | | `persistence.accessMode` | Use volume as ReadOnly or ReadWrite | `ReadWriteOnce` | diff --git a/incubator/mysql/templates/NOTES.txt b/incubator/mysql/templates/NOTES.txt index 250eea51e..678880f39 100644 --- a/incubator/mysql/templates/NOTES.txt +++ b/incubator/mysql/templates/NOTES.txt @@ -1,4 +1,4 @@ -MariaDB can be accessed via port 3306 on the following DNS name from within your cluster: +MySQL can be accessed via port 3306 on the following DNS name from within your cluster: {{ template "fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local To connect to your database run the following command: diff --git a/incubator/mysql/templates/config-pvc.yaml b/incubator/mysql/templates/config-pvc.yaml deleted file mode 100644 index aabbab076..000000000 --- a/incubator/mysql/templates/config-pvc.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if .Values.persistence.enabled }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "fullname" . }}-config - annotations: - volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }} -spec: - accessModes: - - {{ .Values.persistence.accessMode | quote }} - resources: - requests: - storage: {{ .Values.persistence.size | quote }} -{{- end }} diff --git a/incubator/mysql/templates/deployment.yaml b/incubator/mysql/templates/deployment.yaml index 1fbfd0ea4..b9eaf2da6 100644 --- a/incubator/mysql/templates/deployment.yaml +++ b/incubator/mysql/templates/deployment.yaml @@ -18,15 +18,15 @@ spec: { "name": "copy-custom-config", "image": "{{ .Values.image }}", - "command": ["sh", "-c", "mkdir -p /bitnami/mariadb/conf && cp -n /bitnami/mariadb_config/my.cnf /bitnami/mariadb/conf/my_custom.cnf"], + "command": ["sh", "-c", "mkdir -p /bitnami/mysql/conf && cp -n /bitnami/mysql_config/my.cnf /bitnami/mysql/conf/my_custom.cnf"], "volumeMounts": [ { "name": "config", - "mountPath": "/bitnami/mariadb_config" + "mountPath": "/bitnami/mysql_config" }, { "name": "data", - "mountPath": "/bitnami/mariadb" + "mountPath": "/bitnami/mysql" } ] } @@ -37,20 +37,20 @@ spec: image: "{{ .Values.image }}" imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }} env: - - name: MARIADB_ROOT_PASSWORD + - name: MYSQL_ROOT_PASSWORD valueFrom: secretKeyRef: name: {{ template "fullname" . }} - key: mariadb-root-password - - name: MARIADB_USER - value: {{ default "" .Values.mariadbUser | quote }} - - name: MARIADB_PASSWORD + key: mysql-root-password + - name: MYSQL_USER + value: {{ default "" .Values.mysqlUser | quote }} + - name: MYSQL_PASSWORD valueFrom: secretKeyRef: name: {{ template "fullname" . }} - key: mariadb-password - - name: MARIADB_DATABASE - value: {{ default "" .Values.mariadbDatabase | quote }} + key: mysql-password + - name: MYSQL_DATABASE + value: {{ default "" .Values.mysqlDatabase | quote }} ports: - name: mysql containerPort: 3306 @@ -72,7 +72,7 @@ spec: {{ toYaml .Values.resources | indent 10 }} volumeMounts: - name: data - mountPath: /bitnami/mariadb + mountPath: /bitnami/mysql volumes: - name: config configMap: diff --git a/incubator/mysql/templates/data-pvc.yaml b/incubator/mysql/templates/pvc.yaml similarity index 89% rename from incubator/mysql/templates/data-pvc.yaml rename to incubator/mysql/templates/pvc.yaml index 47cba782f..db19bb97d 100644 --- a/incubator/mysql/templates/data-pvc.yaml +++ b/incubator/mysql/templates/pvc.yaml @@ -2,7 +2,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: {{ template "fullname" . }}-data + name: {{ template "fullname" . }} annotations: volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }} spec: diff --git a/incubator/mysql/values.yaml b/incubator/mysql/values.yaml index 57de4cb97..e2db3f7b7 100644 --- a/incubator/mysql/values.yaml +++ b/incubator/mysql/values.yaml @@ -2,7 +2,7 @@ ## ref: https://hub.docker.com/r/bitnami/mysql/tags/ ## ## Default: none -image: bitnami/mysql:5.7.16-r2 +image: bitnami/mysql:5.7.16-r4 ## Specify a imagePullPolicy ## Default to 'Always' if imageTag is 'latest', else set to 'IfNotPresent' From db780dbedaa126d0f67a511ea10f9626c8940d76 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Fri, 9 Dec 2016 13:38:42 +0100 Subject: [PATCH 23/36] Revert "test mysql2" This reverts commit acfa8b60d944bf7f25b3eca33977d2df914c3d17. --- incubator/mysql2/.helmignore | 1 - incubator/mysql2/Chart.yaml | 14 --- incubator/mysql2/README.md | 109 --------------------- incubator/mysql2/templates/NOTES.txt | 6 -- incubator/mysql2/templates/_helpers.tpl | 16 --- incubator/mysql2/templates/configmap.yaml | 14 --- incubator/mysql2/templates/deployment.yaml | 68 ------------- incubator/mysql2/templates/pvc.yaml | 14 --- incubator/mysql2/templates/secrets.yaml | 13 --- incubator/mysql2/templates/svc.yaml | 16 --- incubator/mysql2/values.yaml | 51 ---------- 11 files changed, 322 deletions(-) delete mode 100644 incubator/mysql2/.helmignore delete mode 100644 incubator/mysql2/Chart.yaml delete mode 100644 incubator/mysql2/README.md delete mode 100644 incubator/mysql2/templates/NOTES.txt delete mode 100644 incubator/mysql2/templates/_helpers.tpl delete mode 100644 incubator/mysql2/templates/configmap.yaml delete mode 100644 incubator/mysql2/templates/deployment.yaml delete mode 100644 incubator/mysql2/templates/pvc.yaml delete mode 100644 incubator/mysql2/templates/secrets.yaml delete mode 100644 incubator/mysql2/templates/svc.yaml delete mode 100644 incubator/mysql2/values.yaml diff --git a/incubator/mysql2/.helmignore b/incubator/mysql2/.helmignore deleted file mode 100644 index 6b8710a71..000000000 --- a/incubator/mysql2/.helmignore +++ /dev/null @@ -1 +0,0 @@ -.git diff --git a/incubator/mysql2/Chart.yaml b/incubator/mysql2/Chart.yaml deleted file mode 100644 index f3b8e861e..000000000 --- a/incubator/mysql2/Chart.yaml +++ /dev/null @@ -1,14 +0,0 @@ -name: mysql2 -version: 0.1.0 -description: Chart for MySQL -keywords: -- mysql -- database -- sql -home: https://mysql.com -sources: -- https://github.com/bitnami/bitnami-docker-mysql -maintainers: -- name: Bitnami - email: containers@bitnami.com -engine: gotpl diff --git a/incubator/mysql2/README.md b/incubator/mysql2/README.md deleted file mode 100644 index 4be5deaa2..000000000 --- a/incubator/mysql2/README.md +++ /dev/null @@ -1,109 +0,0 @@ -# MySQL - -[MySQL](https://mysql.org) is one of the most popular database servers in the world. It’s made by the original developers of MySQL and guaranteed to stay open source. Notable users include Wikipedia, Facebook and Google. - -MySQL is developed as open source software and as a relational database it provides an SQL interface for accessing data. The latest versions of MySQL also include GIS and JSON features. - -## TL;DR; - -```bash -$ helm install stable/mysql -``` - -## Introduction - -This chart bootstraps a [MySQL](https://github.com/bitnami/bitnami-docker-mysql) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. - -## Prerequisites - -- Kubernetes 1.4+ with Beta APIs enabled -- PV provisioner support in the underlying infrastructure - -## Installing the Chart - -To install the chart with the release name `my-release`: - -```bash -$ helm install --name my-release stable/mysql -``` - -The command deploys MySQL on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. - -> **Tip**: List all releases using `helm list` - -## Uninstalling the Chart - -To uninstall/delete the `my-release` deployment: - -```bash -$ helm delete my-release -``` - -The command removes all the Kubernetes components associated with the chart and deletes the release. - -## Configuration - -The following tables lists the configurable parameters of the MySQL chart and their default values. - -| Parameter | Description | Default | -| ----------------------- | ---------------------------------- | ---------------------------------------------------------- | -| `image` | MySQL image | `bitnami/mysql:{VERSION}` | -| `imagePullPolicy` | Image pull policy. | `Always` if `imageTag` is `latest`, else `IfNotPresent`. | -| `mysqlRootPassword` | Password for the `root` user. | `nil` | -| `mysqlUser` | Username of new user to create. | `nil` | -| `mysqlPassword` | Password for the new user. | `nil` | -| `mysqlDatabase` | Name for new database to create. | `nil` | -| `persistence.enabled` | Use a PVC to persist data | `true` | -| `persistence.storageClass` | Storage class of backing PVC | `generic` | -| `persistence.accessMode` | Use volume as ReadOnly or ReadWrite | `ReadWriteOnce` | -| `persistence.size` | Size of data volume | `8Gi` | -| `resources` | CPU/Memory resource requests/limits | Memory: `256Mi`, CPU: `250m` | -| `config` | Multi-line string for my.cnf configuration | `nil` | - -The above parameters map to the env variables defined in [bitnami/mysql](http://github.com/bitnami/bitnami-docker-mysql). For more information please refer to the [bitnami/mysql](http://github.com/bitnami/bitnami-docker-mysql) image documentation. - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, - -```bash -$ helm install --name my-release \ - --set mysqlRootPassword=secretpassword,mysqlUser=my-user,mysqlPassword=my-password,mysqlDatabase=my-database \ - stable/mysql -``` - -The above command sets the MySQL `root` account password to `secretpassword`. Additionally it creates a standard database user named `my-user`, with the password `my-password`, who has access to a database named `my-database`. - -Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, - -```bash -$ helm install --name my-release -f values.yaml stable/mysql -``` - -> **Tip**: You can use the default [values.yaml](values.yaml) - -### Custom my.cnf configuration - -The Bitnami MySQL image allows you to provide a custom `my.cnf` file for configuring MySQL. -This Chart uses the `config` value to mount a custom `my.cnf` using a [ConfigMap](http://kubernetes.io/docs/user-guide/configmap/). -You can configure this by creating a YAML file that defines the `config` property as a multi-line string in the format of a `my.cnf` file. -For example: - -```bash -cat > mysql-values.yaml < Date: Fri, 9 Dec 2016 21:57:04 +0530 Subject: [PATCH 24/36] update chart image version and bump chart version --- incubator/apache/Chart.yaml | 2 +- incubator/apache/values.yaml | 2 +- incubator/mariadb-cluster/Chart.yaml | 2 +- incubator/mariadb-cluster/values.yaml | 2 +- incubator/memcached/Chart.yaml | 2 +- incubator/memcached/values.yaml | 2 +- incubator/nginx/Chart.yaml | 2 +- incubator/nginx/values.yaml | 2 +- incubator/odoo/charts/postgresql/Chart.yaml | 2 +- incubator/odoo/charts/postgresql/values.yaml | 2 +- incubator/postgresql/Chart.yaml | 2 +- incubator/postgresql/values.yaml | 2 +- incubator/wildfly/Chart.yaml | 2 +- incubator/wildfly/values.yaml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/incubator/apache/Chart.yaml b/incubator/apache/Chart.yaml index 77eb0a76e..226b3f2e8 100644 --- a/incubator/apache/Chart.yaml +++ b/incubator/apache/Chart.yaml @@ -1,5 +1,5 @@ name: apache -version: 0.3.5 +version: 0.3.6 description: Chart for Apache HTTP Server keywords: - apache diff --git a/incubator/apache/values.yaml b/incubator/apache/values.yaml index f3208f357..26f2b9d53 100644 --- a/incubator/apache/values.yaml +++ b/incubator/apache/values.yaml @@ -1,7 +1,7 @@ ## Bitnami Apache image version ## ref: https://hub.docker.com/r/bitnami/apache/tags/ ## -imageTag: 2.4.23-r10 +imageTag: 2.4.23-r12 ## Specify a imagePullPolicy ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/mariadb-cluster/Chart.yaml b/incubator/mariadb-cluster/Chart.yaml index e5c13c901..249c458a2 100644 --- a/incubator/mariadb-cluster/Chart.yaml +++ b/incubator/mariadb-cluster/Chart.yaml @@ -1,5 +1,5 @@ name: mariadb-cluster -version: 0.3.4 +version: 0.3.5 description: Chart to create a Highly available MariaDB cluster keywords: - mariadb diff --git a/incubator/mariadb-cluster/values.yaml b/incubator/mariadb-cluster/values.yaml index 660768815..8e10cd492 100644 --- a/incubator/mariadb-cluster/values.yaml +++ b/incubator/mariadb-cluster/values.yaml @@ -1,7 +1,7 @@ ## Bitnami MariaDB image version ## ref: https://hub.docker.com/r/bitnami/mariadb/tags/ ## -imageTag: 10.1.19-r3 +imageTag: 10.1.19-r4 ## Specify a imagePullPolicy ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/memcached/Chart.yaml b/incubator/memcached/Chart.yaml index 340a3244a..f9171e06d 100644 --- a/incubator/memcached/Chart.yaml +++ b/incubator/memcached/Chart.yaml @@ -1,5 +1,5 @@ name: memcached -version: 0.3.6 +version: 0.3.7 description: Chart for Memcached keywords: - memcached diff --git a/incubator/memcached/values.yaml b/incubator/memcached/values.yaml index 0d73b61fe..c897c2d71 100644 --- a/incubator/memcached/values.yaml +++ b/incubator/memcached/values.yaml @@ -1,7 +1,7 @@ ## Bitnami Memcached image version ## ref: https://hub.docker.com/r/bitnami/mariadb/tags/ ## -imageTag: 1.4.33-r2 +imageTag: 1.4.33-r3 ## Specify a imagePullPolicy ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/nginx/Chart.yaml b/incubator/nginx/Chart.yaml index 64098f724..d98a68f7a 100644 --- a/incubator/nginx/Chart.yaml +++ b/incubator/nginx/Chart.yaml @@ -1,5 +1,5 @@ name: nginx -version: 0.3.2 +version: 0.3.3 description: Chart for the nginx server keywords: - nginx diff --git a/incubator/nginx/values.yaml b/incubator/nginx/values.yaml index afdf80448..a894ab506 100644 --- a/incubator/nginx/values.yaml +++ b/incubator/nginx/values.yaml @@ -1,7 +1,7 @@ ## Bitnami NGINX image version ## ref: https://hub.docker.com/r/bitnami/nginx/tags/ ## -imageTag: 1.10.2-r1 +imageTag: 1.10.2-r3 ## Specify a imagePullPolicy ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/odoo/charts/postgresql/Chart.yaml b/incubator/odoo/charts/postgresql/Chart.yaml index 45db7e120..03a133b68 100644 --- a/incubator/odoo/charts/postgresql/Chart.yaml +++ b/incubator/odoo/charts/postgresql/Chart.yaml @@ -1,5 +1,5 @@ name: postgresql -version: 0.3.5 +version: 0.3.6 description: Chart for PostgreSQL keywords: - postgresql diff --git a/incubator/odoo/charts/postgresql/values.yaml b/incubator/odoo/charts/postgresql/values.yaml index 54ae448c3..dc78b4c87 100644 --- a/incubator/odoo/charts/postgresql/values.yaml +++ b/incubator/odoo/charts/postgresql/values.yaml @@ -1,7 +1,7 @@ ## Bitnami PostgreSQL image version ## ref: https://hub.docker.com/r/bitnami/postgresql/tags/ ## -imageTag: 9.6.1-r2 +imageTag: 9.6.1-r3 ## Specify a imagePullPolicy ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/postgresql/Chart.yaml b/incubator/postgresql/Chart.yaml index 45db7e120..03a133b68 100644 --- a/incubator/postgresql/Chart.yaml +++ b/incubator/postgresql/Chart.yaml @@ -1,5 +1,5 @@ name: postgresql -version: 0.3.5 +version: 0.3.6 description: Chart for PostgreSQL keywords: - postgresql diff --git a/incubator/postgresql/values.yaml b/incubator/postgresql/values.yaml index 54ae448c3..dc78b4c87 100644 --- a/incubator/postgresql/values.yaml +++ b/incubator/postgresql/values.yaml @@ -1,7 +1,7 @@ ## Bitnami PostgreSQL image version ## ref: https://hub.docker.com/r/bitnami/postgresql/tags/ ## -imageTag: 9.6.1-r2 +imageTag: 9.6.1-r3 ## Specify a imagePullPolicy ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent' diff --git a/incubator/wildfly/Chart.yaml b/incubator/wildfly/Chart.yaml index 8a10bc236..2c6a569f7 100644 --- a/incubator/wildfly/Chart.yaml +++ b/incubator/wildfly/Chart.yaml @@ -1,5 +1,5 @@ name: wildfly -version: 0.3.5 +version: 0.3.6 description: Chart for Wildfly keywords: - wildfly diff --git a/incubator/wildfly/values.yaml b/incubator/wildfly/values.yaml index 0ea746b02..38cf054cf 100644 --- a/incubator/wildfly/values.yaml +++ b/incubator/wildfly/values.yaml @@ -1,7 +1,7 @@ ## Bitnami Wildfly image version ## ref: https://hub.docker.com/r/bitnami/wildfly/tags/ ## -imageTag: 10.1.0-r2 +imageTag: 10.1.0-r3 ## Specify a imagePullPolicy ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent' From 0f173e8b89701ad5cb7b9e464a91690412a73038 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Fri, 9 Dec 2016 18:36:39 +0100 Subject: [PATCH 25/36] added README.md entry --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 718e39a46..ba8d65776 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ Popular applications, provided by [Bitnami](https://bitnami.com), ready to launc - [MariaDB Cluster (incubator)](https://github.com/bitnami/charts/tree/master/incubator/mariadb-cluster) - [JasperReports Server (incubator)](https://github.com/bitnami/charts/tree/master/incubator/jasperserver) - [Moodle (incubator)](https://github.com/bitnami/charts/tree/master/incubator/moodle) +- [MySQL (incubator)](https://github.com/bitnami/charts/tree/master/incubator/mysql) ## Before you begin From b2150e591c346992b6170b48412c7ffd7677d290 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Fri, 9 Dec 2016 18:37:38 +0100 Subject: [PATCH 26/36] added README.md entry --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 718e39a46..e09e38978 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ Popular applications, provided by [Bitnami](https://bitnami.com), ready to launc - [MariaDB Cluster (incubator)](https://github.com/bitnami/charts/tree/master/incubator/mariadb-cluster) - [JasperReports Server (incubator)](https://github.com/bitnami/charts/tree/master/incubator/jasperserver) - [Moodle (incubator)](https://github.com/bitnami/charts/tree/master/incubator/moodle) +- [Dokuwiki (incubator)](https://github.com/bitnami/charts/tree/master/incubator/dokuwiki) ## Before you begin From 5627891f6979190294b352c4820ffc3d7fb2619b Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Mon, 12 Dec 2016 10:29:58 +0100 Subject: [PATCH 27/36] added labels to PVC and fix configmap without default values --- incubator/mysql/templates/configmap.yaml | 2 +- incubator/mysql/templates/pvc.yaml | 5 +++++ incubator/mysql/values.yaml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/incubator/mysql/templates/configmap.yaml b/incubator/mysql/templates/configmap.yaml index 5dd9bf5fc..2c6b8c823 100644 --- a/incubator/mysql/templates/configmap.yaml +++ b/incubator/mysql/templates/configmap.yaml @@ -10,5 +10,5 @@ metadata: data: my.cnf: |- {{- if .Values.config }} -{{ .Values.config | indent 4 }} +{{ default "" .Values.config | indent 4 }} {{- end -}} diff --git a/incubator/mysql/templates/pvc.yaml b/incubator/mysql/templates/pvc.yaml index db19bb97d..ce71ca3eb 100644 --- a/incubator/mysql/templates/pvc.yaml +++ b/incubator/mysql/templates/pvc.yaml @@ -3,6 +3,11 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: {{ template "fullname" . }} + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" annotations: volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }} spec: diff --git a/incubator/mysql/values.yaml b/incubator/mysql/values.yaml index e2db3f7b7..cd7c74e3f 100644 --- a/incubator/mysql/values.yaml +++ b/incubator/mysql/values.yaml @@ -38,7 +38,7 @@ persistence: ## Configure MySQL with a custom my.cnf file ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file ## -config: |- +#config: |- # [mysqld] # innodb_buffer_pool_size=2G From 6c468bba678c9464c2dcb9ea2133d342294b2974 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Mon, 12 Dec 2016 10:57:31 +0100 Subject: [PATCH 28/36] updated PR --- incubator/dokuwiki/README.md | 8 ++++---- incubator/dokuwiki/templates/NOTES.txt | 4 ++-- incubator/dokuwiki/templates/_helpers.tpl | 7 ------- incubator/dokuwiki/templates/deployment.yaml | 14 +++++++------- incubator/dokuwiki/templates/secrets.yaml | 2 +- incubator/dokuwiki/values.yaml | 20 ++++++++++---------- 6 files changed, 24 insertions(+), 31 deletions(-) diff --git a/incubator/dokuwiki/README.md b/incubator/dokuwiki/README.md index 2084d54dd..9be5cacc5 100644 --- a/incubator/dokuwiki/README.md +++ b/incubator/dokuwiki/README.md @@ -48,11 +48,11 @@ The following tables lists the configurable parameters of the DokuWiki chart and |--------------------------------------|------------------------------------------|---------------------------------------------------------| | `image` | DokuWiki image | `bitnami/dokuwiki:{VERSION}` | | `imagePullPolicy` | Image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | -| `dokuwikiUsername` | User of the application | `superuser` | -| `dokuwikiFullname` | User's full name | `Full Name` | +| `dokuwikiUsername` | User of the application | `user` | +| `dokuwikiFullName` | User's full name | `Full Name` | | `dokuwikiPassword` | Application password | _random 10 character alphanumeric string_ | | `dokuwikiEmail` | User email | `user@example.com` | -| `dokuwikiWikiname` | Wiki name | `Bitnami DokuWiki` | +| `dokuwikiWikiName` | Wiki name | `My Wiki` | | `serviceType` | Kubernetes Service type | `LoadBalancer` | | `persistence.enabled` | Enable persistence using PVC | `true` | | `persistence.apache.storageClass` | PVC Storage Class for apache volume | `generic` | @@ -85,7 +85,7 @@ $ helm install --name my-release -f values.yaml stable/dokuwiki ## Persistence -The [Bitnami DokuWiki](https://github.com/bitnami/bitnami-docker-dokuwiki) image stores the DokuWiki data and configurations at the `/bitnami/dokuwiki` and `/bitnami/apache` paths of the container. +The [Bitnami DokuWiki](https://github.com/bitnami/bitnami-docker-dokuwiki) image stores the DokuWiki data and configurations at the `/bitnami/dokuwiki` and `/bitnami/apache` paths of the container. Persistent Volume Claims are used to keep the data across deployments. This is known to work in GCE, AWS, and minikube. See the [Configuration](#configuration) section to configure the PVC or to disable persistence. diff --git a/incubator/dokuwiki/templates/NOTES.txt b/incubator/dokuwiki/templates/NOTES.txt index 206654a29..7fa32a072 100644 --- a/incubator/dokuwiki/templates/NOTES.txt +++ b/incubator/dokuwiki/templates/NOTES.txt @@ -1,5 +1,5 @@ -1. Get the dokuwiki URL by running: +1. Get the DokuWiki URL by running: {{- if contains "NodePort" .Values.serviceType }} @@ -21,7 +21,7 @@ kubectl port-forward $POD_NAME 8080:80 {{- end }} -2. Get your dokuwiki login credentials by running: +2. Get your DokuWiki login credentials by running: echo Username: {{ .Values.dokuwikiUsername }} echo Password: $(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.dokuwiki-password[*]}"`)) diff --git a/incubator/dokuwiki/templates/_helpers.tpl b/incubator/dokuwiki/templates/_helpers.tpl index 4355810df..38a7acaf7 100644 --- a/incubator/dokuwiki/templates/_helpers.tpl +++ b/incubator/dokuwiki/templates/_helpers.tpl @@ -15,10 +15,3 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this {{- printf "%s-%s" .Release.Name $name | trunc 24 -}} {{- end -}} -{{/* -Create a default fully qualified app name. -We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "mariadb.fullname" -}} -{{- printf "%s-%s" .Release.Name "mariadb" | trunc 24 -}} -{{- end -}} diff --git a/incubator/dokuwiki/templates/deployment.yaml b/incubator/dokuwiki/templates/deployment.yaml index 67c50d565..64e0584a8 100644 --- a/incubator/dokuwiki/templates/deployment.yaml +++ b/incubator/dokuwiki/templates/deployment.yaml @@ -20,8 +20,8 @@ spec: env: - name: DOKUWIKI_USERNAME value: {{ default "" .Values.dokuwikiUsername | quote }} - - name: DOKUWIKI_FULLNAME - value: {{ default "" .Values.dokuwikiFullname | quote }} + - name: DOKUWIKI_FULL_NAME + value: {{ default "" .Values.dokuwikiFullName | quote }} - name: DOKUWIKI_PASSWORD valueFrom: secretKeyRef: @@ -29,8 +29,8 @@ spec: key: dokuwiki-password - name: DOKUWIKI_EMAIL value: {{ default "" .Values.dokuwikiEmail | quote }} - - name: DOKUWIKI_WIKINAME - value: {{ default "" .Values.dokuwikiWikiname | quote }} + - name: DOKUWIKI_WIKI_NAME + value: {{ default "" .Values.dokuwikiWikiName | quote }} ports: - name: http containerPort: 80 @@ -46,7 +46,7 @@ spec: httpGet: path: / port: http - initialDelaySeconds: 30 + initialDelaySeconds: 60 timeoutSeconds: 1 resources: {{ toYaml .Values.resources | indent 10 }} @@ -67,6 +67,6 @@ spec: {{- if .Values.persistence.enabled }} persistentVolumeClaim: claimName: {{ template "fullname" . }}-apache - {{- else }} + {{- else }} emptyDir: {} - {{- end }} + {{- end }} diff --git a/incubator/dokuwiki/templates/secrets.yaml b/incubator/dokuwiki/templates/secrets.yaml index ddf855e0c..48b36ed60 100644 --- a/incubator/dokuwiki/templates/secrets.yaml +++ b/incubator/dokuwiki/templates/secrets.yaml @@ -10,7 +10,7 @@ metadata: type: Opaque data: {{- if .Values.dokuwikiPassword }} - dokuwiki-password: {{ default "" .Values.dokuwikiPassword | b64enc | quote }} + dokuwiki-password: {{ .Values.dokuwikiPassword | b64enc | quote }} {{- else }} dokuwiki-password: {{ randAlphaNum 10 | b64enc | quote }} {{- end }} diff --git a/incubator/dokuwiki/values.yaml b/incubator/dokuwiki/values.yaml index 19db9232c..007e92d4e 100644 --- a/incubator/dokuwiki/values.yaml +++ b/incubator/dokuwiki/values.yaml @@ -1,4 +1,4 @@ -## Bitnami dokuwiki image version +## Bitnami DokuWiki image version ## ref: https://hub.docker.com/r/bitnami/dokuwiki/tags/ ## image: bitnami/dokuwiki:20160626a-r0 @@ -12,27 +12,27 @@ image: bitnami/dokuwiki:20160626a-r0 ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables ## -dokuwikiUsername: superuser - -## User's Full Name -## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables -## -dokuwikiFullname: FullName +dokuwikiUsername: user ## Application password ## Defaults to a random 10-character alphanumeric string if not set ## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables -## dokuwikiPassword: +# dokuwikiPassword: ## Admin email ## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables ## dokuwikiEmail: user@example.com -## +## User's Full Name ## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables ## -dokuwikiWikiname: Bitnami DokuWiki +dokuwikiFullName: FullName + +## Name of the Wiki +## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables +## +dokuwikiWikiName: My Wiki ## Kubernetes configuration From 32d595a128d47755d769dc706cb20cfa8803239b Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Mon, 12 Dec 2016 10:59:41 +0100 Subject: [PATCH 29/36] updated icon --- incubator/dokuwiki/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubator/dokuwiki/Chart.yaml b/incubator/dokuwiki/Chart.yaml index 2e39dbeef..b5cfd99e0 100644 --- a/incubator/dokuwiki/Chart.yaml +++ b/incubator/dokuwiki/Chart.yaml @@ -12,4 +12,4 @@ maintainers: - name: Bitnami email: containers@bitnami.com engine: gotpl -icon: https://d33np9n32j53g7.cloudfront.net/assets/stacks/dokuwiki/img/dokuwiki-stack-110x117-93f5de05ec90c0139b2b57db66de311e.png +icon: https://bitnami.com/assets/stacks/dokuwiki/img/dokuwiki-stack-110x117.png From ecf20fe61028d51065cfb9a214291c4bfc77b125 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Mon, 12 Dec 2016 11:00:39 +0100 Subject: [PATCH 30/36] updated icon --- incubator/mysql/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubator/mysql/Chart.yaml b/incubator/mysql/Chart.yaml index e6d2f34ef..d5e22a3f0 100644 --- a/incubator/mysql/Chart.yaml +++ b/incubator/mysql/Chart.yaml @@ -12,4 +12,4 @@ maintainers: - name: Bitnami email: containers@bitnami.com engine: gotpl -icon: https://d33np9n32j53g7.cloudfront.net/assets/stacks/mysql/img/mysql-stack-220x234-9b0b145795a63819818570807023d401.png +icon: https://bitnami.com/assets/stacks/mysql/img/mysql-stack-220x234.png From 1800b8ad09a6d39d1cfe81cc99291ed0dcafce8b Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 13 Dec 2016 09:18:26 +0530 Subject: [PATCH 31/36] set `initialDelaySeconds` in `readinessProbe` to `5` seconds --- incubator/dokuwiki/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubator/dokuwiki/templates/deployment.yaml b/incubator/dokuwiki/templates/deployment.yaml index 64e0584a8..adea63624 100644 --- a/incubator/dokuwiki/templates/deployment.yaml +++ b/incubator/dokuwiki/templates/deployment.yaml @@ -46,7 +46,7 @@ spec: httpGet: path: / port: http - initialDelaySeconds: 60 + initialDelaySeconds: 5 timeoutSeconds: 1 resources: {{ toYaml .Values.resources | indent 10 }} From 33419e480da63d8047a37d26cc0fb67fc69d4510 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 13 Dec 2016 09:18:33 +0530 Subject: [PATCH 32/36] clean ups --- incubator/dokuwiki/templates/apache-pvc.yaml | 2 +- incubator/dokuwiki/templates/deployment.yaml | 2 +- incubator/dokuwiki/templates/dokuwiki-pvc.yaml | 2 +- incubator/dokuwiki/values.yaml | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/incubator/dokuwiki/templates/apache-pvc.yaml b/incubator/dokuwiki/templates/apache-pvc.yaml index 95a0e576c..39fd68974 100644 --- a/incubator/dokuwiki/templates/apache-pvc.yaml +++ b/incubator/dokuwiki/templates/apache-pvc.yaml @@ -2,12 +2,12 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: + name: {{ template "fullname" . }}-apache labels: app: {{ template "fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" - name: {{ template "fullname" . }}-apache annotations: volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }} spec: diff --git a/incubator/dokuwiki/templates/deployment.yaml b/incubator/dokuwiki/templates/deployment.yaml index adea63624..b0002b6cf 100644 --- a/incubator/dokuwiki/templates/deployment.yaml +++ b/incubator/dokuwiki/templates/deployment.yaml @@ -68,5 +68,5 @@ spec: persistentVolumeClaim: claimName: {{ template "fullname" . }}-apache {{- else }} - emptyDir: {} + emptyDir: {} {{- end }} diff --git a/incubator/dokuwiki/templates/dokuwiki-pvc.yaml b/incubator/dokuwiki/templates/dokuwiki-pvc.yaml index bdae89de4..7bb23460d 100644 --- a/incubator/dokuwiki/templates/dokuwiki-pvc.yaml +++ b/incubator/dokuwiki/templates/dokuwiki-pvc.yaml @@ -2,12 +2,12 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: + name: {{ template "fullname" . }}-dokuwiki labels: app: {{ template "fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" - name: {{ template "fullname" . }}-dokuwiki annotations: volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.dokuwiki.storageClass | quote }} spec: diff --git a/incubator/dokuwiki/values.yaml b/incubator/dokuwiki/values.yaml index 007e92d4e..7bda029af 100644 --- a/incubator/dokuwiki/values.yaml +++ b/incubator/dokuwiki/values.yaml @@ -17,7 +17,7 @@ dokuwikiUsername: user ## Application password ## Defaults to a random 10-character alphanumeric string if not set ## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables -# dokuwikiPassword: +# dokuwikiPassword: ## Admin email ## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables @@ -29,12 +29,11 @@ dokuwikiEmail: user@example.com ## dokuwikiFullName: FullName -## Name of the Wiki +## Name of the Wiki ## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables ## dokuwikiWikiName: My Wiki - ## Kubernetes configuration ## For minikube, set this to NodePort, elsewhere use LoadBalancer ## From 74d598fc57ed5e6a164435de000f9d5adbbc83ba Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 13 Dec 2016 09:58:04 +0530 Subject: [PATCH 33/36] set default value of `dokuwikiFullName` to `Full Name` --- incubator/dokuwiki/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubator/dokuwiki/values.yaml b/incubator/dokuwiki/values.yaml index 7bda029af..5fe8c92ab 100644 --- a/incubator/dokuwiki/values.yaml +++ b/incubator/dokuwiki/values.yaml @@ -27,7 +27,7 @@ dokuwikiEmail: user@example.com ## User's Full Name ## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables ## -dokuwikiFullName: FullName +dokuwikiFullName: Full Name ## Name of the Wiki ## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables From 448434a5e2e667ee1156abeeddbe64516939c799 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Tue, 13 Dec 2016 13:57:22 +0100 Subject: [PATCH 34/36] fix command message --- incubator/mysql/templates/NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubator/mysql/templates/NOTES.txt b/incubator/mysql/templates/NOTES.txt index 678880f39..697b1f9ce 100644 --- a/incubator/mysql/templates/NOTES.txt +++ b/incubator/mysql/templates/NOTES.txt @@ -3,4 +3,4 @@ MySQL can be accessed via port 3306 on the following DNS name from within your c To connect to your database run the following command: - kubectl run {{ template "fullname" . }}-client --rm --tty -i --image bitnami/mysql --command -- mysql -h {{ template "fullname" . }} {{- if .Values.mysqlRootPassword }} -p {{ .Values.mysqlRootPassword }}{{- end -}} + kubectl run {{ template "fullname" . }}-client --rm --tty -i --image bitnami/mysql --command -- mysql -h {{ template "fullname" . }} -uroot {{- if .Values.mysqlRootPassword }} -p{{ .Values.mysqlRootPassword }}{{- end -}} From 214c1f5a2c665f685b12a2f76df5ba2674d0feb8 Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Tue, 13 Dec 2016 13:58:53 +0100 Subject: [PATCH 35/36] updated container revision to -r2 --- incubator/dokuwiki/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubator/dokuwiki/values.yaml b/incubator/dokuwiki/values.yaml index 5fe8c92ab..08cfe8107 100644 --- a/incubator/dokuwiki/values.yaml +++ b/incubator/dokuwiki/values.yaml @@ -1,7 +1,7 @@ ## Bitnami DokuWiki image version ## ref: https://hub.docker.com/r/bitnami/dokuwiki/tags/ ## -image: bitnami/dokuwiki:20160626a-r0 +image: bitnami/dokuwiki:20160626a-r2 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' From 1a796a80bdaa6322ed1883851ad4157fbd939f9c Mon Sep 17 00:00:00 2001 From: Jorge Bianquetti Date: Tue, 13 Dec 2016 14:00:13 +0100 Subject: [PATCH 36/36] fix command message --- incubator/mysql/templates/NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubator/mysql/templates/NOTES.txt b/incubator/mysql/templates/NOTES.txt index 697b1f9ce..e398987ea 100644 --- a/incubator/mysql/templates/NOTES.txt +++ b/incubator/mysql/templates/NOTES.txt @@ -3,4 +3,4 @@ MySQL can be accessed via port 3306 on the following DNS name from within your c To connect to your database run the following command: - kubectl run {{ template "fullname" . }}-client --rm --tty -i --image bitnami/mysql --command -- mysql -h {{ template "fullname" . }} -uroot {{- if .Values.mysqlRootPassword }} -p{{ .Values.mysqlRootPassword }}{{- end -}} + kubectl run {{ template "fullname" . }}-client --rm --tty -i --image bitnami/mysql --command -- mysql -h{{ template "fullname" . }} -uroot {{- if .Values.mysqlRootPassword }} -p{{ .Values.mysqlRootPassword }}{{- end -}}