diff --git a/.gitignore b/.gitignore
index 29a215cdb558a809630717dccddd845d57c27072..52726781ba3cf17e3311bb1d8cb93ee47b6cf930 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
values-local.yaml
+charts
*.swp
diff --git a/charts/collabora-code/.helmignore b/charts/collabora-code/.helmignore
deleted file mode 100755
index 50af0317254197a5a019f4ac2f8ecc223f93f5a7..0000000000000000000000000000000000000000
--- a/charts/collabora-code/.helmignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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
-.vscode/
diff --git a/charts/collabora-code/Chart.yaml b/charts/collabora-code/Chart.yaml
deleted file mode 100755
index a3b84027ba5cee6b4c5531fc8157914363ddbbd8..0000000000000000000000000000000000000000
--- a/charts/collabora-code/Chart.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-appVersion: 4.0.3.1
-description: A Helm chart for Collabora Office - CODE-Edition
-home: https://www.collaboraoffice.com/code/
-icon: https://avatars0.githubusercontent.com/u/22418908?s=200&v=4
-maintainers:
-- email: christian.ingenhaag@googlemail.com
- name: Christian
-name: collabora-code
-sources:
-- https://github.com/CollaboraOnline/Docker-CODE
-version: 1.0.1
diff --git a/charts/collabora-code/OWNERS b/charts/collabora-code/OWNERS
deleted file mode 100755
index 0067073415d8e878c1391311093dfb9533650e56..0000000000000000000000000000000000000000
--- a/charts/collabora-code/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-approvers:
-- chrisingenhaag
-reviewers:
-- chrisingenhaag
\ No newline at end of file
diff --git a/charts/collabora-code/README.md b/charts/collabora-code/README.md
deleted file mode 100755
index ac0847b57b7caeefa4786fa540fcc8563d775f46..0000000000000000000000000000000000000000
--- a/charts/collabora-code/README.md
+++ /dev/null
@@ -1,87 +0,0 @@
-# Collabora CODE
-
-[Collabora](https://www.collaboraoffice.com/code/) is a online office suite.
-
-## Introduction
-
-This chart creates a single Collabora CODE Pod to run Collabora CODE suite, for example as integration together with nextcloud. Installation is based on the docker documentation [CollaboraDocker](https://www.collaboraoffice.com/code/docker/).
-
-For most easy integration it´s recommended to use cert-manager together with your favorite ingress controller to get a fully working, ssl-terminated Collabora CODE server.
-
-## Prerequisites
-
-- Kubernetes 1.9+ with Beta APIs enabled
-
-## Installing the Chart
-
-To install the chart with the release name `my-release`, run:
-
-```bash
-$ helm install --name my-release stable/collabora
-```
-
-This command deploys a Collabora Online Development Edition server.
-
-> **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
-
-Refer to [values.yaml](values.yaml) for the full run-down on defaults. These are a mixture of Kubernetes and Collabora-related directives that map to environment variables in the [CollaboraCODEDocker](https://github.com/CollaboraOnline/Docker-CODE) Docker image.
-
-Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
-
-```bash
-$ helm install --name my-release \
- --set varname=true stable/collabora
-```
-
-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/collabora
-```
-
-> **Tip**: You can use the default [values.yaml](values.yaml)
-
-The following tables lists the configurable parameters of this chart and their default values.
-
-| Parameter | Description | Default |
-| ------------------------------------------------- | ------------------------------------------------------------- | ----------------------------------------------------------- |
-| `replicaCount` | Number of provisioner instances to deployed | `1` |
-| `strategy` | Specifies the strategy used to replace old Pods by new ones | `Recreate` |
-| `image.repository` | Provisioner image | `collabora/code` |
-| `image.tag` | Version of provisioner image | `4.0.0.2` |
-| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
-| `collabora.DONT_GEN_SSL_CERT` | | `true` |
-| `collabora.domain` | Double escaped WOPI host | `wopihost\\.domain` |
-| `collabora.extra_params` | List of params to use as env var | `--o:ssl.termination=true --o:ssl.enable=false` |
-| `collabora.server_name` | Collabora server name (single escaped) | `collabora\.domain` |
-| `collabora.password` | Collabora admin panel pass | `examplepass` |
-| `collabora.username` | Collabora admin panel user | `admin` |
-| `collabora.dictionaries` | Collabora enabled dictionaries | `de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru` |
-| `ingress.enabled` | | `false` |
-| `ingress.annotations` | | `{}` |
-| `ingress.paths` | | `[]` |
-| `ingress.hosts` | | `[]` |
-| `ingress.tls` | | `[]` |
-| `securityContext.allowPrivilegeEscalation` | Create & use Pod Security Policy resources | `true` |
-| `securitycontext.capabilities.add` | Collabora needs to run with MKNOD as capabibility | `[MKNOD]` |
-| `resources` | Resources required (e.g. CPU, memory) | `{}` |
-| `nodeSelector` | Node labels for pod assignment | `{}` |
-| `affinity` | Affinity settings | `{}` |
-| `tolerations` | List of node taints to tolerate | `[]` |
-
-
-## Persistence
-
-There is no need for a persistent storage to run collabora code edition. All parameters in `/etc/loolwsd/loolwsd.xml` can be adjusted with using extra_params environment variable.
diff --git a/charts/collabora-code/templates/NOTES.txt b/charts/collabora-code/templates/NOTES.txt
deleted file mode 100755
index df2acd7afd75e76608c7afd2492dd113925d0350..0000000000000000000000000000000000000000
--- a/charts/collabora-code/templates/NOTES.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
- {{- range $.Values.ingress.paths }}
- http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host }}{{ . }}
- {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
- export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "collabora-code.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.service.type }}
- NOTE: It may take a few minutes for the LoadBalancer IP to be available.
- You can watch the status of by running 'kubectl get svc -w {{ include "collabora-code.fullname" . }}'
- export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "collabora-code.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
- echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
- export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "collabora-code.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
- echo "Visit http://127.0.0.1:9980 to use your application"
- kubectl port-forward $POD_NAME 9980:9980
-{{- end }}
diff --git a/charts/collabora-code/templates/_helpers.tpl b/charts/collabora-code/templates/_helpers.tpl
deleted file mode 100755
index 88fcce47c0733600a6ab70c3cf63a2e8180095ba..0000000000000000000000000000000000000000
--- a/charts/collabora-code/templates/_helpers.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "collabora-code.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "collabora-code.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "collabora-code.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
diff --git a/charts/collabora-code/templates/configmap.yaml b/charts/collabora-code/templates/configmap.yaml
deleted file mode 100755
index 187f53db6aa5f0283f140e6670929f90f0e8614b..0000000000000000000000000000000000000000
--- a/charts/collabora-code/templates/configmap.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "collabora-code.fullname" . }}
-data:
- DONT_GEN_SSL_CERT: "{{ .Values.collabora.DONT_GEN_SSL_CERT }}"
- dictionaries: {{ .Values.collabora.dictionaries }}
- domain: {{ .Values.collabora.domain }}
- extra_params: {{ .Values.collabora.extra_params }}
- server_name: {{ .Values.collabora.server_name }}
diff --git a/charts/collabora-code/templates/deployment.yaml b/charts/collabora-code/templates/deployment.yaml
deleted file mode 100755
index bfbb731d9ea39f9b0373932c93cff8adb082a921..0000000000000000000000000000000000000000
--- a/charts/collabora-code/templates/deployment.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ include "collabora-code.fullname" . }}
- labels:
- app.kubernetes.io/name: {{ include "collabora-code.name" . }}
- helm.sh/chart: {{ include "collabora-code.chart" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
- replicas: {{ .Values.replicaCount }}
- strategy:
- type: {{ .Values.strategy }}
- selector:
- matchLabels:
- app.kubernetes.io/name: {{ include "collabora-code.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- template:
- metadata:
- labels:
- app.kubernetes.io/name: {{ include "collabora-code.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- spec:
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
- imagePullPolicy: {{ .Values.image.pullPolicy }}
- env:
- - name: DONT_GEN_SSL_CERT
- valueFrom:
- configMapKeyRef:
- name: {{ include "collabora-code.fullname" . }}
- key: DONT_GEN_SSL_CERT
- - name: dictionaries
- valueFrom:
- configMapKeyRef:
- name: {{ include "collabora-code.fullname" . }}
- key: dictionaries
- - name: domain
- valueFrom:
- configMapKeyRef:
- name: {{ include "collabora-code.fullname" . }}
- key: domain
- - name: extra_params
- valueFrom:
- configMapKeyRef:
- name: {{ include "collabora-code.fullname" . }}
- key: extra_params
- - name: server_name
- valueFrom:
- configMapKeyRef:
- name: {{ include "collabora-code.fullname" . }}
- key: server_name
- - name: username
- valueFrom:
- secretKeyRef:
- name: {{ include "collabora-code.fullname" . }}
- key: username
- - name: password
- valueFrom:
- secretKeyRef:
- name: {{ include "collabora-code.fullname" . }}
- key: password
- livenessProbe:
- failureThreshold: 3
- httpGet:
- path: /
- port: http
- scheme: HTTP
- initialDelaySeconds: 90
- periodSeconds: 10
- successThreshold: 1
- timeoutSeconds: 2
- readinessProbe:
- failureThreshold: 3
- httpGet:
- path: /
- port: http
- scheme: HTTP
- initialDelaySeconds: 30
- periodSeconds: 10
- successThreshold: 1
- timeoutSeconds: 2
- ports:
- - name: http
- containerPort: {{ .Values.service.port }}
- protocol: TCP
- resources:
- {{- toYaml .Values.resources | nindent 12 }}
- securityContext:
- {{- toYaml .Values.securitycontext | nindent 12 }}
- {{- with .Values.nodeSelector }}
- nodeSelector:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- with .Values.affinity }}
- affinity:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- with .Values.tolerations }}
- tolerations:
- {{- toYaml . | nindent 8 }}
- {{- end }}
diff --git a/charts/collabora-code/templates/ingress.yaml b/charts/collabora-code/templates/ingress.yaml
deleted file mode 100755
index f7b86cd1c2c781db891ac0b35bfd13d46e447733..0000000000000000000000000000000000000000
--- a/charts/collabora-code/templates/ingress.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "collabora-code.fullname" . -}}
-{{- $ingressPaths := .Values.ingress.paths -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
- name: {{ $fullName }}
- labels:
- app.kubernetes.io/name: {{ include "collabora-code.name" . }}
- helm.sh/chart: {{ include "collabora-code.chart" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
- {{- with .Values.ingress.annotations }}
- annotations:
- {{- toYaml . | nindent 4 }}
- {{- end }}
-spec:
-{{- if .Values.ingress.tls }}
- tls:
- {{- range .Values.ingress.tls }}
- - hosts:
- {{- range .hosts }}
- - {{ . | quote }}
- {{- end }}
- secretName: {{ .secretName }}
- {{- end }}
-{{- end }}
- rules:
- {{- range .Values.ingress.hosts }}
- - host: {{ . | quote }}
- http:
- paths:
- {{- range $ingressPaths }}
- - path: {{ . }}
- backend:
- serviceName: {{ $fullName }}
- servicePort: http
- {{- end }}
- {{- end }}
-{{- end }}
diff --git a/charts/collabora-code/templates/secret.yaml b/charts/collabora-code/templates/secret.yaml
deleted file mode 100755
index 9999e6245d2fe05187658614878ae048eb83e5d8..0000000000000000000000000000000000000000
--- a/charts/collabora-code/templates/secret.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
- name: {{ include "collabora-code.fullname" . }}
-data:
- username: {{ .Values.collabora.username | b64enc }}
- password: {{ .Values.collabora.password | b64enc }}
\ No newline at end of file
diff --git a/charts/collabora-code/templates/service.yaml b/charts/collabora-code/templates/service.yaml
deleted file mode 100755
index c80a6ab8e0fdcdc41bef47ff3e8495c5018edeb0..0000000000000000000000000000000000000000
--- a/charts/collabora-code/templates/service.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "collabora-code.fullname" . }}
- labels:
- app.kubernetes.io/name: {{ include "collabora-code.name" . }}
- helm.sh/chart: {{ include "collabora-code.chart" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
- type: {{ .Values.service.type }}
- ports:
- - port: {{ .Values.service.port }}
- targetPort: http
- protocol: TCP
- name: http
- selector:
- app.kubernetes.io/name: {{ include "collabora-code.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/charts/collabora-code/templates/tests/test-connection.yaml b/charts/collabora-code/templates/tests/test-connection.yaml
deleted file mode 100755
index 1d4689bf343a3f65e5466c712ba06d96975dc01b..0000000000000000000000000000000000000000
--- a/charts/collabora-code/templates/tests/test-connection.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
- name: "{{ include "collabora-code.fullname" . }}-test-connection"
- labels:
- app.kubernetes.io/name: {{ include "collabora-code.name" . }}
- helm.sh/chart: {{ include "collabora-code.chart" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
- annotations:
- "helm.sh/hook": test-success
-spec:
- containers:
- - name: wget
- image: busybox
- command: ['wget']
- args: ['{{ include "collabora-code.fullname" . }}:{{ .Values.service.port }}']
- restartPolicy: Never
diff --git a/charts/collabora-code/values.yaml b/charts/collabora-code/values.yaml
deleted file mode 100755
index 6e5e81d9ec8f5920996c7c09ffc26fe030088d27..0000000000000000000000000000000000000000
--- a/charts/collabora-code/values.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-# Default values for collabora-code.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
- repository: collabora/code
- tag: 4.0.3.1
- pullPolicy: IfNotPresent
-
-strategy: Recreate
-
-nameOverride: ""
-fullnameOverride: ""
-
-service:
- type: ClusterIP
- port: 9980
-
-ingress:
- enabled: false
- annotations: {}
- paths: []
- hosts: []
- tls: []
-
-collabora:
- DONT_GEN_SSL_CERT: true
- domain: nextcloud\\.domain
- extra_params: --o:ssl.termination=true --o:ssl.enable=false
- server_name: collabora\.domain
- password: examplepass
- username: admin
- dictionaries: de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru
-
-securitycontext:
- allowPrivilegeEscalation: true
- capabilities:
- add:
- - MKNOD
-
-resources: {}
- # limits:
- # cpu: 100m
- # memory: 128Mi
- # requests:
- # cpu: 100m
- # memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
diff --git a/charts/nextcloud/.helmignore b/charts/nextcloud/.helmignore
deleted file mode 100755
index f0c13194444163d1cba5c67d9e79231a62bc8f44..0000000000000000000000000000000000000000
--- a/charts/nextcloud/.helmignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
deleted file mode 100755
index 06d37ae2c82d48afc64377e05a12ab3f5e2d277c..0000000000000000000000000000000000000000
--- a/charts/nextcloud/Chart.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-appVersion: 15.0.2
-description: A file sharing server that puts the control and security of your own
- data back into your hands.
-home: https://nextcloud.com/
-icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg
-keywords:
-- nextcloud
-- storage
-- http
-- web
-- php
-maintainers:
-- email: christian.ingenhaag@googlemail.com
- name: chrisingenhaag
-name: nextcloud
-sources:
-- https://github.com/nextcloud/docker
-version: 1.0.2
diff --git a/charts/nextcloud/OWNERS b/charts/nextcloud/OWNERS
deleted file mode 100755
index c9b3946080e3637460ade261102e6d8d83ed4c4c..0000000000000000000000000000000000000000
--- a/charts/nextcloud/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-approvers:
-- chrisingenhaag
-reviewers:
-- chrisingenhaag
diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md
deleted file mode 100755
index 0f35d06e474c68cf064225d1790798c2209ae47f..0000000000000000000000000000000000000000
--- a/charts/nextcloud/README.md
+++ /dev/null
@@ -1,119 +0,0 @@
-# nextcloud
-
-[nextcloud](https://nextcloud.com/) is a file sharing server that puts the control and security of your own data back into your hands.
-
-## TL;DR;
-
-```console
-$ helm install stable/nextcloud
-```
-
-## Introduction
-
-This chart bootstraps an [nextcloud](https://hub.docker.com/_/nextcloud/) 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 nextcloud application.
-
-## Prerequisites
-
-- Kubernetes 1.9+ 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/nextcloud
-```
-
-The command deploys nextcloud 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 table lists the configurable parameters of the nextcloud chart and their default values.
-
-| Parameter | Description | Default |
-|-------------------------------------|-------------------------------------------|-------------------------------------------------------- |
-| `image.repository` | nextcloud Image name | `nextcloud` |
-| `image.tag` | nextcloud Image tag | `{VERSION}` |
-| `image.pullPolicy` | Image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` |
-| `image.pullSecrets` | Specify image pull secrets | `nil` |
-| `ingress.enabled` | Enable use of ingress controllers | `false` |
-| `ingress.servicePort` | Ingress' backend servicePort | `http` |
-| `ingress.annotations` | An array of service annotations | `nil` |
-| `ingress.tls` | Ingress TLS configuration | `[]` |
-| `nextcloud.host` | nextcloud host to create application URLs | `nextcloud.kube.home` |
-| `nextcloud.username` | User of the application | `admin` |
-| `nextcloud.password` | Application password | `changeme` |
-| `internalDatabase.enabled` | Whether to use internal sqlite database | `true` |
-| `internalDatabase.database` | Name of the existing database | `nextcloud` |
-| `externalDatabase.enabled` | Whether to use external database | `false` |
-| `externalDatabase.host` | Host of the external database | `nil` |
-| `externalDatabase.database` | Name of the existing database | `nextcloud` |
-| `externalDatabase.user` | Existing username in the external db | `nextcloud` |
-| `externalDatabase.password` | Password for the above username | `nil` |
-| `mariadb.enabled` | Whether to use the MariaDB chart | `false` |
-| `mariadb.db.name` | Database name to create | `nextcloud` |
-| `mariadb.db.password` | Password for the database | `changeme` |
-| `mariadb.db.user` | Database user to create | `nextcloud` |
-| `mariadb.rootUser.password` | MariaDB admin password | `nil` |
-| `service.type` | Kubernetes Service type | `ClusterIp` |
-| `service.loadBalancerIP` | LoadBalancerIp for service type LoadBalancer | `nil` |
-| `persistence.enabled` | Enable persistence using PVC | `false` |
-| `persistence.storageClass` | PVC Storage Class for nextcloud volume | `nil` (uses alpha storage class annotation) |
-| `persistence.existingClaim`| An Existing PVC name for nextcloud volume | `nil` (uses alpha storage class annotation) |
-| `persistence.accessMode` | PVC Access Mode for nextcloud volume | `ReadWriteOnce` |
-| `persistence.size` | PVC Storage Request for nextcloud volume | `8Gi` |
-| `resources` | CPU/Memory resource requests/limits | `{}` |
-
-> **Note**:
->
-> For nextcloud to function correctly, you should specify the `nextcloud.host` parameter to specify the FQDN (recommended) or the public IP address of the nextcloud service.
->
-> Optionally, you can specify the `service.loadBalancerIP` parameter to assign a reserved IP address to the nextcloud service of the chart. However please note that this feature is only available on a few cloud providers (f.e. GKE).
->
-> To reserve a public IP address on GKE:
->
-> ```bash
-> $ gcloud compute addresses create nextcloud-public-ip
-> ```
->
-> The reserved IP address can be associated to the nextcloud service by specifying it as the value of the `service.loadBalancerIP` parameter while installing the chart.
-
-Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
-
-```console
-$ helm install --name my-release \
- --set nextcloud.username=admin,nextcloud.password=password,mariadb.rootUser.password=secretpassword \
- stable/nextcloud
-```
-
-The above command sets the nextcloud 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/nextcloud
-```
-
-> **Tip**: You can use the default [values.yaml](values.yaml)
-
-## Persistence
-
-The [Nextcloud](https://hub.docker.com/_/nextcloud/) image stores the nextcloud data and configurations at the `/var/www/html` 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 enable persistence and configuration of the PVC.
diff --git a/charts/nextcloud/charts/mariadb/.helmignore b/charts/nextcloud/charts/mariadb/.helmignore
deleted file mode 100755
index 6b8710a711f3b689885aa5c26c6c06bde348e82b..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/.helmignore
+++ /dev/null
@@ -1 +0,0 @@
-.git
diff --git a/charts/nextcloud/charts/mariadb/Chart.yaml b/charts/nextcloud/charts/mariadb/Chart.yaml
deleted file mode 100755
index 331d31d9c93b14248411f8940437f9f7d6660709..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/Chart.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-appVersion: 10.1.37
-description: Fast, reliable, scalable, and easy to use open-source relational database
- system. MariaDB Server is intended for mission-critical, heavy-load production systems
- as well as for embedding into mass-deployed software. Highly available MariaDB cluster.
-engine: gotpl
-home: https://mariadb.org
-icon: https://bitnami.com/assets/stacks/mariadb/img/mariadb-stack-220x234.png
-keywords:
-- mariadb
-- mysql
-- database
-- sql
-- prometheus
-maintainers:
-- email: containers@bitnami.com
- name: Bitnami
-name: mariadb
-sources:
-- https://github.com/bitnami/bitnami-docker-mariadb
-- https://github.com/prometheus/mysqld_exporter
-version: 5.5.0
diff --git a/charts/nextcloud/charts/mariadb/OWNERS b/charts/nextcloud/charts/mariadb/OWNERS
deleted file mode 100755
index 2c3e9fa1a423d8968df69e6ea2d71bd6be1485a6..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/OWNERS
+++ /dev/null
@@ -1,12 +0,0 @@
-approvers:
-- prydonius
-- tompizmor
-- sameersbn
-- carrodher
-- juan131
-reviewers:
-- prydonius
-- tompizmor
-- sameersbn
-- carrodher
-- juan131
diff --git a/charts/nextcloud/charts/mariadb/README.md b/charts/nextcloud/charts/mariadb/README.md
deleted file mode 100755
index 16bf9a0d28163fd0f1a0debc0926a1fd3103e82d..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/README.md
+++ /dev/null
@@ -1,205 +0,0 @@
-# MariaDB
-
-[MariaDB](https://mariadb.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.
-
-MariaDB is developed as open source software and as a relational database it provides an SQL interface for accessing data. The latest versions of MariaDB also include GIS and JSON features.
-
-## TL;DR
-
-```bash
-$ helm install stable/mariadb
-```
-
-## Introduction
-
-This chart bootstraps a [MariaDB](https://github.com/bitnami/bitnami-docker-mariadb) replication cluster deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
-
-Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters.
-
-## Prerequisites
-
-- Kubernetes 1.10+
-- 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/mariadb
-```
-
-The command deploys MariaDB 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 table lists the configurable parameters of the MariaDB chart and their default values.
-
-| Parameter | Description | Default |
-|-------------------------------------------|-----------------------------------------------------|-------------------------------------------------------------------|
-| `global.imageRegistry` | Global Docker image registry | `nil` |
-| `image.registry` | MariaDB image registry | `docker.io` |
-| `image.repository` | MariaDB Image name | `bitnami/mariadb` |
-| `image.tag` | MariaDB Image tag | `{VERSION}` |
-| `image.pullPolicy` | MariaDB image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` |
-| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
-| `image.debug` | Specify if debug logs should be enabled | `false` |
-| `service.type` | Kubernetes service type | `ClusterIP` |
-| `service.clusterIp` | Specific cluster IP when service type is cluster IP. Use None for headless service | `nil` |
-| `service.port` | MySQL service port | `3306` |
-| `serviceAccount.create` | Specifies whether a ServiceAccount should be created | `false` |
-| `serviceAccount.name` | The name of the ServiceAccount to create | Generated using the mariadb.fullname template |
-| `securityContext.enabled` | Enable security context | `true` |
-| `securityContext.fsGroup` | Group ID for the container | `1001` |
-| `securityContext.runAsUser` | User ID for the container | `1001` |
-| `existingSecret` | Use Existing secret for Password details (`rootUser.password`, `db.password`, `replication.password` will be ignored and picked up from this secret) | |
-| `rootUser.password` | Password for the `root` user. Ignored if existing secret is provided. | _random 10 character alphanumeric string_ |
-| `rootUser.forcePassword` | Force users to specify a password | `false` |
-| `db.user` | Username of new user to create | `nil` |
-| `db.password` | Password for the new user. Ignored if existing secret is provided. | _random 10 character alphanumeric string if `db.user` is defined_ |
-| `db.name` | Name for new database to create | `my_database` |
-| `replication.enabled` | MariaDB replication enabled | `true` |
-| `replication.user` |MariaDB replication user | `replicator` |
-| `replication.password` | MariaDB replication user password. Ignored if existing secret is provided. | _random 10 character alphanumeric string_ |
-| `initdbScripts` | List of initdb scripts | `nil` |
-| `initdbScriptsConfigMap` | ConfigMap with the initdb scripts (Note: Overrides `initdbScripts`) | `nil` |
-| `master.annotations[].key` | key for the the annotation list item | `nil` |
-| `master.annotations[].value` | value for the the annotation list item | `nil` |
-| `master.affinity` | Master affinity (in addition to master.antiAffinity when set) | `{}` |
-| `master.antiAffinity` | Master pod anti-affinity policy | `soft` |
-| `master.tolerations` | List of node taints to tolerate (master) | `[]` |
-| `master.persistence.enabled` | Enable persistence using PVC | `true` |
-| `master.persistence.existingClaim` | Provide an existing `PersistentVolumeClaim` | `nil` |
-| `master.persistence.mountPath` | Path to mount the volume at | `/bitnami/mariadb` |
-| `master.persistence.annotations` | Persistent Volume Claim annotations | `{}` |
-| `master.persistence.storageClass` | Persistent Volume Storage Class | `` |
-| `master.persistence.accessModes` | Persistent Volume Access Modes | `[ReadWriteOnce]` |
-| `master.persistence.size` | Persistent Volume Size | `8Gi` |
-| `master.extraInitContainers` | Additional init containers as a string to be passed to the `tpl` function (master) | |
-| `master.config` | Config file for the MariaDB Master server | `_default values in the values.yaml file_` |
-| `master.resources` | CPU/Memory resource requests/limits for master node | `{}` |
-| `master.livenessProbe.enabled` | Turn on and off liveness probe (master) | `true` |
-| `master.livenessProbe.initialDelaySeconds`| Delay before liveness probe is initiated (master) | `120` |
-| `master.livenessProbe.periodSeconds` | How often to perform the probe (master) | `10` |
-| `master.livenessProbe.timeoutSeconds` | When the probe times out (master) | `1` |
-| `master.livenessProbe.successThreshold` | Minimum consecutive successes for the probe (master)| `1` |
-| `master.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe (master) | `3` |
-| `master.readinessProbe.enabled` | Turn on and off readiness probe (master) | `true` |
-| `master.readinessProbe.initialDelaySeconds`| Delay before readiness probe is initiated (master) | `30` |
-| `master.readinessProbe.periodSeconds` | How often to perform the probe (master) | `10` |
-| `master.readinessProbe.timeoutSeconds` | When the probe times out (master) | `1` |
-| `master.readinessProbe.successThreshold` | Minimum consecutive successes for the probe (master)| `1` |
-| `master.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe (master) | `3` |
-| `slave.replicas` | Desired number of slave replicas | `1` |
-| `slave.annotations[].key` | key for the the annotation list item | `nil` |
-| `slave.annotations[].value` | value for the the annotation list item | `nil` |
-| `slave.affinity` | Slave affinity (in addition to slave.antiAffinity when set) | `{}` |
-| `slave.antiAffinity` | Slave pod anti-affinity policy | `soft` |
-| `slave.tolerations` | List of node taints to tolerate for (slave) | `[]` |
-| `slave.persistence.enabled` | Enable persistence using a `PersistentVolumeClaim` | `true` |
-| `slave.persistence.annotations` | Persistent Volume Claim annotations | `{}` |
-| `slave.persistence.storageClass` | Persistent Volume Storage Class | `` |
-| `slave.persistence.accessModes` | Persistent Volume Access Modes | `[ReadWriteOnce]` |
-| `slave.persistence.size` | Persistent Volume Size | `8Gi` |
-| `slave.extraInitContainers` | Additional init containers as a string to be passed to the `tpl` function (slave) | |
-| `slave.config` | Config file for the MariaDB Slave replicas | `_default values in the values.yaml file_` |
-| `slave.resources` | CPU/Memory resource requests/limits for slave node | `{}` |
-| `slave.livenessProbe.enabled` | Turn on and off liveness probe (slave) | `true` |
-| `slave.livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated (slave) | `120` |
-| `slave.livenessProbe.periodSeconds` | How often to perform the probe (slave) | `10` |
-| `slave.livenessProbe.timeoutSeconds` | When the probe times out (slave) | `1` |
-| `slave.livenessProbe.successThreshold` | Minimum consecutive successes for the probe (slave) | `1` |
-| `slave.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe (slave) | `3` |
-| `slave.readinessProbe.enabled` | Turn on and off readiness probe (slave) | `true` |
-| `slave.readinessProbe.initialDelaySeconds`| Delay before readiness probe is initiated (slave) | `45` |
-| `slave.readinessProbe.periodSeconds` | How often to perform the probe (slave) | `10` |
-| `slave.readinessProbe.timeoutSeconds` | When the probe times out (slave) | `1` |
-| `slave.readinessProbe.successThreshold` | Minimum consecutive successes for the probe (slave) | `1` |
-| `slave.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe (slave) | `3` |
-| `metrics.enabled` | Start a side-car prometheus exporter | `false` |
-| `metrics.image.registry` | Exporter image registry | `docker.io` |
-| `metrics.image.repository` | Exporter image name | `prom/mysqld-exporter` |
-| `metrics.image.tag` | Exporter image tag | `v0.10.0` |
-| `metrics.image.pullPolicy` | Exporter image pull policy | `IfNotPresent` |
-| `metrics.resources` | Exporter resource requests/limit | `nil` |
-
-The above parameters map to the env variables defined in [bitnami/mariadb](http://github.com/bitnami/bitnami-docker-mariadb). For more information please refer to the [bitnami/mariadb](http://github.com/bitnami/bitnami-docker-mariadb) 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 root.password=secretpassword,user.database=app_database \
- stable/mariadb
-```
-
-The above command sets the MariaDB `root` account password to `secretpassword`. Additionally it creates 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/mariadb
-```
-
-> **Tip**: You can use the default [values.yaml](values.yaml)
-
-## Initialize a fresh instance
-
-The [Bitnami MariaDB](https://github.com/bitnami/bitnami-docker-mariadb) image allows you to use your custom scripts to initialize a fresh instance. In order to execute the scripts, they must be located inside the chart folder `files/docker-entrypoint-initdb.d` so they can be consumed as a ConfigMap.
-
-Alternatively, you can specify custom scripts using the `initdbScripts` parameter as dict.
-
-In addition to these options, you can also set an external ConfigMap with all the initialization scripts. This is done by setting the `initdbScriptsConfigMap` parameter. Note that this will override the two previous options.
-
-The allowed extensions are `.sh`, `.sql` and `.sql.gz`.
-
-## Persistence
-
-The [Bitnami MariaDB](https://github.com/bitnami/bitnami-docker-mariadb) image stores the MariaDB data and configurations at the `/bitnami/mariadb` path of the container.
-
-The chart mounts a [Persistent Volume](kubernetes.io/docs/user-guide/persistent-volumes/) volume at this location. The volume is created using dynamic volume provisioning, by default. An existing PersistentVolumeClaim can be defined.
-
-## Extra Init Containers
-
-The feature allows for specifying a template string for a initContainer in the master/slave pod. Usecases include situations when you need some pre-run setup. For example, in IKS (IBM Cloud Kubernetes Service), non-root users do not have write permission on the volume mount path for NFS-powered file storage. So, you could use a initcontainer to `chown` the mount. See a example below, where we add an initContainer on the master pod that reports to an external resource that the db is going to starting.
-`values.yaml`
-```yaml
-master:
- extraInitContainers: |
- - name: initcontainer
- image: alpine:latest
- command: ["/bin/sh", "-c"]
- args:
- - curl http://api-service.local/db/starting;
-```
-
-## Upgrading
-
-It's necessary to set the `rootUser.password` parameter when upgrading for readiness/liveness probes to work properly. When you install this chart for the first time, some notes will be displayed providing the credentials you must use under the 'Administrator credentials' section. Please note down the password and run the command below to upgrade your chart:
-
-```bash
-$ helm upgrade my-release stable/mariadb --set rootUser.password=[ROOT_PASSWORD]
-```
-
-| Note: you need to substitute the placeholder _[ROOT_PASSWORD]_ with the value obtained in the installation notes.
-
-### To 5.0.0
-
-Backwards compatibility is not guaranteed unless you modify the labels used on the chart's deployments.
-Use the workaround below to upgrade from versions previous to 5.0.0. The following example assumes that the release name is mariadb:
-
-```console
-$ kubectl delete statefulset opencart-mariadb --cascade=false
-```
diff --git a/charts/nextcloud/charts/mariadb/files/docker-entrypoint-initdb.d/README.md b/charts/nextcloud/charts/mariadb/files/docker-entrypoint-initdb.d/README.md
deleted file mode 100755
index aaddde3030f2dddb2b274459d5167f099702e14d..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/files/docker-entrypoint-initdb.d/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-You can copy here your custom .sh, .sql or .sql.gz file so they are executed during the first boot of the image.
-
-More info in the [bitnami-docker-mariadb](https://github.com/bitnami/bitnami-docker-mariadb#initializing-a-new-instance) repository.
\ No newline at end of file
diff --git a/charts/nextcloud/charts/mariadb/templates/NOTES.txt b/charts/nextcloud/charts/mariadb/templates/NOTES.txt
deleted file mode 100755
index 768f77fe4369c9125c323d66fb9f6c5b701d8306..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/templates/NOTES.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-
-Please be patient while the chart is being deployed
-
-Tip:
-
- Watch the deployment status using the command: kubectl get pods -w --namespace {{ .Release.Namespace }} -l release={{ .Release.Name }}
-
-Services:
-
- echo Master: {{ template "mariadb.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port }}
-{{- if .Values.replication.enabled }}
- echo Slave: {{ template "slave.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port }}
-{{- end }}
-
-Administrator credentials:
-
- Username: root
- Password : $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode)
-
-To connect to your database:
-
- 1. Run a pod that you can use as a client:
-
- kubectl run {{ template "mariadb.fullname" . }}-client --rm --tty -i --restart='Never' --image {{ template "mariadb.image" . }} --namespace {{ .Release.Namespace }} --command -- bash
-
- 2. To connect to master service (read/write):
-
- mysql -h {{ template "mariadb.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local -uroot -p {{ .Values.db.name }}
-
-{{- if .Values.replication.enabled }}
-
- 3. To connect to slave service (read-only):
-
- mysql -h {{ template "slave.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local -uroot -p {{ .Values.db.name }}
-{{- end }}
-
-To upgrade this helm chart:
-
- 1. Obtain the password as described on the 'Administrator credentials' section and set the 'rootUser.password' parameter as shown below:
-
- ROOT_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode)
- helm upgrade {{ .Release.Name }} stable/mariadb --set rootUser.password=$ROOT_PASSWORD
diff --git a/charts/nextcloud/charts/mariadb/templates/_helpers.tpl b/charts/nextcloud/charts/mariadb/templates/_helpers.tpl
deleted file mode 100755
index 99ff7806d80cbf3754e316341fdb7ac405fd87ad..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/templates/_helpers.tpl
+++ /dev/null
@@ -1,97 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "mariadb.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "mariadb.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- printf .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "master.fullname" -}}
-{{- if .Values.replication.enabled -}}
-{{- printf "%s-%s" .Release.Name "mariadb-master" | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "slave.fullname" -}}
-{{- printf "%s-%s" .Release.Name "mariadb-slave" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "mariadb.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Return the proper MariaDB image name
-*/}}
-{{- define "mariadb.image" -}}
-{{- $registryName := .Values.image.registry -}}
-{{- $repositoryName := .Values.image.repository -}}
-{{- $tag := .Values.image.tag | toString -}}
-{{/*
-Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
-but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
-Also, we can't use a single if because lazy evaluation is not an option
-*/}}
-{{- if .Values.global }}
- {{- if .Values.global.imageRegistry }}
- {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
- {{- else -}}
- {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
- {{- end -}}
-{{- else -}}
- {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the proper metrics image name
-*/}}
-{{- define "metrics.image" -}}
-{{- $registryName := .Values.metrics.image.registry -}}
-{{- $repositoryName := .Values.metrics.image.repository -}}
-{{- $tag := .Values.metrics.image.tag | toString -}}
-{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-{{- end -}}
-
-{{ template "mariadb.initdbScriptsCM" . }}
-{{/*
-Get the initialization scripts ConfigMap name.
-*/}}
-{{- define "mariadb.initdbScriptsCM" -}}
-{{- if .Values.initdbScriptsConfigMap -}}
-{{- printf "%s" .Values.initdbScriptsConfigMap -}}
-{{- else -}}
-{{- printf "%s-init-scripts" (include "mariadb.fullname" .) -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "mariadb.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
- {{ default (include "mariadb.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
- {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
diff --git a/charts/nextcloud/charts/mariadb/templates/initialization-configmap.yaml b/charts/nextcloud/charts/mariadb/templates/initialization-configmap.yaml
deleted file mode 100755
index f7380aff77ed551df1c3cea898b47796791d71c6..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/templates/initialization-configmap.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-{{- if and (or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScripts) (not .Values.initdbScriptsConfigMap) }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ template "master.fullname" . }}-init-scripts
- labels:
- app: {{ template "mariadb.name" . }}
- chart: {{ template "mariadb.chart" . }}
- release: {{ .Release.Name | quote }}
- heritage: {{ .Release.Service | quote }}
- component: "master"
-{{- if and (.Files.Glob "files/docker-entrypoint-initdb.d/*.sql.gz") (not .Values.initdbScriptsConfigMap) }}
-binaryData:
-{{- $root := . }}
-{{- range $path, $bytes := .Files.Glob "files/docker-entrypoint-initdb.d/*.sql.gz" }}
- {{ base $path }}: {{ $root.Files.Get $path | b64enc | quote }}
-{{- end }}
-{{- end }}
-data:
-{{- if and (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql}") (not .Values.initdbScriptsConfigMap) }}
-{{ (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql}").AsConfig | indent 2 }}
-{{- end }}
-{{- with .Values.initdbScripts }}
-{{ toYaml . | indent 2 }}
-{{- end }}
-{{ end }}
diff --git a/charts/nextcloud/charts/mariadb/templates/master-configmap.yaml b/charts/nextcloud/charts/mariadb/templates/master-configmap.yaml
deleted file mode 100755
index 880a10198da994d64697c9b979fcd37d7aef979b..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/templates/master-configmap.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-{{- if .Values.master.config }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ template "master.fullname" . }}
- labels:
- app: {{ template "mariadb.name" . }}
- component: "master"
- chart: {{ template "mariadb.chart" . }}
- release: {{ .Release.Name | quote }}
- heritage: {{ .Release.Service | quote }}
-data:
- my.cnf: |-
-{{ .Values.master.config | indent 4 }}
-{{- end -}}
diff --git a/charts/nextcloud/charts/mariadb/templates/master-statefulset.yaml b/charts/nextcloud/charts/mariadb/templates/master-statefulset.yaml
deleted file mode 100755
index c077a3b6089ebe68c98d7277082ac6dfb6c2d76d..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/templates/master-statefulset.yaml
+++ /dev/null
@@ -1,247 +0,0 @@
-apiVersion: apps/v1beta1
-kind: StatefulSet
-metadata:
- name: {{ template "master.fullname" . }}
- labels:
- app: "{{ template "mariadb.name" . }}"
- chart: {{ template "mariadb.chart" . }}
- component: "master"
- release: {{ .Release.Name | quote }}
- heritage: {{ .Release.Service | quote }}
-spec:
- selector:
- matchLabels:
- release: "{{ .Release.Name }}"
- component: "master"
- app: {{ template "mariadb.name" . }}
- serviceName: "{{ template "master.fullname" . }}"
- replicas: 1
- updateStrategy:
- type: RollingUpdate
- template:
- metadata:
- {{- if .Values.master.annotations }}
- annotations:
- {{- range .Values.master.annotations }}
- {{ .key }}: '{{ .value }}'
- {{- end }}
- {{- end }}
- labels:
- app: "{{ template "mariadb.name" . }}"
- component: "master"
- release: "{{ .Release.Name }}"
- chart: {{ template "mariadb.chart" . }}
- spec:
- serviceAccountName: "{{ template "mariadb.serviceAccountName" . }}"
- {{- if .Values.securityContext.enabled }}
- securityContext:
- fsGroup: {{ .Values.securityContext.fsGroup }}
- runAsUser: {{ .Values.securityContext.runAsUser }}
- {{- end }}
- {{- if eq .Values.master.antiAffinity "hard" }}
- affinity:
- {{- with .Values.master.affinity }}
-{{ toYaml . | indent 8 }}
- {{- end }}
- podAntiAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- - topologyKey: "kubernetes.io/hostname"
- labelSelector:
- matchLabels:
- app: "{{ template "mariadb.name" . }}"
- release: "{{ .Release.Name }}"
- {{- else if eq .Values.master.antiAffinity "soft" }}
- affinity:
- {{- with .Values.master.affinity }}
-{{ toYaml . | indent 8 }}
- {{- end }}
- podAntiAffinity:
- preferredDuringSchedulingIgnoredDuringExecution:
- - weight: 1
- podAffinityTerm:
- topologyKey: kubernetes.io/hostname
- labelSelector:
- matchLabels:
- app: "{{ template "mariadb.name" . }}"
- release: "{{ .Release.Name }}"
- {{- else}}
- {{- with .Values.master.affinity }}
- affinity:
-{{ toYaml . | indent 8 }}
- {{- end }}
- {{- end }}
- {{- with .Values.master.tolerations }}
- tolerations:
-{{ toYaml . | indent 8 }}
- {{- end }}
- {{- if .Values.image.pullSecrets }}
- imagePullSecrets:
- {{- range .Values.image.pullSecrets }}
- - name: {{ . }}
- {{- end}}
- {{- end }}
- {{- if .Values.master.extraInitContainers }}
- initContainers:
-{{ tpl .Values.master.extraInitContainers . | indent 6}}
- {{- end }}
- containers:
- - name: "mariadb"
- image: {{ template "mariadb.image" . }}
- imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
- env:
- {{- if .Values.image.debug}}
- - name: BITNAMI_DEBUG
- value: "true"
- {{- end }}
- - name: MARIADB_ROOT_PASSWORD
- valueFrom:
- secretKeyRef:
- {{- if .Values.existingSecret }}
- name: {{ .Values.existingSecret }}
- {{- else }}
- name: {{ template "mariadb.fullname" . }}
- {{- end }}
- key: mariadb-root-password
- {{- if .Values.db.user }}
- - name: MARIADB_USER
- value: "{{ .Values.db.user }}"
- - name: MARIADB_PASSWORD
- valueFrom:
- secretKeyRef:
- {{- if .Values.existingSecret }}
- name: {{ .Values.existingSecret }}
- {{- else }}
- name: {{ template "mariadb.fullname" . }}
- {{- end }}
- key: mariadb-password
- {{- end }}
- - name: MARIADB_DATABASE
- value: "{{ .Values.db.name }}"
- {{- if .Values.replication.enabled }}
- - name: MARIADB_REPLICATION_MODE
- value: "master"
- - name: MARIADB_REPLICATION_USER
- value: "{{ .Values.replication.user }}"
- - name: MARIADB_REPLICATION_PASSWORD
- valueFrom:
- secretKeyRef:
- {{- if .Values.existingSecret }}
- name: {{ .Values.existingSecret }}
- {{- else }}
- name: {{ template "mariadb.fullname" . }}
- {{- end }}
- key: mariadb-replication-password
- {{- end }}
- ports:
- - name: mysql
- containerPort: 3306
- {{- if .Values.master.livenessProbe.enabled }}
- livenessProbe:
- exec:
- command: ["sh", "-c", "exec mysqladmin status -uroot -p$MARIADB_ROOT_PASSWORD"]
- initialDelaySeconds: {{ .Values.master.livenessProbe.initialDelaySeconds }}
- periodSeconds: {{ .Values.master.livenessProbe.periodSeconds }}
- timeoutSeconds: {{ .Values.master.livenessProbe.timeoutSeconds }}
- successThreshold: {{ .Values.master.livenessProbe.successThreshold }}
- failureThreshold: {{ .Values.master.livenessProbe.failureThreshold }}
- {{- end }}
- {{- if .Values.master.readinessProbe.enabled }}
- readinessProbe:
- exec:
- command: ["sh", "-c", "exec mysqladmin status -uroot -p$MARIADB_ROOT_PASSWORD"]
- initialDelaySeconds: {{ .Values.master.readinessProbe.initialDelaySeconds }}
- periodSeconds: {{ .Values.master.readinessProbe.periodSeconds }}
- timeoutSeconds: {{ .Values.master.readinessProbe.timeoutSeconds }}
- successThreshold: {{ .Values.master.readinessProbe.successThreshold }}
- failureThreshold: {{ .Values.master.readinessProbe.failureThreshold }}
- {{- end }}
- resources:
-{{ toYaml .Values.master.resources | indent 10 }}
- volumeMounts:
- - name: data
- mountPath: {{ .Values.master.persistence.mountPath }}
- {{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }}
- - name: custom-init-scripts
- mountPath: /docker-entrypoint-initdb.d
- {{- end }}
- {{- if .Values.master.config }}
- - name: config
- mountPath: /opt/bitnami/mariadb/conf/my.cnf
- subPath: my.cnf
- {{- end }}
-{{- if .Values.metrics.enabled }}
- - name: metrics
- image: {{ template "metrics.image" . }}
- imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }}
- env:
- - name: MARIADB_ROOT_PASSWORD
- valueFrom:
- secretKeyRef:
- {{- if .Values.existingSecret }}
- name: {{ .Values.existingSecret }}
- {{- else }}
- name: {{ template "mariadb.fullname" . }}
- {{- end }}
- key: mariadb-root-password
- command: [ 'sh', '-c', 'DATA_SOURCE_NAME="root:$MARIADB_ROOT_PASSWORD@(localhost:3306)/" /bin/mysqld_exporter' ]
- ports:
- - name: metrics
- containerPort: 9104
- livenessProbe:
- httpGet:
- path: /metrics
- port: metrics
- initialDelaySeconds: 15
- timeoutSeconds: 5
- readinessProbe:
- httpGet:
- path: /metrics
- port: metrics
- initialDelaySeconds: 5
- timeoutSeconds: 1
- resources:
-{{ toYaml .Values.metrics.resources | indent 10 }}
-{{- end }}
- volumes:
- {{- if .Values.master.config }}
- - name: config
- configMap:
- name: {{ template "master.fullname" . }}
- {{- end }}
- {{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }}
- - name: custom-init-scripts
- configMap:
- name: {{ template "mariadb.initdbScriptsCM" . }}
- {{- end }}
-{{- if and .Values.master.persistence.enabled .Values.master.persistence.existingClaim }}
- - name: data
- persistentVolumeClaim:
- claimName: {{ .Values.master.persistence.existingClaim }}
-{{- else if not .Values.master.persistence.enabled }}
- - name: data
- emptyDir: {}
-{{- else if and .Values.master.persistence.enabled (not .Values.master.persistence.existingClaim) }}
- volumeClaimTemplates:
- - metadata:
- name: data
- labels:
- app: "{{ template "mariadb.name" . }}"
- component: "master"
- release: {{ .Release.Name | quote }}
- heritage: {{ .Release.Service | quote }}
- spec:
- accessModes:
- {{- range .Values.master.persistence.accessModes }}
- - {{ . | quote }}
- {{- end }}
- resources:
- requests:
- storage: {{ .Values.master.persistence.size | quote }}
- {{- if .Values.master.persistence.storageClass }}
- {{- if (eq "-" .Values.master.persistence.storageClass) }}
- storageClassName: ""
- {{- else }}
- storageClassName: {{ .Values.master.persistence.storageClass | quote }}
- {{- end }}
- {{- end }}
-{{- end }}
diff --git a/charts/nextcloud/charts/mariadb/templates/master-svc.yaml b/charts/nextcloud/charts/mariadb/templates/master-svc.yaml
deleted file mode 100755
index 56810b44b735ff2cb5d74f88b101ee26b1a96535..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/templates/master-svc.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ template "mariadb.fullname" . }}
- labels:
- app: "{{ template "mariadb.name" . }}"
- component: "master"
- chart: {{ template "mariadb.chart" . }}
- release: {{ .Release.Name | quote }}
- heritage: {{ .Release.Service | quote }}
-{{- if .Values.metrics.enabled }}
- annotations:
-{{ toYaml .Values.metrics.annotations | indent 4 }}
-{{- end }}
-spec:
- type: {{ .Values.service.type }}
- {{- if eq .Values.service.type "ClusterIP" }}
- {{- if .Values.service.clusterIp }}
- clusterIP: {{ .Values.service.clusterIp }}
- {{- end }}
- {{- end }}
- ports:
- - name: mysql
- port: {{ .Values.service.port }}
- targetPort: mysql
-{{- if eq .Values.service.type "NodePort" }}
-{{- if .Values.service.nodePort }}
-{{- if .Values.service.nodePort.master }}
- nodePort: {{ .Values.service.nodePort.master }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- if .Values.metrics.enabled }}
- - name: metrics
- port: 9104
- targetPort: metrics
-{{- end }}
- selector:
- app: "{{ template "mariadb.name" . }}"
- component: "master"
- release: "{{ .Release.Name }}"
diff --git a/charts/nextcloud/charts/mariadb/templates/secrets.yaml b/charts/nextcloud/charts/mariadb/templates/secrets.yaml
deleted file mode 100755
index 401691c1035de71db6712ad8c4a51636b21ccbb3..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/templates/secrets.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-{{- if (not .Values.existingSecret) -}}
-apiVersion: v1
-kind: Secret
-metadata:
- name: {{ template "mariadb.fullname" . }}
- labels:
- app: "{{ template "mariadb.name" . }}"
- chart: {{ template "mariadb.chart" . }}
- release: {{ .Release.Name | quote }}
- heritage: {{ .Release.Service | quote }}
-type: Opaque
-data:
- {{- if .Values.rootUser.password }}
- mariadb-root-password: "{{ .Values.rootUser.password | b64enc }}"
- {{- else if (not .Values.rootUser.forcePassword) }}
- mariadb-root-password: "{{ randAlphaNum 10 | b64enc }}"
- {{ else }}
- mariadb-root-password: {{ required "A MariaDB Root Password is required!" .Values.rootUser.password }}
- {{- end }}
- {{- if .Values.db.user }}
- {{- if .Values.db.password }}
- mariadb-password: "{{ .Values.db.password | b64enc }}"
- {{- else if (not .Values.db.forcePassword) }}
- mariadb-password: "{{ randAlphaNum 10 | b64enc }}"
- {{- else }}
- mariadb-password: {{ required "A MariaDB Database Password is required!" .Values.db.password }}
- {{- end }}
- {{- end }}
- {{- if .Values.replication.enabled }}
- {{- if .Values.replication.password }}
- mariadb-replication-password: "{{ .Values.replication.password | b64enc }}"
- {{- else if (not .Values.replication.forcePassword) }}
- mariadb-replication-password: "{{ randAlphaNum 10 | b64enc }}"
- {{- else }}
- mariadb-replication-password: {{ required "A MariaDB Replication Password is required!" .Values.replication.password }}
- {{- end }}
- {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/charts/nextcloud/charts/mariadb/templates/slave-configmap.yaml b/charts/nextcloud/charts/mariadb/templates/slave-configmap.yaml
deleted file mode 100755
index 056cf5c0700de5157bda401afed9022d0f5da0ec..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/templates/slave-configmap.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-{{- if and .Values.replication.enabled .Values.slave.config }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ template "slave.fullname" . }}
- labels:
- app: {{ template "mariadb.name" . }}
- component: "slave"
- chart: {{ template "mariadb.chart" . }}
- release: {{ .Release.Name | quote }}
- heritage: {{ .Release.Service | quote }}
-data:
- my.cnf: |-
-{{ .Values.slave.config | indent 4 }}
-{{- end }}
diff --git a/charts/nextcloud/charts/mariadb/templates/slave-statefulset.yaml b/charts/nextcloud/charts/mariadb/templates/slave-statefulset.yaml
deleted file mode 100755
index f2cab6162eefa59c8ed3487a43bbe941e9b7d1cd..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/templates/slave-statefulset.yaml
+++ /dev/null
@@ -1,225 +0,0 @@
-{{- if .Values.replication.enabled }}
-apiVersion: apps/v1beta1
-kind: StatefulSet
-metadata:
- name: {{ template "slave.fullname" . }}
- labels:
- app: "{{ template "mariadb.name" . }}"
- chart: {{ template "mariadb.chart" . }}
- component: "slave"
- release: {{ .Release.Name | quote }}
- heritage: {{ .Release.Service | quote }}
-spec:
- selector:
- matchLabels:
- release: "{{ .Release.Name }}"
- component: "slave"
- app: {{ template "mariadb.name" . }}
- serviceName: "{{ template "slave.fullname" . }}"
- replicas: {{ .Values.slave.replicas }}
- updateStrategy:
- type: RollingUpdate
- template:
- metadata:
- {{- if .Values.slave.annotations }}
- annotations:
- {{- range .Values.slave.annotations }}
- {{ .key }}: '{{ .value }}'
- {{- end }}
- {{- end }}
- labels:
- app: "{{ template "mariadb.name" . }}"
- component: "slave"
- release: "{{ .Release.Name }}"
- chart: {{ template "mariadb.chart" . }}
- spec:
- serviceAccountName: "{{ template "mariadb.serviceAccountName" . }}"
- {{- if .Values.securityContext.enabled }}
- securityContext:
- fsGroup: {{ .Values.securityContext.fsGroup }}
- runAsUser: {{ .Values.securityContext.runAsUser }}
- {{- end }}
- {{- if eq .Values.slave.antiAffinity "hard" }}
- affinity:
- {{- with .Values.slave.affinity }}
-{{ toYaml . | indent 8 }}
- {{- end }}
- podAntiAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- - topologyKey: "kubernetes.io/hostname"
- labelSelector:
- matchLabels:
- app: "{{ template "mariadb.name" . }}"
- release: "{{ .Release.Name }}"
- {{- else if eq .Values.slave.antiAffinity "soft" }}
- affinity:
- {{- with .Values.slave.affinity }}
-{{ toYaml . | indent 8 }}
- {{- end }}
- podAntiAffinity:
- preferredDuringSchedulingIgnoredDuringExecution:
- - weight: 1
- podAffinityTerm:
- topologyKey: kubernetes.io/hostname
- labelSelector:
- matchLabels:
- app: "{{ template "mariadb.name" . }}"
- release: "{{ .Release.Name }}"
- {{- else}}
- {{- with .Values.slave.affinity }}
- affinity:
-{{ toYaml . | indent 8 }}
- {{- end }}
- {{- end }}
- {{- with .Values.slave.tolerations }}
- tolerations:
-{{ toYaml . | indent 8 }}
- {{- end }}
- {{- if .Values.image.pullSecrets }}
- imagePullSecrets:
- {{- range .Values.image.pullSecrets }}
- - name: {{ . }}
- {{- end}}
- {{- end }}
- {{- if .Values.master.extraInitContainers }}
- initContainers:
-{{ tpl .Values.master.extraInitContainers . | indent 6}}
- {{- end }}
- containers:
- - name: "mariadb"
- image: {{ template "mariadb.image" . }}
- imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
- env:
- {{- if .Values.image.debug}}
- - name: BITNAMI_DEBUG
- value: "true"
- {{- end }}
- - name: MARIADB_REPLICATION_MODE
- value: "slave"
- - name: MARIADB_MASTER_HOST
- value: {{ template "mariadb.fullname" . }}
- - name: MARIADB_MASTER_PORT_NUMBER
- value: "3306"
- - name: MARIADB_MASTER_ROOT_USER
- value: "root"
- - name: MARIADB_MASTER_ROOT_PASSWORD
- valueFrom:
- secretKeyRef:
- {{- if .Values.existingSecret }}
- name: {{ .Values.existingSecret }}
- {{- else }}
- name: {{ template "mariadb.fullname" . }}
- {{- end }}
- key: mariadb-root-password
- - name: MARIADB_REPLICATION_USER
- value: "{{ .Values.replication.user }}"
- - name: MARIADB_REPLICATION_PASSWORD
- valueFrom:
- secretKeyRef:
- {{- if .Values.existingSecret }}
- name: {{ .Values.existingSecret }}
- {{- else }}
- name: {{ template "mariadb.fullname" . }}
- {{- end }}
- key: mariadb-replication-password
- ports:
- - name: mysql
- containerPort: 3306
- {{- if .Values.slave.livenessProbe.enabled }}
- livenessProbe:
- exec:
- command: ["sh", "-c", "exec mysqladmin status -uroot -p$MARIADB_MASTER_ROOT_PASSWORD"]
- initialDelaySeconds: {{ .Values.slave.livenessProbe.initialDelaySeconds }}
- periodSeconds: {{ .Values.slave.livenessProbe.periodSeconds }}
- timeoutSeconds: {{ .Values.slave.livenessProbe.timeoutSeconds }}
- successThreshold: {{ .Values.slave.livenessProbe.successThreshold }}
- failureThreshold: {{ .Values.slave.livenessProbe.failureThreshold }}
- {{- end }}
- {{- if .Values.slave.readinessProbe.enabled }}
- readinessProbe:
- exec:
- command: ["sh", "-c", "exec mysqladmin status -uroot -p$MARIADB_MASTER_ROOT_PASSWORD"]
- initialDelaySeconds: {{ .Values.slave.readinessProbe.initialDelaySeconds }}
- periodSeconds: {{ .Values.slave.readinessProbe.periodSeconds }}
- timeoutSeconds: {{ .Values.slave.readinessProbe.timeoutSeconds }}
- successThreshold: {{ .Values.slave.readinessProbe.successThreshold }}
- failureThreshold: {{ .Values.slave.readinessProbe.failureThreshold }}
- {{- end }}
- resources:
-{{ toYaml .Values.slave.resources | indent 10 }}
- volumeMounts:
- - name: data
- mountPath: /bitnami/mariadb
-{{- if .Values.slave.config }}
- - name: config
- mountPath: /opt/bitnami/mariadb/conf/my.cnf
- subPath: my.cnf
-{{- end }}
-{{- if .Values.metrics.enabled }}
- - name: metrics
- image: {{ template "metrics.image" . }}
- imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }}
- env:
- - name: MARIADB_MASTER_ROOT_PASSWORD
- valueFrom:
- secretKeyRef:
- {{- if .Values.existingSecret }}
- name: {{ .Values.existingSecret }}
- {{- else }}
- name: {{ template "mariadb.fullname" . }}
- {{- end }}
- key: mariadb-root-password
- command: [ 'sh', '-c', 'DATA_SOURCE_NAME="root:$MARIADB_MASTER_ROOT_PASSWORD@(localhost:3306)/" /bin/mysqld_exporter' ]
- ports:
- - name: metrics
- containerPort: 9104
- livenessProbe:
- httpGet:
- path: /metrics
- port: metrics
- initialDelaySeconds: 15
- timeoutSeconds: 5
- readinessProbe:
- httpGet:
- path: /metrics
- port: metrics
- initialDelaySeconds: 5
- timeoutSeconds: 1
- resources:
-{{ toYaml .Values.metrics.resources | indent 10 }}
-{{- end }}
- volumes:
- {{- if .Values.slave.config }}
- - name: config
- configMap:
- name: {{ template "slave.fullname" . }}
- {{- end }}
-{{- if .Values.slave.persistence.enabled }}
- volumeClaimTemplates:
- - metadata:
- name: data
- labels:
- app: "{{ template "mariadb.name" . }}"
- component: "slave"
- release: {{ .Release.Name | quote }}
- heritage: {{ .Release.Service | quote }}
- spec:
- accessModes:
- {{- range .Values.slave.persistence.accessModes }}
- - {{ . | quote }}
- {{- end }}
- resources:
- requests:
- storage: {{ .Values.slave.persistence.size | quote }}
- {{- if .Values.slave.persistence.storageClass }}
- {{- if (eq "-" .Values.slave.persistence.storageClass) }}
- storageClassName: ""
- {{- else }}
- storageClassName: {{ .Values.slave.persistence.storageClass | quote }}
- {{- end }}
- {{- end }}
-{{- else }}
- - name: "data"
- emptyDir: {}
-{{- end }}
-{{- end }}
diff --git a/charts/nextcloud/charts/mariadb/templates/slave-svc.yaml b/charts/nextcloud/charts/mariadb/templates/slave-svc.yaml
deleted file mode 100755
index c41ecb7524a4aa84fec8b5cc4bb7e970d30c3afc..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/templates/slave-svc.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-{{- if .Values.replication.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ template "slave.fullname" . }}
- labels:
- app: "{{ template "mariadb.name" . }}"
- chart: {{ template "mariadb.chart" . }}
- component: "slave"
- release: {{ .Release.Name | quote }}
- heritage: {{ .Release.Service | quote }}
-{{- if .Values.metrics.enabled }}
- annotations:
-{{ toYaml .Values.metrics.annotations | indent 4 }}
-{{- end }}
-spec:
- type: {{ .Values.service.type }}
- {{- if eq .Values.service.type "ClusterIP" }}
- {{- if .Values.service.clusterIp }}
- clusterIP: {{ .Values.service.clusterIp }}
- {{- end }}
- {{- end }}
- ports:
- - name: mysql
- port: {{ .Values.service.port }}
- targetPort: mysql
-{{- if (eq .Values.service.type "NodePort") }}
-{{- if .Values.service.nodePort }}
-{{- if .Values.service.nodePort.slave }}
- nodePort: {{ .Values.service.nodePort.slave }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- if .Values.metrics.enabled }}
- - name: metrics
- port: 9104
- targetPort: metrics
-{{- end }}
- selector:
- app: "{{ template "mariadb.name" . }}"
- component: "slave"
- release: "{{ .Release.Name }}"
-{{- end }}
diff --git a/charts/nextcloud/charts/mariadb/templates/test-runner.yaml b/charts/nextcloud/charts/mariadb/templates/test-runner.yaml
deleted file mode 100755
index c9821ced37c00f32976a97a9e7120f53b8fe4040..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/templates/test-runner.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
- name: "{{ template "mariadb.fullname" . }}-test-{{ randAlphaNum 5 | lower }}"
- annotations:
- "helm.sh/hook": test-success
-spec:
- initContainers:
- - name: "test-framework"
- image: "dduportal/bats:0.4.0"
- command:
- - "bash"
- - "-c"
- - |
- set -ex
- # copy bats to tools dir
- cp -R /usr/local/libexec/ /tools/bats/
- volumeMounts:
- - mountPath: /tools
- name: tools
- containers:
- - name: mariadb-test
- image: {{ template "mariadb.image" . }}
- imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
- command: ["/tools/bats/bats", "-t", "/tests/run.sh"]
- env:
- - name: MARIADB_ROOT_PASSWORD
- valueFrom:
- secretKeyRef:
- {{- if .Values.existingSecret }}
- name: {{ .Values.existingSecret }}
- {{- else }}
- name: {{ template "mariadb.fullname" . }}
- {{- end }}
- key: mariadb-root-password
- volumeMounts:
- - mountPath: /tests
- name: tests
- readOnly: true
- - mountPath: /tools
- name: tools
- volumes:
- - name: tests
- configMap:
- name: {{ template "mariadb.fullname" . }}-tests
- - name: tools
- emptyDir: {}
- restartPolicy: Never
diff --git a/charts/nextcloud/charts/mariadb/templates/tests.yaml b/charts/nextcloud/charts/mariadb/templates/tests.yaml
deleted file mode 100755
index 957f3fd1e0327e0140796348093a6c7d47b21197..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/templates/tests.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ template "mariadb.fullname" . }}-tests
-data:
- run.sh: |-
- @test "Testing MariaDB is accessible" {
- mysql -h {{ template "mariadb.fullname" . }} -uroot -p$MARIADB_ROOT_PASSWORD -e 'show databases;'
- }
diff --git a/charts/nextcloud/charts/mariadb/values-production.yaml b/charts/nextcloud/charts/mariadb/values-production.yaml
deleted file mode 100755
index f8e3b0dae36bd08e0f9283f04e625858ddb5bfd9..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/values-production.yaml
+++ /dev/null
@@ -1,336 +0,0 @@
-## Global Docker image registry
-## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
-##
-# global:
-# imageRegistry:
-
-## Bitnami MariaDB image
-## ref: https://hub.docker.com/r/bitnami/mariadb/tags/
-##
-image:
- registry: docker.io
- repository: bitnami/mariadb
- tag: 10.1.37
- ## 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
- ##
- pullPolicy: IfNotPresent
- ## Optionally specify an array of imagePullSecrets.
- ## Secrets must be manually created in the namespace.
- ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
- ##
- # pullSecrets:
- # - myRegistrKeySecretName
-
- ## Set to true if you would like to see extra information on logs
- ## It turns BASH and NAMI debugging in minideb
- ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging
- debug: false
-
-service:
- ## Kubernetes service type, ClusterIP and NodePort are supported at present
- type: ClusterIP
- # clusterIp: None
- port: 3306
- ## Specify the nodePort value for the LoadBalancer and NodePort service types.
- ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
- ##
- # nodePort:
- # master: 30001
- # slave: 30002
-
-## Pods Service Account
-## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
-serviceAccount:
- ## Specifies whether a ServiceAccount should be created
- ##
- create: false
- ## The name of the ServiceAccount to use.
- ## If not set and create is true, a name is generated using the mariadb.fullname template
- # name:
-
-## Pod Security Context
-## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
-##
-securityContext:
- enabled: true
- fsGroup: 1001
- runAsUser: 1001
-
-# # Use existing secret (ignores root, db and replication passwords)
-# existingSecret:
-
-rootUser:
- ## MariaDB admin password
- ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-the-root-password-on-first-run
- ##
- password:
- ##
- ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly.
- ## If it is not force, a random password will be generated.
- forcePassword: true
-
-db:
- ## MariaDB username and password
- ## ref: https://github.com/bitnami/bitnami-docker-mariadb#creating-a-database-user-on-first-run
- ##
- user:
- password:
- ## Password is ignored if existingSecret is specified.
- ## Database to create
- ## ref: https://github.com/bitnami/bitnami-docker-mariadb#creating-a-database-on-first-run
- ##
- name: my_database
- ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly.
- ## If it is not force, a random password will be generated.
- forcePassword: true
-
-replication:
- ## Enable replication. This enables the creation of replicas of MariaDB. If false, only a
- ## master deployment would be created
- enabled: true
- ##
- ## MariaDB replication user
- ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-up-a-replication-cluster
- ##
- user: replicator
- ## MariaDB replication user password
- ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-up-a-replication-cluster
- ##
- password:
- ## Password is ignored if existingSecret is specified.
- ##
- ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly.
- ## If it is not force, a random password will be generated.
- forcePassword: true
-
-## initdb scripts
-## Specify dictionnary of scripts to be run at first boot
-## Alternatively, you can put your scripts under the files/docker-entrypoint-initdb.d directory
-##
-# initdbScripts:
-# my_init_script.sh: |
-# #!/bin/sh
-# echo "Do something."
-#
-## ConfigMap with scripts to be run at first boot
-## Note: This will override initdbScripts
-# initdbScriptsConfigMap:
-
-master:
- ## Mariadb Master additional pod annotations
- ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
- # annotations:
- # - key: key1
- # value: value1
-
- ## Affinity for pod assignment
- ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
- ##
- affinity: {}
-
- ## Kept for backwards compatibility. You can now disable it by removing it.
- ## if you wish to set it through master.affinity.podAntiAffinity instead.
- ##
- antiAffinity: soft
-
- ## Tolerations for pod assignment
- ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
- ##
- tolerations: []
-
- ## Enable persistence using Persistent Volume Claims
- ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
- ##
- persistence:
- ## If true, use a Persistent Volume Claim, If false, use emptyDir
- ##
- enabled: true
- # Enable persistence using an existing PVC
- # existingClaim:
- mountPath: /bitnami/mariadb
- ## Persistent Volume Storage Class
- ## If defined, storageClassName: <storageClass>
- ## If set to "-", storageClassName: "", which disables dynamic provisioning
- ## If undefined (the default) or set to null, no storageClassName spec is
- ## set, choosing the default provisioner. (gp2 on AWS, standard on
- ## GKE, AWS & OpenStack)
- ##
- # storageClass: "-"
- ## Persistent Volume Claim annotations
- ##
- annotations: {}
- ## Persistent Volume Access Mode
- ##
- accessModes:
- - ReadWriteOnce
- ## Persistent Volume size
- ##
- size: 8Gi
- ##
- extraInitContainers: |
- # - name: do-something
- # image: busybox
- # command: ['do', 'something']
-
- ## Configure MySQL with a custom my.cnf file
- ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file
- ##
- config: |-
- [mysqld]
- skip-name-resolve
- explicit_defaults_for_timestamp
- basedir=/opt/bitnami/mariadb
- port=3306
- socket=/opt/bitnami/mariadb/tmp/mysql.sock
- tmpdir=/opt/bitnami/mariadb/tmp
- max_allowed_packet=16M
- bind-address=0.0.0.0
- pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
- log-error=/opt/bitnami/mariadb/logs/mysqld.log
- character-set-server=UTF8
- collation-server=utf8_general_ci
-
- [client]
- port=3306
- socket=/opt/bitnami/mariadb/tmp/mysql.sock
- default-character-set=UTF8
-
- [manager]
- port=3306
- socket=/opt/bitnami/mariadb/tmp/mysql.sock
- pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
-
- ## Configure master resource requests and limits
- ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
- ##
- resources: {}
- livenessProbe:
- enabled: true
- ##
- ## Initializing the database could take some time
- initialDelaySeconds: 120
- ##
- ## Default Kubernetes values
- periodSeconds: 10
- timeoutSeconds: 1
- successThreshold: 1
- failureThreshold: 3
- readinessProbe:
- enabled: true
- initialDelaySeconds: 15
- ##
- ## Default Kubernetes values
- periodSeconds: 10
- timeoutSeconds: 1
- successThreshold: 1
- failureThreshold: 3
-
-slave:
- replicas: 2
-
-
- ## Mariadb Slave additional pod annotations
- ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
- # annotations:
- # - key: key1
- # value: value1
-
- ## Affinity for pod assignment
- ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
- ##
- affinity: {}
-
- ## Kept for backwards compatibility. You can now disable it by removing it.
- ## if you wish to set it through slave.affinity.podAntiAffinity instead.
- ##
- antiAffinity: soft
-
- ## Tolerations for pod assignment
- ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
- ##
- tolerations: []
-
- persistence:
- ## If true, use a Persistent Volume Claim, If false, use emptyDir
- ##
- enabled: true
- # storageClass: "-"
- annotations:
- accessModes:
- - ReadWriteOnce
- ## Persistent Volume size
- ##
- size: 8Gi
- ##
- extraInitContainers: |
- # - name: do-something
- # image: busybox
- # command: ['do', 'something']
-
- ## Configure MySQL slave with a custom my.cnf file
- ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file
- ##
- config: |-
- [mysqld]
- skip-name-resolve
- explicit_defaults_for_timestamp
- basedir=/opt/bitnami/mariadb
- port=3306
- socket=/opt/bitnami/mariadb/tmp/mysql.sock
- tmpdir=/opt/bitnami/mariadb/tmp
- max_allowed_packet=16M
- bind-address=0.0.0.0
- pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
- log-error=/opt/bitnami/mariadb/logs/mysqld.log
- character-set-server=UTF8
- collation-server=utf8_general_ci
-
- [client]
- port=3306
- socket=/opt/bitnami/mariadb/tmp/mysql.sock
- default-character-set=UTF8
-
- [manager]
- port=3306
- socket=/opt/bitnami/mariadb/tmp/mysql.sock
- pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
-
- ##
- ## Configure slave resource requests and limits
- ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
- ##
- resources: {}
- livenessProbe:
- enabled: true
- ##
- ## Initializing the database could take some time
- initialDelaySeconds: 120
- ##
- ## Default Kubernetes values
- periodSeconds: 10
- timeoutSeconds: 1
- successThreshold: 1
- failureThreshold: 3
- readinessProbe:
- enabled: true
- initialDelaySeconds: 15
- ##
- ## Default Kubernetes values
- periodSeconds: 10
- timeoutSeconds: 1
- successThreshold: 1
- failureThreshold: 3
-
-metrics:
- enabled: true
- image:
- registry: docker.io
- repository: prom/mysqld-exporter
- tag: v0.10.0
- pullPolicy: IfNotPresent
- resources: {}
- annotations:
- prometheus.io/scrape: "true"
- prometheus.io/port: "9104"
diff --git a/charts/nextcloud/charts/mariadb/values.yaml b/charts/nextcloud/charts/mariadb/values.yaml
deleted file mode 100755
index 9a2dfd52ab634910328a7fa5af25f48df1a8196f..0000000000000000000000000000000000000000
--- a/charts/nextcloud/charts/mariadb/values.yaml
+++ /dev/null
@@ -1,335 +0,0 @@
-## Global Docker image registry
-## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
-##
-# global:
-# imageRegistry:
-
-## Bitnami MariaDB image
-## ref: https://hub.docker.com/r/bitnami/mariadb/tags/
-##
-image:
- registry: docker.io
- repository: bitnami/mariadb
- tag: 10.1.37
- ## 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
- ##
- pullPolicy: IfNotPresent
- ## Optionally specify an array of imagePullSecrets.
- ## Secrets must be manually created in the namespace.
- ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
- ##
- # pullSecrets:
- # - myRegistrKeySecretName
-
- ## Set to true if you would like to see extra information on logs
- ## It turns BASH and NAMI debugging in minideb
- ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging
- debug: false
-
-service:
- ## Kubernetes service type, ClusterIP and NodePort are supported at present
- type: ClusterIP
- # clusterIp: None
- port: 3306
- ## Specify the nodePort value for the LoadBalancer and NodePort service types.
- ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
- ##
- # nodePort:
- # master: 30001
- # slave: 30002
-
-## Pods Service Account
-## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
-serviceAccount:
- ## Specifies whether a ServiceAccount should be created
- ##
- create: false
- ## The name of the ServiceAccount to use.
- ## If not set and create is true, a name is generated using the mariadb.fullname template
- # name:
-
-## Pod Security Context
-## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
-##
-securityContext:
- enabled: true
- fsGroup: 1001
- runAsUser: 1001
-
-# # Use existing secret (ignores root, db and replication passwords)
-# existingSecret:
-
-rootUser:
- ## MariaDB admin password
- ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-the-root-password-on-first-run
- ##
- password:
- ##
- ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly.
- ## If it is not force, a random password will be generated.
- forcePassword: false
-
-db:
- ## MariaDB username and password
- ## ref: https://github.com/bitnami/bitnami-docker-mariadb#creating-a-database-user-on-first-run
- ##
- user:
- password:
- ## Password is ignored if existingSecret is specified.
- ## Database to create
- ## ref: https://github.com/bitnami/bitnami-docker-mariadb#creating-a-database-on-first-run
- ##
- name: my_database
- ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly.
- ## If it is not force, a random password will be generated.
- forcePassword: false
-
-replication:
- ## Enable replication. This enables the creation of replicas of MariaDB. If false, only a
- ## master deployment would be created
- enabled: true
- ##
- ## MariaDB replication user
- ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-up-a-replication-cluster
- ##
- user: replicator
- ## MariaDB replication user password
- ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-up-a-replication-cluster
- ##
- password:
- ## Password is ignored if existingSecret is specified.
- ##
- ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly.
- ## If it is not force, a random password will be generated.
- forcePassword: false
-
-## initdb scripts
-## Specify dictionnary of scripts to be run at first boot
-## Alternatively, you can put your scripts under the files/docker-entrypoint-initdb.d directory
-##
-# initdbScripts:
-# my_init_script.sh: |
-# #!/bin/sh
-# echo "Do something."
-#
-## ConfigMap with scripts to be run at first boot
-## Note: This will override initdbScripts
-# initdbScriptsConfigMap:
-
-master:
- ## Mariadb Master additional pod annotations
- ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
- # annotations:
- # - key: key1
- # value: value1
-
- ## Affinity for pod assignment
- ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
- ##
- affinity: {}
-
- ## Kept for backwards compatibility. You can now disable it by removing it.
- ## if you wish to set it through master.affinity.podAntiAffinity instead.
- ##
- antiAffinity: soft
-
- ## Tolerations for pod assignment
- ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
- ##
- tolerations: []
-
- ## Enable persistence using Persistent Volume Claims
- ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
- ##
- persistence:
- ## If true, use a Persistent Volume Claim, If false, use emptyDir
- ##
- enabled: true
- # Enable persistence using an existing PVC
- # existingClaim:
- mountPath: /bitnami/mariadb
- ## Persistent Volume Storage Class
- ## If defined, storageClassName: <storageClass>
- ## If set to "-", storageClassName: "", which disables dynamic provisioning
- ## If undefined (the default) or set to null, no storageClassName spec is
- ## set, choosing the default provisioner. (gp2 on AWS, standard on
- ## GKE, AWS & OpenStack)
- ##
- # storageClass: "-"
- ## Persistent Volume Claim annotations
- ##
- annotations: {}
- ## Persistent Volume Access Mode
- ##
- accessModes:
- - ReadWriteOnce
- ## Persistent Volume size
- ##
- size: 8Gi
- ##
- extraInitContainers: |
- # - name: do-something
- # image: busybox
- # command: ['do', 'something']
-
- ## Configure MySQL with a custom my.cnf file
- ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file
- ##
- config: |-
- [mysqld]
- skip-name-resolve
- explicit_defaults_for_timestamp
- basedir=/opt/bitnami/mariadb
- port=3306
- socket=/opt/bitnami/mariadb/tmp/mysql.sock
- tmpdir=/opt/bitnami/mariadb/tmp
- max_allowed_packet=16M
- bind-address=0.0.0.0
- pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
- log-error=/opt/bitnami/mariadb/logs/mysqld.log
- character-set-server=UTF8
- collation-server=utf8_general_ci
-
- [client]
- port=3306
- socket=/opt/bitnami/mariadb/tmp/mysql.sock
- default-character-set=UTF8
-
- [manager]
- port=3306
- socket=/opt/bitnami/mariadb/tmp/mysql.sock
- pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
-
- ## Configure master resource requests and limits
- ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
- ##
- resources: {}
- livenessProbe:
- enabled: true
- ##
- ## Initializing the database could take some time
- initialDelaySeconds: 120
- ##
- ## Default Kubernetes values
- periodSeconds: 10
- timeoutSeconds: 1
- successThreshold: 1
- failureThreshold: 3
- readinessProbe:
- enabled: true
- initialDelaySeconds: 30
- ##
- ## Default Kubernetes values
- periodSeconds: 10
- timeoutSeconds: 1
- successThreshold: 1
- failureThreshold: 3
-
-slave:
- replicas: 1
-
- ## Mariadb Slave additional pod annotations
- ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
- # annotations:
- # - key: key1
- # value: value1
-
- ## Affinity for pod assignment
- ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
- ##
- affinity: {}
-
- ## Kept for backwards compatibility. You can now disable it by removing it.
- ## if you wish to set it through slave.affinity.podAntiAffinity instead.
- ##
- antiAffinity: soft
-
- ## Tolerations for pod assignment
- ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
- ##
- tolerations: []
-
- persistence:
- ## If true, use a Persistent Volume Claim, If false, use emptyDir
- ##
- enabled: true
- # storageClass: "-"
- annotations:
- accessModes:
- - ReadWriteOnce
- ## Persistent Volume size
- ##
- size: 8Gi
- ##
- extraInitContainers: |
- # - name: do-something
- # image: busybox
- # command: ['do', 'something']
-
- ## Configure MySQL slave with a custom my.cnf file
- ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file
- ##
- config: |-
- [mysqld]
- skip-name-resolve
- explicit_defaults_for_timestamp
- basedir=/opt/bitnami/mariadb
- port=3306
- socket=/opt/bitnami/mariadb/tmp/mysql.sock
- tmpdir=/opt/bitnami/mariadb/tmp
- max_allowed_packet=16M
- bind-address=0.0.0.0
- pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
- log-error=/opt/bitnami/mariadb/logs/mysqld.log
- character-set-server=UTF8
- collation-server=utf8_general_ci
-
- [client]
- port=3306
- socket=/opt/bitnami/mariadb/tmp/mysql.sock
- default-character-set=UTF8
-
- [manager]
- port=3306
- socket=/opt/bitnami/mariadb/tmp/mysql.sock
- pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
-
- ##
- ## Configure slave resource requests and limits
- ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
- ##
- resources: {}
- livenessProbe:
- enabled: true
- ##
- ## Initializing the database could take some time
- initialDelaySeconds: 120
- ##
- ## Default Kubernetes values
- periodSeconds: 10
- timeoutSeconds: 1
- successThreshold: 1
- failureThreshold: 3
- readinessProbe:
- enabled: true
- initialDelaySeconds: 45
- ##
- ## Default Kubernetes values
- periodSeconds: 10
- timeoutSeconds: 1
- successThreshold: 1
- failureThreshold: 3
-
-metrics:
- enabled: false
- image:
- registry: docker.io
- repository: prom/mysqld-exporter
- tag: v0.10.0
- pullPolicy: IfNotPresent
- resources: {}
- annotations:
- prometheus.io/scrape: "true"
- prometheus.io/port: "9104"
diff --git a/charts/nextcloud/requirements.lock b/charts/nextcloud/requirements.lock
deleted file mode 100755
index 222b19649568a5b1a371d55d391c9fc73ca5500f..0000000000000000000000000000000000000000
--- a/charts/nextcloud/requirements.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: mariadb
- repository: https://kubernetes-charts.storage.googleapis.com/
- version: 5.5.0
-digest: sha256:66e8bec50806f6576f4954c145d45b44a55975cad4f10b3bdd6cc4e208055bca
-generated: 2019-01-26T18:57:18.847326+01:00
diff --git a/charts/nextcloud/requirements.yaml b/charts/nextcloud/requirements.yaml
deleted file mode 100755
index add52d3d72c02d3fc80a7d9d8a99e88a1daa8452..0000000000000000000000000000000000000000
--- a/charts/nextcloud/requirements.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-dependencies:
-- name: mariadb
- version: ~5.5.0
- repository: https://kubernetes-charts.storage.googleapis.com/
diff --git a/charts/nextcloud/templates/NOTES.txt b/charts/nextcloud/templates/NOTES.txt
deleted file mode 100755
index c755176247de26ff0a29af6dfaeb74d6f9b57497..0000000000000000000000000000000000000000
--- a/charts/nextcloud/templates/NOTES.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-{{- if or .Values.mariadb.enabled .Values.externalDatabase.host -}}
-
-{{- if empty (include "nextcloud.host" .) -}}
-#################################################################################
-### WARNING: You did not provide an external host in your 'helm install' call ###
-#################################################################################
-
-This deployment will be incomplete until you configure nextcloud with a resolvable
-host. To configure nextcloud with the URL of your service:
-
-1. Get the nextcloud URL by running:
-
- {{- if contains "NodePort" .Values.service.type }}
-
- export APP_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "nextcloud.fullname" . }} -o jsonpath="{.spec.ports[0].nodePort}")
- export APP_HOST=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-
- {{- else if contains "LoadBalancer" .Values.service.type }}
-
- NOTE: It may take a few minutes for the LoadBalancer IP to be available.
- Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "nextcloud.fullname" . }}'
-
- export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "nextcloud.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}")
- export APP_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "nextcloud.fullname" . }} -o jsonpath="{.data.nextcloud-password}" | base64 --decode)
- {{- if .Values.mariadb.db.password }}
- export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "nextcloud.mariadb.fullname" . }} -o jsonpath="{.data.mariadb-password}" | base64 --decode)
- {{- end }}
- {{- end }}
-
-2. Complete your nextcloud deployment by running:
-
-{{- if .Values.mariadb.enabled }}
-
- helm upgrade {{ .Release.Name }} stable/nextcloud \
- --set nextcloud.host=$APP_HOST,nextcloud.password=$APP_PASSWORD{{ if .Values.mariadb.db.password }},mariadb.db.password=$APP_DATABASE_PASSWORD{{ end }}
-{{- else }}
-
- ## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ##
-
- helm upgrade {{ .Release.Name }} stable/nextcloud \
- --set nextcloud.password=$APP_PASSWORD,nextcloud.host=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.host) }},externalDatabase.host={{ .Values.externalDatabase.host }}{{- end }}{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }}
-{{- end }}
-
-{{- else -}}
-1. Get the nextcloud URL by running:
-
-{{- if eq .Values.service.type "ClusterIP" }}
-
- export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "nextcloud.fullname" . }}" -o jsonpath="{.items[0].metadata.name}")
- echo http://127.0.0.1:8080/
- kubectl port-forward $POD_NAME 8080:8080
-{{- else }}
-
- echo http://{{ include "nextcloud.host" . }}{{ if .Values.nextcloudPort }}:{{ .Values.nextcloudPort }}{{ end }}/
-{{- end }}
-
-2. Get your nextcloud login credentials by running:
-
- echo User: {{ .Values.nextcloud.username }}
- echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "nextcloud.fullname" . }} -o jsonpath="{.data.nextcloud-password}" | base64 --decode)
-{{- end }}
-
-{{- else -}}
-
-#######################################################################################################
-## WARNING: You did not provide an external database host in your 'helm install' call ##
-## Running Nextcloud with the integrated sqlite database is not recommended for production instances ##
-#######################################################################################################
-
-For better performance etc. you have to configure nextcloud with a resolvable database
-host. To configure nextcloud to use and external database host:
-
-
-1. Complete your nextcloud deployment by running:
-
-{{- if contains "NodePort" .Values.service.type }}
- export APP_HOST=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-{{- else if contains "LoadBalancer" .Values.service.type }}
-
- NOTE: It may take a few minutes for the LoadBalancer IP to be available.
- Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "nextcloud.fullname" . }}'
-
- export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "nextcloud.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}")
-{{- else }}
-
- export APP_HOST=127.0.0.1
-{{- end }}
- export APP_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "nextcloud.fullname" . }} -o jsonpath="{.data.nextcloud-password}" | base64 --decode)
-
- ## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ##
-
- helm upgrade {{ .Release.Name }} stable/nextcloud \
- --set nextcloud.password=$APP_PASSWORD,nextcloud.host=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }},externalDatabase.host=YOUR_EXTERNAL_DATABASE_HOST
-{{- end }}
\ No newline at end of file
diff --git a/charts/nextcloud/templates/_helpers.tpl b/charts/nextcloud/templates/_helpers.tpl
deleted file mode 100755
index 0c406c3aa1f2167de64874ca42d7851b63487455..0000000000000000000000000000000000000000
--- a/charts/nextcloud/templates/_helpers.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "nextcloud.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "nextcloud.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "nextcloud.mariadb.fullname" -}}
-{{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Get the user defined LoadBalancerIP for this release.
-Note, returns 127.0.0.1 if using ClusterIP.
-*/}}
-{{- define "nextcloud.serviceIP" -}}
-{{- if eq .Values.service.type "ClusterIP" -}}
-127.0.0.1
-{{- else -}}
-{{- index .Values (printf "%sLoadBalancerIP" .Chart.Name) | default "" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Gets the host to be used for this application.
-If not using ClusterIP, or if a host or LoadBalancerIP is not defined, the value will be empty.
-*/}}
-{{- define "nextcloud.host" -}}
-{{- $host := index .Values (printf "%sHost" .Chart.Name) | default "" -}}
-{{- default (include "nextcloud.serviceIP" .) $host -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "nextcloud.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
diff --git a/charts/nextcloud/templates/db-secret.yaml b/charts/nextcloud/templates/db-secret.yaml
deleted file mode 100755
index 2bcdc0e7a7f34fa48aa2a60b51f16316accdaf0e..0000000000000000000000000000000000000000
--- a/charts/nextcloud/templates/db-secret.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-{{- if .Values.mariadb.enabled }}
-apiVersion: v1
-kind: Secret
-metadata:
- name: {{ printf "%s-%s" .Release.Name "db" }}
- labels:
- app.kubernetes.io/name: {{ include "nextcloud.name" . }}
- helm.sh/chart: {{ include "nextcloud.chart" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
-type: Opaque
-data:
- db-password: {{ default "" .Values.mariadb.db.password | b64enc | quote }}
- db-username: {{ default "" .Values.mariadb.db.user | b64enc | quote }}
-{{- end }}
diff --git a/charts/nextcloud/templates/deployment.yaml b/charts/nextcloud/templates/deployment.yaml
deleted file mode 100755
index e06a1041a18cb174f3f99241e91fea9b65641a5a..0000000000000000000000000000000000000000
--- a/charts/nextcloud/templates/deployment.yaml
+++ /dev/null
@@ -1,144 +0,0 @@
-{{- if include "nextcloud.host" . -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ template "nextcloud.fullname" . }}
- labels:
- app.kubernetes.io/name: {{ include "nextcloud.name" . }}
- helm.sh/chart: {{ include "nextcloud.chart" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
- replicas: {{ .Values.replicaCount }}
- strategy:
- type: Recreate
- selector:
- matchLabels:
- app.kubernetes.io/name: {{ include "nextcloud.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- template:
- metadata:
- labels:
- app.kubernetes.io/name: {{ include "nextcloud.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- spec:
- {{- if .Values.image.pullSecrets }}
- imagePullSecrets:
- {{- range .Values.image.pullSecrets }}
- - name: {{ . }}
- {{- end}}
- {{- end }}
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
- imagePullPolicy: {{ .Values.image.pullPolicy }}
- env:
- {{- if .Values.internalDatabase.enabled }}
- - name: SQLITE_DATABASE
- value: {{ .Values.internalDatabase.name | quote }}
- {{- else if .Values.mariadb.enabled }}
- - name: MYSQL_HOST
- value: {{ template "nextcloud.mariadb.fullname" . }}
- - name: MYSQL_DATABASE
- value: {{ .Values.mariadb.db.name | quote }}
- - name: MYSQL_USER
- valueFrom:
- secretKeyRef:
- name: {{ printf "%s-%s" .Release.Name "db" }}
- key: db-username
- - name: MYSQL_PASSWORD
- valueFrom:
- secretKeyRef:
- name: {{ printf "%s-%s" .Release.Name "db" }}
- key: db-password
- {{- else }}
- - name: MYSQL_HOST
- value: {{ .Values.externalDatabase.host | quote }}
- - name: MYSQL_DATABASE
- value: {{ .Values.externalDatabase.database | quote }}
- - name: MYSQL_USER
- valueFrom:
- secretKeyRef:
- name: {{ printf "%s-%s" .Release.Name "db" }}
- key: db-username
- - name: MYSQL_PASSWORD
- valueFrom:
- secretKeyRef:
- name: {{ printf "%s-%s" .Release.Name "db" }}
- key: db-password
- {{- end }}
- - name: NEXTCLOUD_ADMIN_USER
- valueFrom:
- secretKeyRef:
- name: {{ template "nextcloud.fullname" . }}
- key: nextcloud-username
- - name: NEXTCLOUD_ADMIN_PASSWORD
- valueFrom:
- secretKeyRef:
- name: {{ template "nextcloud.fullname" . }}
- key: nextcloud-password
- - name: NEXTCLOUD_TRUSTED_DOMAINS
- value: {{ .Values.nextcloud.host }}
- ports:
- - name: http
- containerPort: 80
- protocol: TCP
- livenessProbe:
- httpGet:
- path: /status.php
- port: http
- httpHeaders:
- - name: Host
- value: {{ include "nextcloud.host" . | quote }}
- initialDelaySeconds: 30
- timeoutSeconds: 5
- failureThreshold: 6
- readinessProbe:
- httpGet:
- path: /status.php
- port: http
- httpHeaders:
- - name: Host
- value: {{ include "nextcloud.host" . | quote }}
- initialDelaySeconds: 30
- timeoutSeconds: 3
- periodSeconds: 5
- resources:
-{{ toYaml .Values.resources | indent 10 }}
- volumeMounts:
- - name: nextcloud-data
- mountPath: /var/www/html/
- subPath: root
- - name: nextcloud-data
- mountPath: /var/www/html/data
- subPath: data
- - name: nextcloud-data
- mountPath: /var/www/html/config
- subPath: config
- - name: nextcloud-data
- mountPath: /var/www/html/custom_apps
- subPath: custom_apps
- - name: nextcloud-data
- mountPath: /var/www/html/themes
- subPath: themes
- {{- with .Values.nodeSelector }}
- nodeSelector:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- with .Values.affinity }}
- affinity:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- with .Values.tolerations }}
- tolerations:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- volumes:
- - name: nextcloud-data
- {{- if .Values.persistence.enabled }}
- persistentVolumeClaim:
- claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "nextcloud.fullname" . }}-nextcloud{{- end }}
- {{- else }}
- emptyDir: {}
- {{- end }}
-{{- end -}}
diff --git a/charts/nextcloud/templates/ingress.yaml b/charts/nextcloud/templates/ingress.yaml
deleted file mode 100755
index b02ece4201f21811fb133a15c3d16819565a28dd..0000000000000000000000000000000000000000
--- a/charts/nextcloud/templates/ingress.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-{{- if .Values.ingress.enabled }}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
- name: {{ template "nextcloud.fullname" . }}
- labels:
- app.kubernetes.io/name: {{ include "nextcloud.name" . }}
- helm.sh/chart: {{ include "nextcloud.chart" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.ingress.annotations }}
- annotations:
-{{ toYaml .Values.ingress.annotations | indent 4 }}
-{{- end }}
-spec:
- rules:
- - host: {{ .Values.nextcloud.host }}
- http:
- paths:
- - backend:
- serviceName: {{ template "nextcloud.fullname" . }}
- servicePort: {{ .Values.service.port }}
-{{- if .Values.ingress.tls }}
- tls:
-{{ toYaml .Values.ingress.tls | indent 4 }}
-{{- end -}}
-{{- end }}
diff --git a/charts/nextcloud/templates/nextcloud-pvc.yaml b/charts/nextcloud/templates/nextcloud-pvc.yaml
deleted file mode 100755
index f1a00da58d74846033c495ad9064b7ddd0461103..0000000000000000000000000000000000000000
--- a/charts/nextcloud/templates/nextcloud-pvc.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{- if .Values.persistence.enabled -}}
-{{- if not .Values.persistence.existingClaim -}}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
- name: {{ template "nextcloud.fullname" . }}-nextcloud
-spec:
- accessModes:
- - {{ .Values.persistence.accessMode | quote }}
- resources:
- requests:
- storage: {{ .Values.persistence.size | quote }}
-{{- if .Values.persistence.storageClass }}
-{{- if (eq "-" .Values.persistence.storageClass) }}
- storageClassName: ""
-{{- else }}
- storageClassName: "{{ .Values.persistence.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}
-{{- end -}}
diff --git a/charts/nextcloud/templates/secrets.yaml b/charts/nextcloud/templates/secrets.yaml
deleted file mode 100755
index b24aa69966a2e48616f86798e95515f8a83cffbf..0000000000000000000000000000000000000000
--- a/charts/nextcloud/templates/secrets.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
- name: {{ template "nextcloud.fullname" . }}
- labels:
- app.kubernetes.io/name: {{ include "nextcloud.name" . }}
- helm.sh/chart: {{ include "nextcloud.chart" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
-type: Opaque
-data:
- nextcloud-username: {{ .Values.nextcloud.username | b64enc | quote }}
- {{ if .Values.nextcloud.password }}
- nextcloud-password: {{ .Values.nextcloud.password | b64enc | quote }}
- {{ else }}
- nextcloud-password: {{ randAlphaNum 10 | b64enc | quote }}
- {{ end }}
-
\ No newline at end of file
diff --git a/charts/nextcloud/templates/service.yaml b/charts/nextcloud/templates/service.yaml
deleted file mode 100755
index 290098051a4cd86b5ab86864d40add42e63fe86c..0000000000000000000000000000000000000000
--- a/charts/nextcloud/templates/service.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ template "nextcloud.fullname" . }}
- labels:
- app.kubernetes.io/name: {{ include "nextcloud.name" . }}
- helm.sh/chart: {{ include "nextcloud.chart" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
- type: {{ .Values.service.type }}
- {{- if eq .Values.service.type "LoadBalancer" }}
- loadBalancerIP: {{ default "" .Values.service.loadBalancerIP }}
- {{- end }}
- ports:
- - port: {{ .Values.service.port }}
- targetPort: http
- protocol: TCP
- name: http
- selector:
- app.kubernetes.io/name: {{ include "nextcloud.name" . }}
diff --git a/charts/nextcloud/templates/tests/test-connection.yaml b/charts/nextcloud/templates/tests/test-connection.yaml
deleted file mode 100755
index b1de9095cf7d21922935e21d3748320e61718e69..0000000000000000000000000000000000000000
--- a/charts/nextcloud/templates/tests/test-connection.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
- name: "{{ include "nextcloud.fullname" . }}-test-connection"
- labels:
- app.kubernetes.io/name: {{ include "nextcloud.name" . }}
- helm.sh/chart: {{ include "nextcloud.chart" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
- annotations:
- "helm.sh/hook": test-success
-spec:
- containers:
- - name: wget
- image: busybox
- command: ['wget']
- args: ['--header', 'Host: {{ .Values.nextcloud.host }}', '{{ include "nextcloud.fullname" . }}:{{ .Values.service.port }}/status.php']
- restartPolicy: Never
diff --git a/charts/nextcloud/values-mariadb.yaml b/charts/nextcloud/values-mariadb.yaml
deleted file mode 100755
index cc769937eb846bfce7a34f1823f511e25a940161..0000000000000000000000000000000000000000
--- a/charts/nextcloud/values-mariadb.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-internalDatabase:
- enabled: false
-
-mariadb:
- enabled: true
\ No newline at end of file
diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml
deleted file mode 100755
index 11862bb3471f4e85b01ab29dddcb1e7d5e0a52fd..0000000000000000000000000000000000000000
--- a/charts/nextcloud/values.yaml
+++ /dev/null
@@ -1,160 +0,0 @@
-## Official nextcloud image version
-## ref: https://hub.docker.com/r/library/nextcloud/tags/
-##
-image:
- repository: nextcloud
- tag: 15.0.2-apache
- pullPolicy: IfNotPresent
- # pullSecrets:
- # - myRegistrKeySecretName
-
-nameOverride: ""
-fullnameOverride: ""
-
-# Number of replicas to be deployed
-replicaCount: 1
-
-## Allowing use of ingress controllers
-## ref: https://kubernetes.io/docs/concepts/services-networking/ingress/
-##
-ingress:
- enabled: false
- annotations: {}
- # nginx.ingress.kubernetes.io/proxy-body-size: 4G
- # kubernetes.io/tls-acme: "true"
- # certmanager.k8s.io/cluster-issuer: letsencrypt-prod
- # nginx.ingress.kubernetes.io/server-snippet: |-
- # add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
- # add_header X-Robots-Tag none;
- # add_header X-Download-Options noopen;
- # add_header X-Permitted-Cross-Domain-Policies none;
- # add_header X-Content-Type-Options nosniff;
- # add_header X-XSS-Protection "1; mode=block";
- # add_header Referrer-Policy no-referrer;
- # rewrite ^/.well-known/webfinger /public.php?service=webfinger last;
- # rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
- # rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json;
- # location = /.well-known/carddav {
- # return 301 $scheme://$host/remote.php/dav;
- # }
- # location = /.well-known/caldav {
- # return 301 $scheme://$host/remote.php/dav;
- # }
- # location = /robots.txt {
- # allow all;
- # log_not_found off;
- # access_log off;
- # }
- # location ~ \.(?:png|html|ttf|ico|jpg|jpeg)$ {
- # try_files $uri /index.php$request_uri;
- # # Optional: Don't log access to other assets
- # access_log off;
- # }
- # location / {
- # rewrite ^ /index.php$request_uri;
- # }
- # location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ {
- # deny all;
- # }
- # location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) {
- # deny all;
- # }
- # tls:
- # - secretName: nextcloud-tls
- # hosts:
- # - nextcloud.kube.home
-
-nextcloud:
- host: nextcloud.kube.home
- username: admin
- password: changeme
-
-
-internalDatabase:
- enabled: true
- name: nextcloud
-
-
-##
-## External database configuration
-##
-externalDatabase:
- enabled: false
-
- ## Database host
- host:
-
- ## Database user
- user: nextcloud
-
- ## Database password
- password:
-
- ## Database name
- database: nextcloud
-
-##
-## MariaDB chart configuration
-##
-mariadb:
- ## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters
- enabled: false
-
- db:
- name: nextcloud
- user: nextcloud
- password: changeme
-
- ## Enable persistence using Persistent Volume Claims
- ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
- ##
- persistence:
- enabled: false
- accessMode: ReadWriteOnce
- size: 8Gi
-
-service:
- type: ClusterIP
- port: 8080
- loadBalancerIP: nil
-
-
-## Enable persistence using Persistent Volume Claims
-## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
-##
-persistence:
- enabled: false
- ## nextcloud data Persistent Volume Storage Class
- ## If defined, storageClassName: <storageClass>
- ## If set to "-", storageClassName: "", which disables dynamic provisioning
- ## If undefined (the default) or set to null, no storageClassName spec is
- ## set, choosing the default provisioner. (gp2 on AWS, standard on
- ## GKE, AWS & OpenStack)
- ##
- # storageClass: "-"
-
- ## A manually managed Persistent Volume and Claim
- ## Requires persistence.enabled: true
- ## If defined, PVC must be created manually before volume will be bound
- # existingClaim:
-
- accessMode: ReadWriteOnce
- size: 8Gi
-
-resources: {}
- # We usually recommend not to specify default resources and to leave this as a conscious
- # choice for the user. This also increases chances charts run on environments with little
- # resources, such as Minikube. If you do want to specify resources, uncomment the following
- # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
- # limits:
- # cpu: 100m
- # memory: 128Mi
- # requests:
- # cpu: 100m
- # memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
diff --git a/requirements.yaml b/requirements.yaml
index 696c21fc755e22b00886e87ebbf496e27843f731..0150b1d161d2b3a17c536ae278677a967fc4e769 100644
--- a/requirements.yaml
+++ b/requirements.yaml
@@ -4,7 +4,9 @@ dependencies:
repository: "@stable"
tags:
- nextcloud
+ # Needs https://github.com/helm/charts/pull/13311
- name: collabora-code
+ alias: office
version: 1.0.1
repository: "@stable"
tags:
diff --git a/templates/job.yaml b/templates/job.yaml
index 2ea807ff5c9366c726ffc6aa2c6cb1241f47ed8e..a47d9d39cfb17bb8f5d6e46c7aef33a1447f359c 100644
--- a/templates/job.yaml
+++ b/templates/job.yaml
@@ -1,3 +1,6 @@
+# Work around the fact that we can not index hyphenated names
+# (https://github.com/helm/helm/issues/2993)
+{{- $collabora := index .Values "collabora-code" -}}
apiVersion: batch/v1
kind: Job
metadata:
@@ -30,7 +33,7 @@ spec:
command:
- "/bin/bash"
- "-c"
- - "echo 'install' && php occ app:install richdocuments && echo 'enable' && php occ app:enable richdocuments && echo 'config 1' && php occ config:app:set richdocuments disable_certificate_verification --value yes && echo 'config 2' && php occ config:app:set richdocuments wopi_url --value https://{{ .Values.collabora_server_name }}"
+ - "echo 'install' && php occ app:install richdocuments && echo 'enable' && php occ app:enable richdocuments && echo 'config 1' && php occ config:app:set richdocuments disable_certificate_verification --value yes && echo 'config 2' && php occ config:app:set richdocuments wopi_url --value https://{{ $collabora.collabora.server_name }}"
volumeMounts:
- name: nextcloud-data
mountPath: /var/www/html/
diff --git a/values.yaml b/values.yaml
index 395618a84c91ca8d0389073515dfc89b31c2664b..cf0889961659ec55e0af86a5bf6d460c2546e22c 100644
--- a/values.yaml
+++ b/values.yaml
@@ -6,3 +6,15 @@ nextcloud:
# Enable and configure MariaDB chart
mariadb:
enabled: true
+
+# Necessary so the chart gets installed (because the requirements.yaml has a
+# condition: `condition: mariadb.enabled`
+# Follow https://github.com/helm/helm/issues/5135 for more info
+mariadb:
+ enabled: true
+
+# Increase delay for liveness probe because it is too low (awaiting
+# https://github.com/helm/charts/pull/13311)
+collabora-code:
+ livenessProbe:
+ initialDelaySeconds: 90