diff --git a/wikijs/Chart.yaml b/wikijs/Chart.yaml index f964268..6519ba0 100644 --- a/wikijs/Chart.yaml +++ b/wikijs/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: wikijs # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 2.1.0 +version: 2.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. AppVersion: 2.5.170 @@ -25,7 +25,7 @@ keywords: type: application dependencies: - name: postgresql - version: 8.10.14 + version: 10.2.5 repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled home: https://wiki.js.org diff --git a/wikijs/charts/postgresql-10.2.5.tgz b/wikijs/charts/postgresql-10.2.5.tgz new file mode 100644 index 0000000..db37f76 Binary files /dev/null and b/wikijs/charts/postgresql-10.2.5.tgz differ diff --git a/wikijs/charts/postgresql-6.5.0.tgz b/wikijs/charts/postgresql-6.5.0.tgz deleted file mode 100644 index acc7996..0000000 Binary files a/wikijs/charts/postgresql-6.5.0.tgz and /dev/null differ diff --git a/wikijs/templates/deployment.yaml b/wikijs/templates/deployment.yaml index 2e342c3..f02598d 100644 --- a/wikijs/templates/deployment.yaml +++ b/wikijs/templates/deployment.yaml @@ -40,7 +40,7 @@ spec: value: {{ default "wiki" .Values.postgresql.postgresqlDatabase }} {{- if .Values.postgresql.enabled }} - name: DB_USER - value: {{ default "wiki" .Values.postgresql.postgresqlUser }} + value: {{ default "wiki" .Values.postgresql.postgresqlUsername }} - name: DB_PASS valueFrom: secretKeyRef: @@ -52,7 +52,7 @@ spec: key: {{ template "wiki.postgresql.secretKey" . }} {{- else }} - name: DB_USER - value: {{ default "wiki" .Values.postgresql.postgresqlUser }} + value: {{ default "wiki" .Values.postgresql.postgresqlUsername }} - name: DB_PASS value: {{ default "wiki" .Values.postgresql.postgresqlPassword }} {{- end }} diff --git a/wikijs/values.yaml b/wikijs/values.yaml index efa00a5..7b1933f 100644 --- a/wikijs/values.yaml +++ b/wikijs/values.yaml @@ -73,46 +73,17 @@ tolerations: [] affinity: {} -## Configuration values for the postgresql dependency. -## ref: https://github.com/kubernetes/charts/blob/master/stable/postgresql/README.md -## +# Enabled postgres +# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/postgresql postgresql: - ## Use the PostgreSQL chart dependency. - ## Set to false if bringing your own PostgreSQL, and set secret value postgresql-uri. - ## + # Set false for external PostgreSQL enabled: true - ## PostgreSQL fullname Override - ## Default to wiki-postgresql unless fullname override is set for Chart - ## - fullnameOverride: "" - ## PostgreSQL User to create. - ## - postgresqlUser: postgres - ## PostgreSQL Database to create. - ## postgresqlDatabase: wiki - ## Persistent Volume Storage configuration. - ## ref: https://kubernetes.io/docs/user-guide/persistent-volumes - ## - replication: - ## Enable PostgreSQL replication (primary/secondary) - ## - enabled: false + # + # Set for external PostgreSQL host + # postgresqlHost: postgresql + #postgresqlUsername: postgres + #postgresqlPassword: wiki persistence: - ## Enable PostgreSQL persistence using Persistent Volume Claims. - ## - enabled: true - ## concourse data Persistent Volume Storage Class - ## If defined, storageClassName: - ## 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 Access Mode. - ## - accessMode: ReadWriteOnce - ## Persistent Volume Storage Size. - ## - size: 8Gi + enabled: false + # storageClass: ""