diff --git a/Chart.lock b/Chart.lock index a7141ee..647340c 100644 --- a/Chart.lock +++ b/Chart.lock @@ -9,7 +9,7 @@ dependencies: repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami version: 10.3.17 - name: mariadb - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami - version: 9.3.6 -digest: sha256:044e249826b5d277202656686696ea748107952da49e5e56d5d635edab93dc1a -generated: "2023-01-03T22:02:26.0191894+01:00" + repository: https://charts.bitnami.com/bitnami + version: 11.4.2 +digest: sha256:10516937fb2fd61045984a8d875b22c79dc80b4b6bad02c86e044dd2b7898983 +generated: "2023-01-03T22:04:32.6044332+01:00" diff --git a/Chart.yaml b/Chart.yaml index 23328d8..31ee251 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -37,6 +37,6 @@ dependencies: version: 10.3.17 condition: postgresql.enabled - name: mariadb - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami - version: 9.3.6 + repository: https://charts.bitnami.com/bitnami + version: 11.4.2 condition: mariadb.enabled diff --git a/README.md b/README.md index bfab200..cf4226c 100644 --- a/README.md +++ b/README.md @@ -759,15 +759,15 @@ gitea: ### MariaDB -| Name | Description | Value | -| ---------------------------------- | ----------------------------------------------------------------- | ------- | -| `mariadb.enabled` | Enable MariaDB | `false` | -| `mariadb.auth.database` | Name of the database to create. | `gitea` | -| `mariadb.auth.username` | Username of the new user to create. | `gitea` | -| `mariadb.auth.password` | Password for the new user. Ignored if existing secret is provided | `gitea` | -| `mariadb.auth.rootPassword` | Password for the root user. | `gitea` | -| `mariadb.primary.service.port` | Port to connect to MariaDB service | `3306` | -| `mariadb.primary.persistence.size` | Persistence size for MariaDB | `10Gi` | +| Name | Description | Value | +| ------------------------------------- | ----------------------------------------------------------------- | ------- | +| `mariadb.enabled` | Enable MariaDB | `false` | +| `mariadb.auth.database` | Name of the database to create. | `gitea` | +| `mariadb.auth.username` | Username of the new user to create. | `gitea` | +| `mariadb.auth.password` | Password for the new user. Ignored if existing secret is provided | `gitea` | +| `mariadb.auth.rootPassword` | Password for the root user. | `gitea` | +| `mariadb.primary.service.ports.mysql` | Port to connect to MariaDB service | `3306` | +| `mariadb.primary.persistence.size` | Persistence size for MariaDB | `10Gi` | ### Advanced diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 0e481e0..3851acf 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -100,7 +100,7 @@ app.kubernetes.io/instance: {{ .Release.Name }} {{- end -}} {{- define "mariadb.dns" -}} -{{- printf "%s-mariadb.%s.svc.%s:%g" .Release.Name .Release.Namespace .Values.clusterDomain .Values.mariadb.primary.service.port | trunc 63 | trimSuffix "-" -}} +{{- printf "%s-mariadb.%s.svc.%s:%g" .Release.Name .Release.Namespace .Values.clusterDomain .Values.mariadb.primary.service.ports.mysql | trunc 63 | trimSuffix "-" -}} {{- end -}} {{- define "memcached.dns" -}} diff --git a/values.yaml b/values.yaml index c91ab1d..70e007e 100644 --- a/values.yaml +++ b/values.yaml @@ -452,7 +452,7 @@ mysql: ## @param mariadb.auth.username Username of the new user to create. ## @param mariadb.auth.password Password for the new user. Ignored if existing secret is provided ## @param mariadb.auth.rootPassword Password for the root user. -## @param mariadb.primary.service.port Port to connect to MariaDB service +## @param mariadb.primary.service.ports.mysql Port to connect to MariaDB service ## @param mariadb.primary.persistence.size Persistence size for MariaDB mariadb: enabled: false @@ -463,7 +463,8 @@ mariadb: rootPassword: gitea primary: service: - port: 3306 + ports: + mysql: 3306 persistence: size: 10Gi