Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-02-13 22:47:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/osclass] Major version. Adapt Chart to apiVersion: v2 and Update MariaDB Dependency (#4396)

Browse Source 
* [bitnami/osclass] Bump MariaDB dependency major and drop Helm v2 support

* Remove mariadb debug=true

* Fix README typo

* Format/Fix linter issues in yaml

* Use recommended K8s labels

* Use recommended K8s labels

* Revert "Use recommended K8s labels"

This reverts commit f8202d97a4.

* [bitnami/osclass] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: fdepaz <fdepaz@bitnami.com>
Co-authored-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>
Co-authored-by: Carlos Rodríguez Hernández <carlosrh@vmware.com>
Co-authored-by: Bitnami Containers <containers@bitnami.com>
This commit is contained in:
Francisco de Paz Galán
2020-11-20 11:39:38 +01:00
committed by GitHub
parent be46cb1e46
commit 52ed2b086c
14 changed files with 263 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bitnami/osclass/Chart.lock Normal file
View File

@@ -0,0 +1,6 @@
dependencies:
- name: mariadb
repository: https://charts.bitnami.com/bitnami
version: 9.0.1
digest: sha256:6a5735e0b7e5868bbf3eec9d9d031eb20a5928dd38894899c5bccf2e8f7c5a61
generated: "2020-11-13T10:04:16.639686339Z"

27
bitnami/osclass/Chart.yaml
View File

@@ -1,22 +1,27 @@
apiVersion: v1
name: osclass
version: 7.0.24
annotations:
category: CMS
apiVersion: v2
appVersion: 3.9.0
dependencies:
- condition: mariadb.enabled
name: mariadb
repository: https://charts.bitnami.com/bitnami
version: 9.x.x
description: Osclass is a php script that allows you to quickly create and manage your own free classifieds site.
engine: gotpl
home: https://github.com/bitnami/charts/tree/master/bitnami/osclass
icon: https://bitnami.com/assets/stacks/osclass/img/osclass-stack-110x117.png
keywords:
- osclass
- classifieds
- http
- web
- php
home: https://github.com/bitnami/charts/tree/master/bitnami/osclass
maintainers:
- email: containers@bitnami.com
name: Bitnami
name: osclass
sources:
- https://github.com/bitnami/bitnami-docker-osclass
- https://osclass.org/
maintainers:
- name: Bitnami
email: containers@bitnami.com
engine: gotpl
icon: https://bitnami.com/assets/stacks/osclass/img/osclass-stack-110x117.png
annotations:
category: CMS
version: 8.0.0

118
bitnami/osclass/README.md
View File

@@ -20,7 +20,7 @@ Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment
## Prerequisites
- Kubernetes 1.12+
- Helm 2.12+ or Helm 3.0-beta3+
- Helm 3.0-beta3+
- PV provisioner support in the underlying infrastructure
- ReadWriteMany volumes for deployment scaling
@@ -82,11 +82,6 @@ The following table lists the configurable parameters of the Osclass chart and t
| `persistence.moodle.accessMode` | PVC Access Mode for OSClass volume | `ReadWriteOnce` |
| `persistence.moodle.size` | PVC Storage Request for OSClass volume | `8Gi` |
| `allowEmptyPassword` | Allow DB blank passwords | `yes` |
| `externalDatabase.host` | Host of the external database | `nil` |
| `externalDatabase.port` | Port of the external database | `3306` |
| `externalDatabase.user` | Existing username in the external db | `bn_osclass` |
| `externalDatabase.password` | Password for the above username | `nil` |
| `externalDatabase.database` | Name of the existing database | `bitnami_osclass` |
| `ingress.enabled` | Enable ingress controller resource | `false` |
| `ingress.annotations` | Ingress annotations | `[]` |
| `ingress.certManager` | Add annotations for cert-manager | `false` |
@@ -98,15 +93,6 @@ The following table lists the configurable parameters of the Osclass chart and t
| `ingress.secrets[0].name` | TLS Secret Name | `nil` |
| `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` |
| `ingress.secrets[0].key` | TLS Secret Key | `nil` |
| `mariadb.enabled` | Whether to use the MariaDB chart | `true` |
| `mariadb.db.name` | Database name to create | `bitnami_osclass` |
| `mariadb.db.user` | Database user to create | `bn_osclass` |
| `mariadb.mariadbPassword` | Password for the database | `nil` |
| `mariadb.mariadbRootPassword` | MariaDB admin password | `nil` |
| `mariadb.persistence.enabled` | Enable MariaDB persistence using PVC | `true` |
| `mariadb.persistence.storageClass` | PVC Storage Class for MariaDB volume | `generic` |
| `mariadb.persistence.accessMode` | PVC Access Mode for MariaDB volume | `ReadWriteOnce` |
| `mariadb.persistence.size` | PVC Storage Request for MariaDB volume | `8Gi` |
| `podAnnotations` | Pod annotations | `{}` |
| `affinity` | Map of node/pod affinities | `{}` |
| `metrics.enabled` | Start a side-car prometheus exporter | `false` |
@@ -117,6 +103,28 @@ The following table lists the configurable parameters of the Osclass chart and t
| `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
| `metrics.podAnnotations` | Additional annotations for Metrics exporter pod | `{prometheus.io/scrape: "true", prometheus.io/port: "9117"}` |
| `metrics.resources` | Exporter resource requests/limit | {} |
### Database parameters
| Parameter | Description | Default |
|--------------------------------------------|-------------------------------------------------------|------------------------------------------------|
| `mariadb.enabled` | Whether to use the MariaDB chart | `true` |
| `mariadb.architecture` | MariaDB architecture (`standalone` or `replication`) | `standalone` |
| `mariadb.auth.rootPassword` | Password for the MariaDB `root` user | _random 10 character alphanumeric string_ |
| `mariadb.auth.database` | Database name to create | `bitnami_osclass` |
| `mariadb.auth.username` | Database user to create | `bn_osclass` |
| `mariadb.auth.password` | Password for the database | _random 10 character long alphanumeric string_ |
| `mariadb.primary.persistence.enabled` | Enable database persistence using PVC | `true` |
| `mariadb.primary.persistence.accessMode` | Database Persistent Volume Access Modes | `ReadWriteOnce` |
| `mariadb.primary.persistence.size` | Database Persistent Volume Size | `8Gi` |
| `mariadb.primary.persistence.existingClaim`| Enable persistence using an existing PVC | `nil` |
| `mariadb.primary.persistence.storageClass` | PVC Storage Class | `nil` (uses alpha storage class annotation) |
| `mariadb.primary.persistence.hostPath` | Host mount path for MariaDB volume | `nil` (will not mount to a host path) |
| `externalDatabase.user` | Existing username in the external db | `bn_osclass` |
| `externalDatabase.password` | Password for the above username | `nil` |
| `externalDatabase.database` | Name of the existing database | `bitnami_osclass` |
| `externalDatabase.host` | Host of the existing database | `nil` |
| `externalDatabase.port` | Port of the existing database | `3306` |
| `externalDatabase.existingSecret` | Name of the database existing Secret Object | `nil` |
The above parameters map to the env variables defined in [bitnami/osclass](http://github.com/bitnami/bitnami-docker-osclass). For more information please refer to the [bitnami/osclass](http://github.com/bitnami/bitnami-docker-osclass) image documentation.
@@ -173,6 +181,86 @@ Find more information about how to deal with common errors related to Bitnami’
## Upgrading
### To 8.0.0
In this major there were two main changes introduced:
1. Adaptation to Helm v2 EOL
2. Updated MariaDB dependency version
Please read the update notes carefully.
**1. Adaptation to Helm v2 EOL**
[On November 13, 2020, Helm v2 support was formally finished](https://github.com/helm/charts#status-of-the-project), this major version is the result of the required changes applied to the Helm Chart to be able to incorporate the different features added in Helm v3 and to be consistent with the Helm project itself regarding the Helm v2 EOL.
**What changes were introduced in this major version?**
- Previous versions of this Helm Chart use `apiVersion: v1` (installable by both Helm 2 and 3), this Helm Chart was updated to `apiVersion: v2` (installable by Helm 3 only). [Here](https://helm.sh/docs/topics/charts/#the-apiversion-field) you can find more information about the `apiVersion` field.
- Move dependency information from the *requirements.yaml* to the *Chart.yaml*
- After running `helm dependency update`, a *Chart.lock* file is generated containing the same structure used in the previous *requirements.lock*
- The different fields present in the *Chart.yaml* file has been ordered alphabetically in a homogeneous way for all the Bitnami Helm Charts
**Considerations when upgrading to this version**
- If you want to upgrade to this version from a previous one installed with Helm v3, you shouldn't face any issues
- If you want to upgrade to this version using Helm v2, this scenario is not supported as this version doesn't support Helm v2 anymore
- If you installed the previous version with Helm v2 and wants to upgrade to this version with Helm v3, please refer to the [official Helm documentation](https://helm.sh/docs/topics/v2_v3_migration/#migration-use-cases) about migrating from Helm v2 to v3
**Useful links**
- https://docs.bitnami.com/tutorials/resolve-helm2-helm3-post-migration-issues/
- https://helm.sh/docs/topics/v2_v3_migration/
- https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/
**2. Updated MariaDB dependency version**
In this major the MariaDB dependency version was also bumped to a new major version that introduces several incompatilibites. Therefore, backwards compatibility is not guaranteed unless an external database is used. Check [MariaDB Upgrading Notes](https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-800) for more information.
To upgrade to `8.0.0`, it should be done reusing the PVCs used to hold both the MariaDB and Osclass data on your previous release. To do so, follow the instructions below (the following example assumes that the release name is `osclass` and that a `rootUser.password` was defined for MariaDB in `values.yaml` when the chart was first installed):
> NOTE: Please, create a backup of your database before running any of those actions. The steps below would be only valid if your application (e.g. any plugins or custom code) is compatible with MariaDB 10.5.x
Obtain the credentials and the names of the PVCs used to hold both the MariaDB and Osclass data on your current release:
```console
export OSCLASS_HOST=$(kubectl get svc --namespace default osclass --template "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}")
export OSCLASS_PASSWORD=$(kubectl get secret --namespace default osclass -o jsonpath="{.data.osclass-password}" | base64 --decode)
export MARIADB_ROOT_PASSWORD=$(kubectl get secret --namespace default osclass-mariadb -o jsonpath="{.data.mariadb-root-password}" | base64 --decode)
export MARIADB_PASSWORD=$(kubectl get secret --namespace default osclass-mariadb -o jsonpath="{.data.mariadb-password}" | base64 --decode)
export MARIADB_PVC=$(kubectl get pvc -l app=mariadb,component=master,release=osclass -o jsonpath="{.items[0].metadata.name}")
```
Delete the Osclass deployment and delete the MariaDB statefulset. Notice the option `--cascade=false` in the latter:
```console
$ kubectl delete deployments.apps osclass
$ kubectl delete statefulsets.apps osclass-mariadb --cascade=false
```
Now the upgrade works:
```console
$ helm upgrade osclass bitnami/osclass --set mariadb.primary.persistence.existingClaim=$MARIADB_PVC --set mariadb.auth.rootPassword=$MARIADB_ROOT_PASSWORD --set mariadb.auth.password=$MARIADB_PASSWORD --set osclassPassword=$OSCLASS_PASSWORD --set osclassHost=$OSCLASS_HOST
```
You will have to delete the existing MariaDB pod and the new statefulset is going to create a new one
```console
$ kubectl delete pod osclass-mariadb-0
```
Finally, you should see the lines below in MariaDB container logs:
```console
$ kubectl logs $(kubectl get pods -l app.kubernetes.io/instance=osclass,app.kubernetes.io/name=mariadb,app.kubernetes.io/component=primary -o jsonpath="{.items[0].metadata.name}")
...
mariadb 12:13:24.98 INFO ==> Using persisted data
mariadb 12:13:25.01 INFO ==> Running mysql_upgrade
...
```
### To 7.0.0
Helm performs a lookup for the object based on its group (apps), version (v1), and kind (Deployment). Also known as its GroupVersionKind, or GVK. Changing the GVK is considered a compatibility breaker from Kubernetes' point of view, so you cannot "upgrade" those objects to the new GVK in-place. Earlier versions of Helm 3 did not perform the lookup correctly which has since been fixed to match the spec.

6
bitnami/osclass/requirements.lock
View File

@@ -1,6 +0,0 @@
dependencies:
- name: mariadb
repository: https://charts.bitnami.com/bitnami
version: 7.10.4
digest: sha256:ca14be574c84f1fd3ff519512631427cf30bbbef20c4156a095233871cc30d3b
generated: "2020-10-11T20:18:26.31076166Z"

5
bitnami/osclass/requirements.yaml
View File

@@ -1,5 +0,0 @@
dependencies:
- name: mariadb
version: 7.x.x
repository: https://charts.bitnami.com/bitnami
condition: mariadb.enabled

8
bitnami/osclass/templates/NOTES.txt
View File

@@ -22,18 +22,16 @@ host. To configure Osclass with the URL of your service:
export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "osclass.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}")
export APP_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "osclass.fullname" . }} -o jsonpath="{.data.osclass-password}" | base64 --decode)
{{- if .Values.mariadb.mariadbRootPassword }}
export DATABASE_ROOT_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "osclass.mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode)
export MARIADB_ROOT_PASSWORD=$(kubectl get secret --namespace default osclass-mariadb -o jsonpath="{.data.mariadb-root-password}" | base64 --decode)
{{- end }}
{{- end }}
export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "osclass.mariadb.fullname" . }} -o jsonpath="{.data.mariadb-password}" | base64 --decode)
export MARIADB_PASSWORD=$(kubectl get secret --namespace default osclass-mariadb -o jsonpath="{.data.mariadb-password}" | base64 --decode)
2. Complete your Osclass deployment by running:
{{- if .Values.mariadb.enabled }}
helm upgrade {{ .Release.Name }} bitnami/{{ .Chart.Name }} \
--set osclassHost=$APP_HOST,osclassPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }},mariadb.db.password=$APP_DATABASE_PASSWORD{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }}
--set osclassHost=$APP_HOST,osclassPassword=$APP_PASSWORD,mariadb.auth.rootPassword=$MARIADB_ROOT_PASSWORD,mariadb.auth.password=$MARIADB_PASSWORD{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }}
{{- else }}
## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ##

61
bitnami/osclass/templates/_helpers.tpl
View File

@@ -186,3 +186,64 @@ Return the appropriate apiVersion for deployment.
{{- print "apps/v1" -}}
{{- end -}}
{{- end -}}
{{/*
Return the MariaDB Hostname
*/}}
{{- define "osclass.databaseHost" -}}
{{- if .Values.mariadb.enabled }}
{{- if eq .Values.mariadb.architecture "replication" }}
{{- printf "%s-%s" (include "osclass.mariadb.fullname" .) "primary" | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s" (include "osclass.mariadb.fullname" .) -}}
{{- end -}}
{{- else -}}
{{- printf "%s" .Values.externalDatabase.host -}}
{{- end -}}
{{- end -}}
{{/*
Return the MariaDB Port
*/}}
{{- define "osclass.databasePort" -}}
{{- if .Values.mariadb.enabled }}
{{- printf "3306" -}}
{{- else -}}
{{- printf "%d" (.Values.externalDatabase.port | int ) -}}
{{- end -}}
{{- end -}}
{{/*
Return the MariaDB Database Name
*/}}
{{- define "osclass.databaseName" -}}
{{- if .Values.mariadb.enabled }}
{{- printf "%s" .Values.mariadb.auth.database -}}
{{- else -}}
{{- printf "%s" .Values.externalDatabase.database -}}
{{- end -}}
{{- end -}}
{{/*
Return the MariaDB User
*/}}
{{- define "osclass.databaseUser" -}}
{{- if .Values.mariadb.enabled }}
{{- printf "%s" .Values.mariadb.auth.username -}}
{{- else -}}
{{- printf "%s" .Values.externalDatabase.user -}}
{{- end -}}
{{- end -}}
{{/*
Return the MariaDB Secret Name
*/}}
{{- define "osclass.databaseSecretName" -}}
{{- if .Values.mariadb.enabled }}
{{- printf "%s" (include "osclass.mariadb.fullname" .) -}}
{{- else if .Values.externalDatabase.existingSecret -}}
{{- printf "%s" .Values.externalDatabase.existingSecret -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name "externaldb" -}}
{{- end -}}
{{- end -}}

44
bitnami/osclass/templates/deployment.yaml
View File

@@ -4,21 +4,21 @@ kind: Deployment
metadata:
name: {{ template "osclass.fullname" . }}
labels:
app: {{ template "osclass.fullname" . }}
chart: {{ template "osclass.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
app.kubernetes.io/name: {{ include "osclass.fullname" . }}
helm.sh/chart: {{ include "osclass.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name | quote }}
app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
spec:
selector:
matchLabels:
app: {{ template "osclass.fullname" . }}
release: "{{ .Release.Name }}"
app.kubernetes.io/name: {{ include "osclass.fullname" . }}
app.kubernetes.io/instance: {{ .Release.Name | quote }}
template:
metadata:
labels:
app: {{ template "osclass.fullname" . }}
chart: {{ template "osclass.chart" . }}
release: "{{ .Release.Name }}"
app.kubernetes.io/name: {{ include "osclass.fullname" . }}
helm.sh/chart: {{ include "osclass.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name | quote }}
{{- if or .Values.podAnnotations .Values.metrics.enabled }}
annotations:
{{- if .Values.podAnnotations }}
@@ -41,35 +41,19 @@ spec:
env:
- name: ALLOW_EMPTY_PASSWORD
value: {{ .Values.allowEmptyPassword | quote }}
{{- if .Values.mariadb.enabled }}
- name: MARIADB_HOST
value: {{ template "osclass.mariadb.fullname" . }}
value: {{ include "osclass.databaseHost" . | quote }}
- name: MARIADB_PORT_NUMBER
value: "3306"
value: {{ include "osclass.databasePort" . | quote }}
- name: OSCLASS_DATABASE_NAME
value: {{ .Values.mariadb.db.name | quote }}
value: {{ include "osclass.databaseName" . | quote }}
- name: OSCLASS_DATABASE_USER
value: {{ .Values.mariadb.db.user | quote }}
value: {{ include "osclass.databaseUser" . | quote }}
- name: OSCLASS_DATABASE_PASSWORD
valueFrom:
secretKeyRef:
name: {{ template "osclass.mariadb.fullname" . }}
name: {{ include "osclass.databaseSecretName" . }}
key: mariadb-password
{{- else }}
- name: MARIADB_HOST
value: {{ .Values.externalDatabase.host | quote }}
- name: MARIADB_PORT_NUMBER
value: {{ .Values.externalDatabase.port | quote }}
- name: OSCLASS_DATABASE_NAME
value: {{ .Values.externalDatabase.database | quote }}
- name: OSCLASS_DATABASE_USER
value: {{ .Values.externalDatabase.user | quote }}
- name: OSCLASS_DATABASE_PASSWORD
valueFrom:
secretKeyRef:
name: {{ printf "%s-%s" .Release.Name "externaldb" }}
key: db-password
{{- end }}
{{- $port:=.Values.service.port | toString }}
- name: OSCLASS_HOST
value: "{{ include "osclass.host" . }}{{- if ne $port "80" }}:{{ .Values.service.port }}{{ end }}"

12
bitnami/osclass/templates/externaldb-secrets.yaml
View File

@@ -1,14 +1,14 @@
{{- if not .Values.mariadb.enabled }}
{{- if (not (or .Values.mariadb.enabled .Values.externalDatabase.existingSecret)) }}
apiVersion: v1
kind: Secret
metadata:
name: {{ printf "%s-%s" .Release.Name "externaldb" }}
labels:
app: {{ printf "%s-%s" .Release.Name "externaldb" }}
chart: {{ template "osclass.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
app.kubernetes.io/name: {{ include "osclass.fullname" . }}
helm.sh/chart: {{ include "osclass.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name | quote }}
app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
type: Opaque
data:
db-password: {{ default "" .Values.externalDatabase.password | b64enc | quote }}
mariadb-password: {{ default "" .Values.externalDatabase.password | b64enc | quote }}
{{- end }}

8
bitnami/osclass/templates/ingress.yaml
View File

@@ -4,10 +4,10 @@ kind: Ingress
metadata:
name: {{ template "osclass.fullname" . }}
labels:
app: "{{ template "osclass.fullname" . }}"
chart: "{{ template "osclass.chart" . }}"
release: {{ .Release.Name | quote }}
heritage: {{ .Release.Service | quote }}
app.kubernetes.io/name: {{ include "osclass.fullname" . }}
helm.sh/chart: {{ include "osclass.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name | quote }}
app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
annotations:
{{- if .Values.ingress.certManager }}
kubernetes.io/tls-acme: "true"

8
bitnami/osclass/templates/osclass-pvc.yaml
View File

@@ -4,10 +4,10 @@ apiVersion: v1
metadata:
name: {{ template "osclass.fullname" . }}-osclass
labels:
app: {{ template "osclass.fullname" . }}
chart: {{ template "osclass.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
app.kubernetes.io/name: {{ include "osclass.fullname" . }}
helm.sh/chart: {{ include "osclass.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name | quote }}
app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
spec:
accessModes:
- {{ .Values.persistence.osclass.accessMode | quote }}

8
bitnami/osclass/templates/secrets.yaml
View File

@@ -3,10 +3,10 @@ kind: Secret
metadata:
name: {{ template "osclass.fullname" . }}
labels:
app: {{ template "osclass.fullname" . }}
chart: {{ template "osclass.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
app.kubernetes.io/name: {{ include "osclass.fullname" . }}
helm.sh/chart: {{ include "osclass.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name | quote }}
app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
type: Opaque
data:
{{ if .Values.osclassPassword }}

11
bitnami/osclass/templates/svc.yaml
View File

@@ -3,10 +3,10 @@ kind: Service
metadata:
name: {{ template "osclass.fullname" . }}
labels:
app: {{ template "osclass.fullname" . }}
chart: {{ template "osclass.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
app.kubernetes.io/name: {{ include "osclass.fullname" . }}
helm.sh/chart: {{ include "osclass.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name | quote }}
app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
spec:
type: {{ .Values.service.type }}
{{- if (or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort")) }}
@@ -29,4 +29,5 @@ spec:
nodePort: {{ .Values.service.nodePorts.https }}
{{- end }}
selector:
app: {{ template "osclass.fullname" . }}
app.kubernetes.io/name: {{ include "osclass.fullname" . }}
app.kubernetes.io/instance: {{ .Release.Name | quote }}

59
bitnami/osclass/values.yaml
View File

@@ -14,7 +14,7 @@
image:
registry: docker.io
repository: bitnami/osclass
tag: 3.9.0-debian-10-r135
tag: 3.9.0-debian-10-r136
## 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
@@ -77,6 +77,11 @@ allowEmptyPassword: "yes"
## External database configuration
##
externalDatabase:
## Use existing secret (ignores previous password)
## must contain key `mariadb-password`
## NOTE: When it's set, the `externalDatabase.password` parameter is ignored
# existingSecret:
## Database host
host:
@@ -109,31 +114,32 @@ externalDatabase:
##
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: true
## Disable MariaDB replication
replication:
enabled: false
## Create a database and a database user
## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-user-on-first-run
## MariaDB architecture. Allowed values: standalone or replication
##
db:
name: bitnami_osclass
user: bn_osclass
## If the password is not specified, mariadb will generates a random password
architecture: standalone
## MariaDB Authentication parameters
##
auth:
## MariaDB root password
## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-the-root-password-on-first-run
##
# password:
rootPassword: ""
## MariaDB custom user and database
## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-on-first-run
## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-user-on-first-run
##
database: bitnami_osclass
username: bn_osclass
password: ""
## MariaDB admin password
## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#setting-the-root-password-on-first-run
##
# rootUser:
# password:
## Enable persistence using Persistent Volume Claims
## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
##
master:
primary:
## Enable persistence using Persistent Volume Claims
## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
##
persistence:
enabled: true
## mariadb data Persistent Volume Storage Class
@@ -143,9 +149,16 @@ mariadb:
## set, choosing the default provisioner. (gp2 on AWS, standard on
## GKE, AWS & OpenStack)
##
# storageClass: "-"
accessMode: ReadWriteOnce
storageClass:
accessModes:
- ReadWriteOnce
size: 8Gi
## Set path in case you want to use local host path volumes (not recommended in production)
##
hostPath:
## Use an existing PVC
##
existingClaim:
## Kubernetes configuration
## For minikube, set this to NodePort, elsewhere use LoadBalancer