Skip to content

Commit

Permalink
feat!: update MariaDB and PostgreSQL subcharts (cowboysysop#611)
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastien-prudhomme authored Mar 19, 2024
1 parent 749424f commit 4bb4a9e
Show file tree
Hide file tree
Showing 15 changed files with 357 additions and 178 deletions.
6 changes: 3 additions & 3 deletions charts/dolibarr/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ name: dolibarr
sources:
- https://github.com/Dolibarr/dolibarr
- https://github.com/cowboysysop/charts/tree/master/charts/dolibarr
version: 4.1.0
version: 5.0.0
dependencies:
- name: common
version: 2.9.0
version: 2.19.0
repository: https://charts.bitnami.com/bitnami/
- name: mariadb
version: 11.5.7
version: 17.0.0
repository: https://charts.bitnami.com/bitnami/
condition: mariadb.enabled
annotations:
Expand Down
220 changes: 124 additions & 96 deletions charts/dolibarr/README.md

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions charts/dolibarr/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Create the name of the secret to use
{{- end -}}

{{/*
Administrator password secret key name
Key in Secret that contains administrator password
*/}}
{{- define "dolibarr.secretKeyAdminPassword" -}}
{{- if .Values.existingSecret -}}
Expand All @@ -85,7 +85,7 @@ Administrator password secret key name
{{- end -}}

{{/*
Cron security key secret key name
Key in Secret that contains cron security key
*/}}
{{- define "dolibarr.secretKeyCronSecurityKey" -}}
{{- if .Values.existingSecret -}}
Expand Down Expand Up @@ -163,9 +163,9 @@ MariaDB secret name
{{- end -}}

{{/*
MariaDB password secret key name
Key in Secret that contains MariaDB password
*/}}
{{- define "dolibarr.mariadb.secretKeyNamePassword" -}}
{{- define "dolibarr.mariadb.secretKeyPassword" -}}
{{- if .Values.externalMariadb.existingSecret -}}
{{ .Values.externalMariadb.existingSecretKeyPassword }}
{{- else -}}
Expand Down
12 changes: 9 additions & 3 deletions charts/dolibarr/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }}
{{- end }}
annotations:
{{- if (not .Values.existingSecret) }}
{{- if not .Values.existingSecret }}
checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
{{- end }}
{{- if .Values.podAnnotations }}
Expand All @@ -44,7 +44,13 @@ spec:
{{- if .Values.priorityClassName }}
priorityClassName: {{ .Values.priorityClassName | quote }}
{{- end }}
{{- if .Values.runtimeClassName }}
runtimeClassName: {{ .Values.runtimeClassName | quote }}
{{- end }}
serviceAccountName: {{ include "dolibarr.serviceAccountName" . }}
{{- if .Values.topologySpreadConstraints }}
topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.topologySpreadConstraints "context" .) | nindent 8 }}
{{- end }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
initContainers:
Expand Down Expand Up @@ -93,7 +99,7 @@ spec:
valueFrom:
secretKeyRef:
name: {{ include "dolibarr.mariadb.secretName" . }}
key: {{ include "dolibarr.mariadb.secretKeyNamePassword" . }}
key: {{ include "dolibarr.mariadb.secretKeyPassword" . }}
- name: DOLI_DB_NAME
value: {{ include "dolibarr.mariadb.database" . | quote }}
- name: DOLI_URL_ROOT
Expand Down Expand Up @@ -186,7 +192,7 @@ spec:
valueFrom:
secretKeyRef:
name: {{ include "dolibarr.mariadb.secretName" . }}
key: {{ include "dolibarr.mariadb.secretKeyNamePassword" . }}
key: {{ include "dolibarr.mariadb.secretKeyPassword" . }}
- name: DOLI_DB_NAME
value: {{ include "dolibarr.mariadb.database" . | quote }}
{{- if .Values.extraEnvVars }}
Expand Down
2 changes: 1 addition & 1 deletion charts/dolibarr/templates/secret.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if (not .Values.existingSecret) }}
{{- if not .Values.existingSecret }}
apiVersion: v1
kind: Secret
metadata:
Expand Down
51 changes: 48 additions & 3 deletions charts/dolibarr/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@ podSecurityContext: {}
priorityClassName:
# priorityClassName : high-priority

## @param runtimeClassName Runtime class name
runtimeClassName: ""

## @param topologySpreadConstraints Topology Spread Constraints for pod assignment
topologySpreadConstraints: []

## @param securityContext Container security context
securityContext: {}
# capabilities:
Expand Down Expand Up @@ -293,6 +299,8 @@ persistence:
storageClass:
# storageClass: -

## @section Config parameters

dolibarr:
admin:
## @param dolibarr.admin.username Administrator username
Expand All @@ -317,10 +325,10 @@ dolibarr:
## @param existingSecret Name of existing Secret to use
existingSecret: ""

## @param existingSecretKeyAdminPassword Name of the key in existing Secret that contains administrator password
## @param existingSecretKeyAdminPassword Key in existing Secret that contains administrator password
existingSecretKeyAdminPassword: dolibarr-admin-password

## @param existingSecretKeyCronSecurityKey Name of the key in existing Secret that contains cron security key
## @param existingSecretKeyCronSecurityKey Key in existing Secret that contains cron security key
existingSecretKeyCronSecurityKey: dolibarr-cron-security-key

## @section MariaDB parameters
Expand Down Expand Up @@ -370,12 +378,49 @@ externalMariadb:
## @param externalMariadb.existingSecret Name of existing Secret to use
existingSecret: ""

## @param externalMariadb.existingSecretKeyPassword Name of the key in existing Secret that contains MariaDB password
## @param externalMariadb.existingSecretKeyPassword Key in existing Secret that contains MariaDB password
existingSecretKeyPassword: mariadb-password

## @param externalMariadb.database External MariaDB database
database: dolibarr

## @section Wait parameters

wait:
image:
## @param wait.image.registry Image registry
registry: docker.io

## @param wait.image.repository Image repository
repository: atkrad/wait4x

## @param wait.image.tag Image tag
tag: 2.14.0

## @param wait.image.digest Image digest
digest: ""

## @param wait.image.pullPolicy Image pull policy
pullPolicy: IfNotPresent

## @param wait.securityContext Container security context
securityContext: {}
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000

## @param wait.resources CPU/Memory resource requests/limits
resources: {}
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi

## @section Tests parameters

tests:
Expand Down
8 changes: 4 additions & 4 deletions charts/flowise/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ name: flowise
sources:
- https://github.com/FlowiseAI/Flowise
- https://github.com/cowboysysop/charts/tree/master/charts/flowise
version: 2.6.0
version: 3.0.0
dependencies:
- name: common
version: 2.9.0
version: 2.19.0
repository: https://charts.bitnami.com/bitnami/
- name: mariadb
version: 11.5.7
version: 17.0.0
repository: https://charts.bitnami.com/bitnami/
condition: mariadb.enabled
- name: postgresql
version: 12.11.1
version: 15.0.0
repository: https://charts.bitnami.com/bitnami/
condition: postgresql.enabled
annotations:
Expand Down
17 changes: 16 additions & 1 deletion charts/flowise/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,21 @@ The command upgrades the existing `my-release` deployment with the most latest r

**TIP**: Use `helm repo update` to update information on available charts in the chart repositories.

### Upgrading to version 3.0.0

The MariaDB subchart has been updated to a major release, see these upgrade instructions:

- https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-1700
- https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-1600
- https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-1400
- https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-1300

The PostgreSQL subchart has been updated to a major release, see these upgrade instructions:

- https://github.com/bitnami/charts/tree/main/bitnami/postgresql#to-1500
- https://github.com/bitnami/charts/tree/main/bitnami/postgresql#to-1400
- https://github.com/bitnami/charts/tree/main/bitnami/postgresql#to-1300

### Upgrading to version 2.0.0

The chart is now tested with Kubernetes >= 1.24 and Helm >= 3.9.
Expand Down Expand Up @@ -209,7 +224,7 @@ The command deletes the release named `my-release` and frees all the kubernetes
| ----------------------- | ----------------------------------- | --------------- |
| `wait.image.registry` | Image registry | `docker.io` |
| `wait.image.repository` | Image repository | `atkrad/wait4x` |
| `wait.image.tag` | Image tag | `2.13.0` |
| `wait.image.tag` | Image tag | `2.14.0` |
| `wait.image.digest` | Image digest | `""` |
| `wait.image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `wait.securityContext` | Container security context | `{}` |
Expand Down
2 changes: 1 addition & 1 deletion charts/flowise/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ wait:
repository: atkrad/wait4x

## @param wait.image.tag Image tag
tag: 2.13.0
tag: 2.14.0

## @param wait.image.digest Image digest
digest: ""
Expand Down
8 changes: 4 additions & 4 deletions charts/lighthouse-ci/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ name: lighthouse-ci
sources:
- https://github.com/GoogleChrome/lighthouse-ci
- https://github.com/cowboysysop/charts/tree/master/charts/lighthouse-ci
version: 7.4.0
version: 8.0.0
dependencies:
- name: common
version: 2.9.0
version: 2.19.0
repository: https://charts.bitnami.com/bitnami/
- name: mariadb
version: 11.5.7
version: 17.0.0
repository: https://charts.bitnami.com/bitnami/
condition: mariadb.enabled
- name: postgresql
version: 12.11.1
version: 15.0.0
repository: https://charts.bitnami.com/bitnami/
condition: postgresql.enabled
annotations:
Expand Down
Loading

0 comments on commit 4bb4a9e

Please sign in to comment.