diff --git a/incubator/sogo/4.0.12/CHANGELOG.md b/incubator/sogo/4.0.12/CHANGELOG.md deleted file mode 100644 index 584208b786..0000000000 --- a/incubator/sogo/4.0.12/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ - - -### [sogo-4.0.12](https://github.com/truecharts/apps/compare/sogo-4.0.11...sogo-4.0.12) (2021-10-05) - -#### Chore - -* update non-major deps helm releases ([#1099](https://github.com/truecharts/apps/issues/1099)) - diff --git a/incubator/sogo/4.0.12/charts/common-8.2.2.tgz b/incubator/sogo/4.0.12/charts/common-8.2.2.tgz deleted file mode 100644 index 7d13265fc5..0000000000 Binary files a/incubator/sogo/4.0.12/charts/common-8.2.2.tgz and /dev/null differ diff --git a/incubator/sogo/4.0.12/charts/postgresql-3.0.8.tgz b/incubator/sogo/4.0.12/charts/postgresql-3.0.8.tgz deleted file mode 100644 index 4668ecda1c..0000000000 Binary files a/incubator/sogo/4.0.12/charts/postgresql-3.0.8.tgz and /dev/null differ diff --git a/incubator/sogo/4.0.13/CHANGELOG.md b/incubator/sogo/4.0.13/CHANGELOG.md new file mode 100644 index 0000000000..11cfccf78a --- /dev/null +++ b/incubator/sogo/4.0.13/CHANGELOG.md @@ -0,0 +1,4 @@ + + +### [sogo-4.0.13](https://github.com/truecharts/apps/compare/sogo-4.0.12...sogo-4.0.13) (2021-10-09) + diff --git a/incubator/sogo/4.0.12/CONFIG.md b/incubator/sogo/4.0.13/CONFIG.md similarity index 100% rename from incubator/sogo/4.0.12/CONFIG.md rename to incubator/sogo/4.0.13/CONFIG.md diff --git a/incubator/sogo/4.0.12/Chart.lock b/incubator/sogo/4.0.13/Chart.lock similarity index 56% rename from incubator/sogo/4.0.12/Chart.lock rename to incubator/sogo/4.0.13/Chart.lock index 339751f377..8927082e85 100644 --- a/incubator/sogo/4.0.12/Chart.lock +++ b/incubator/sogo/4.0.13/Chart.lock @@ -1,12 +1,12 @@ dependencies: - name: common repository: https://truecharts.org - version: 8.2.2 + version: 8.3.4 - name: postgresql repository: https://truecharts.org/ - version: 3.0.8 + version: 3.0.12 - name: memcached repository: https://charts.bitnami.com/bitnami version: 5.15.4 -digest: sha256:505855bf97f71b5fae35edae4dbb54d3da6d8fd7209ff18b57a46b96d86acdd8 -generated: "2021-10-05T12:12:45.625807654Z" +digest: sha256:70eef654ba78195dc69f7fef5bf059f6c258fcb597335cb0a1af133ed343b640 +generated: "2021-10-09T23:21:20.003307622Z" diff --git a/incubator/sogo/4.0.12/Chart.yaml b/incubator/sogo/4.0.13/Chart.yaml similarity index 92% rename from incubator/sogo/4.0.12/Chart.yaml rename to incubator/sogo/4.0.13/Chart.yaml index 97af58a379..bf4175de7a 100644 --- a/incubator/sogo/4.0.12/Chart.yaml +++ b/incubator/sogo/4.0.13/Chart.yaml @@ -3,11 +3,11 @@ appVersion: "5.2.0" dependencies: - name: common repository: https://truecharts.org - version: 8.2.2 + version: 8.3.4 - condition: postgresql.enabled name: postgresql repository: https://truecharts.org/ - version: 3.0.8 + version: 3.0.12 - condition: memcached.enabled name: memcached repository: https://charts.bitnami.com/bitnami @@ -27,4 +27,4 @@ name: sogo sources: - https://www.sogo.nu/ type: application -version: 4.0.12 +version: 4.0.13 diff --git a/incubator/sogo/4.0.12/README.md b/incubator/sogo/4.0.13/README.md similarity index 92% rename from incubator/sogo/4.0.12/README.md rename to incubator/sogo/4.0.13/README.md index 966763b01b..680b4e8720 100644 --- a/incubator/sogo/4.0.12/README.md +++ b/incubator/sogo/4.0.13/README.md @@ -18,8 +18,8 @@ Kubernetes: `>=1.16.0-0` | Repository | Name | Version | |------------|------|---------| | https://charts.bitnami.com/bitnami | memcached | 5.15.4 | -| https://truecharts.org/ | postgresql | 3.0.8 | -| https://truecharts.org | common | 8.2.2 | +| https://truecharts.org/ | postgresql | 3.0.12 | +| https://truecharts.org | common | 8.3.4 | ## Installing the Chart diff --git a/incubator/sogo/4.0.12/app-readme.md b/incubator/sogo/4.0.13/app-readme.md similarity index 100% rename from incubator/sogo/4.0.12/app-readme.md rename to incubator/sogo/4.0.13/app-readme.md diff --git a/incubator/sogo/4.0.13/charts/common-8.3.4.tgz b/incubator/sogo/4.0.13/charts/common-8.3.4.tgz new file mode 100644 index 0000000000..0e699cbf44 Binary files /dev/null and b/incubator/sogo/4.0.13/charts/common-8.3.4.tgz differ diff --git a/incubator/sogo/4.0.12/charts/memcached-5.15.4.tgz b/incubator/sogo/4.0.13/charts/memcached-5.15.4.tgz similarity index 100% rename from incubator/sogo/4.0.12/charts/memcached-5.15.4.tgz rename to incubator/sogo/4.0.13/charts/memcached-5.15.4.tgz diff --git a/incubator/sogo/4.0.13/charts/postgresql-3.0.12.tgz b/incubator/sogo/4.0.13/charts/postgresql-3.0.12.tgz new file mode 100644 index 0000000000..337416dd23 Binary files /dev/null and b/incubator/sogo/4.0.13/charts/postgresql-3.0.12.tgz differ diff --git a/incubator/sogo/4.0.12/helm-values.md b/incubator/sogo/4.0.13/helm-values.md similarity index 82% rename from incubator/sogo/4.0.12/helm-values.md rename to incubator/sogo/4.0.13/helm-values.md index 5eba4d91d3..ce08dd3194 100644 --- a/incubator/sogo/4.0.12/helm-values.md +++ b/incubator/sogo/4.0.13/helm-values.md @@ -14,16 +14,11 @@ You will, however, be able to use all values referenced in the common chart here | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"ghcr.io/truecharts/sogo"` | | | image.tag | string | `"v5.2.0@sha256:8fc7bb87b77d76d929bcd36403d4f27878fa3e99f5448fb05ed64829078665a4"` | | -| initContainers | object | `{"init-postgresdb":{"command":["sh","-c","until pg_isready -U sogo -h ${pghost} ; do sleep 2 ; done"],"env":[{"name":"pghost","valueFrom":{"secretKeyRef":{"key":"plainhost","name":"dbcreds"}}}],"image":"{{ .Values.postgresqlImage.repository }}:{{ .Values.postgresqlImage.tag }}","imagePullPolicy":"IfNotPresent"}}` | initcontainers | -| initContainers.init-postgresdb | object | `{"command":["sh","-c","until pg_isready -U sogo -h ${pghost} ; do sleep 2 ; done"],"env":[{"name":"pghost","valueFrom":{"secretKeyRef":{"key":"plainhost","name":"dbcreds"}}}],"image":"{{ .Values.postgresqlImage.repository }}:{{ .Values.postgresqlImage.tag }}","imagePullPolicy":"IfNotPresent"}` | wait for database before starting sogo | | memcached | object | `{"enabled":true}` | memcached dependency settings | | persistence | object | `{"data":{"accessMode":"ReadWriteOnce","enabled":true,"mountPath":"/data/conf/sogo/","size":"100Gi","type":"pvc"},"drafts":{"accessMode":"ReadWriteOnce","enabled":true,"mountPath":"/var/spool/sogo","size":"100Gi","type":"pvc"},"mimetmp":{"enabled":true,"mountPath":"/mimetmp","type":"emptyDir"}}` | persistence settings | | podSecurityContext.runAsGroup | int | `0` | | | podSecurityContext.runAsUser | int | `0` | | | postgresql | object | `{"enabled":true,"existingSecret":"dbcreds","postgresqlDatabase":"sogo","postgresqlUsername":"sogo"}` | postgres dependency settings | -| postgresqlImage.pullPolicy | string | `"IfNotPresent"` | | -| postgresqlImage.repository | string | `"bitnami/postgresql"` | | -| postgresqlImage.tag | string | `"13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a"` | | | securityContext.readOnlyRootFilesystem | bool | `false` | | | securityContext.runAsNonRoot | bool | `false` | | | service | object | `{"main":{"ports":{"main":{"port":80}}}}` | services | diff --git a/incubator/sogo/4.0.12/ix_values.yaml b/incubator/sogo/4.0.13/ix_values.yaml similarity index 88% rename from incubator/sogo/4.0.12/ix_values.yaml rename to incubator/sogo/4.0.13/ix_values.yaml index 5253ea61aa..8b036ee430 100644 --- a/incubator/sogo/4.0.12/ix_values.yaml +++ b/incubator/sogo/4.0.13/ix_values.yaml @@ -8,11 +8,6 @@ image: pullPolicy: IfNotPresent tag: v5.2.0@sha256:8fc7bb87b77d76d929bcd36403d4f27878fa3e99f5448fb05ed64829078665a4 -postgresqlImage: - repository: bitnami/postgresql - pullPolicy: IfNotPresent - tag: 13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a - initContainers: migrate-db: image: "{{ .Values.alpineImage.repository}}:{{ .Values.alpineImage.tag }}" @@ -41,9 +36,9 @@ initContainers: # Enabled postgres postgresql: enabled: true + existingSecret: "dbcreds" postgresqlUsername: sogo postgresqlDatabase: sogo - existingSecret: dbcreds # -- memcached dependency settings memcached: diff --git a/incubator/sogo/4.0.12/questions.yaml b/incubator/sogo/4.0.13/questions.yaml similarity index 100% rename from incubator/sogo/4.0.12/questions.yaml rename to incubator/sogo/4.0.13/questions.yaml diff --git a/incubator/sogo/4.0.12/templates/_config.tpl b/incubator/sogo/4.0.13/templates/_config.tpl similarity index 86% rename from incubator/sogo/4.0.12/templates/_config.tpl rename to incubator/sogo/4.0.13/templates/_config.tpl index 8119d7de08..5688f1d3cd 100644 --- a/incubator/sogo/4.0.12/templates/_config.tpl +++ b/incubator/sogo/4.0.13/templates/_config.tpl @@ -1,29 +1,5 @@ {{/* Define the configmap */}} {{- define "sogo.config" -}} ---- - -apiVersion: v1 -kind: Secret -metadata: - labels: - {{- include "common.labels" . | nindent 4 }} - name: dbcreds -{{- $dbprevious := lookup "v1" "Secret" .Release.Namespace "dbcreds" }} -{{- $dbPass := "" }} -data: -{{- if $dbprevious }} - {{- $dbPass = ( index $dbprevious.data "postgresql-password" ) | b64dec }} - postgresql-password: {{ ( index $dbprevious.data "postgresql-password" ) }} - postgresql-postgres-password: {{ ( index $dbprevious.data "postgresql-postgres-password" ) }} -{{- else }} - {{- $dbPass = randAlphaNum 50 }} - postgresql-password: {{ $dbPass | b64enc | quote }} - postgresql-postgres-password: {{ randAlphaNum 50 | b64enc | quote }} -{{- end }} - {{- $url := printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase }} - url: {{ $url | b64enc | quote }} - plainhost: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }} -type: Opaque --- @@ -51,9 +27,9 @@ data: * **************************************************************************/ /* Database configuration (mysql:// or postgresql://) */ - SOGoProfileURL = "{{ $url }}/sogo_user_profile"; - OCSFolderInfoURL = "{{ $url }}/sogo_folder_info"; - OCSSessionsFolderURL = "{{ $url }}/sogo_sessions_folder"; + SOGoProfileURL = "{{ .Values.postgresql.url.complete }}/sogo_user_profile"; + OCSFolderInfoURL = "{{ .Values.postgresql.url.complete }}/sogo_folder_info"; + OCSSessionsFolderURL = "{{ .Values.postgresql.url.complete }}/sogo_sessions_folder"; /* Mail */ SOGoDraftsFolderName = {{ .Values.sogo.mail.SOGoDraftsFolderName | default "Drafts" }}; diff --git a/incubator/sogo/4.0.12/templates/common.yaml b/incubator/sogo/4.0.13/templates/common.yaml similarity index 89% rename from incubator/sogo/4.0.12/templates/common.yaml rename to incubator/sogo/4.0.13/templates/common.yaml index 51e8201cc6..e0a42e551c 100644 --- a/incubator/sogo/4.0.12/templates/common.yaml +++ b/incubator/sogo/4.0.13/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.values.setup" . }} +{{- include "common.setup" . }} {{/* Render config and secrets for sogo */}} {{- include "sogo.config" . }} @@ -23,4 +23,4 @@ volumeSpec: {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "common.postSetup" . }} diff --git a/incubator/sogo/4.0.12/test_values.yaml b/incubator/sogo/4.0.13/test_values.yaml similarity index 83% rename from incubator/sogo/4.0.12/test_values.yaml rename to incubator/sogo/4.0.13/test_values.yaml index 7ae154d171..0cf00b78a9 100644 --- a/incubator/sogo/4.0.12/test_values.yaml +++ b/incubator/sogo/4.0.13/test_values.yaml @@ -12,11 +12,6 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -postgresqlImage: - repository: bitnami/postgresql - pullPolicy: IfNotPresent - tag: 13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a - # -- services service: main: @@ -24,23 +19,6 @@ service: main: port: 80 -# -- initcontainers -initContainers: - # -- wait for database before starting sogo - init-postgresdb: - image: "{{ .Values.postgresqlImage.repository }}:{{ .Values.postgresqlImage.tag }}" - command: - - "sh" - - "-c" - - "until pg_isready -U sogo -h ${pghost} ; do sleep 2 ; done" - imagePullPolicy: IfNotPresent - env: - - name: pghost - valueFrom: - secretKeyRef: - name: dbcreds - key: plainhost - # -- persistence settings persistence: data: @@ -64,9 +42,9 @@ persistence: # -- postgres dependency settings postgresql: enabled: true + existingSecret: "dbcreds" postgresqlUsername: sogo postgresqlDatabase: sogo - existingSecret: dbcreds # -- memcached dependency settings memcached: diff --git a/incubator/sogo/4.0.12/values.yaml b/incubator/sogo/4.0.13/values.yaml similarity index 100% rename from incubator/sogo/4.0.12/values.yaml rename to incubator/sogo/4.0.13/values.yaml diff --git a/stable/authelia/4.0.12/CHANGELOG.md b/stable/authelia/4.0.12/CHANGELOG.md deleted file mode 100644 index 9683418483..0000000000 --- a/stable/authelia/4.0.12/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ - - -### [authelia-4.0.12](https://github.com/truecharts/apps/compare/authelia-4.0.11...authelia-4.0.12) (2021-10-05) - -#### Chore - -* update non-major deps helm releases ([#1099](https://github.com/truecharts/apps/issues/1099)) - diff --git a/stable/authelia/4.0.12/charts/common-8.2.2.tgz b/stable/authelia/4.0.12/charts/common-8.2.2.tgz deleted file mode 100644 index 7d13265fc5..0000000000 Binary files a/stable/authelia/4.0.12/charts/common-8.2.2.tgz and /dev/null differ diff --git a/stable/authelia/4.0.12/charts/postgresql-3.0.8.tgz b/stable/authelia/4.0.12/charts/postgresql-3.0.8.tgz deleted file mode 100644 index 4668ecda1c..0000000000 Binary files a/stable/authelia/4.0.12/charts/postgresql-3.0.8.tgz and /dev/null differ diff --git a/stable/authelia/4.0.13/CHANGELOG.md b/stable/authelia/4.0.13/CHANGELOG.md new file mode 100644 index 0000000000..32adefc93c --- /dev/null +++ b/stable/authelia/4.0.13/CHANGELOG.md @@ -0,0 +1,4 @@ + + +### [authelia-4.0.13](https://github.com/truecharts/apps/compare/authelia-4.0.12...authelia-4.0.13) (2021-10-09) + diff --git a/stable/authelia/4.0.12/CONFIG.md b/stable/authelia/4.0.13/CONFIG.md similarity index 100% rename from stable/authelia/4.0.12/CONFIG.md rename to stable/authelia/4.0.13/CONFIG.md diff --git a/stable/authelia/4.0.12/Chart.lock b/stable/authelia/4.0.13/Chart.lock similarity index 56% rename from stable/authelia/4.0.12/Chart.lock rename to stable/authelia/4.0.13/Chart.lock index eba0e5a32a..90e9b0f973 100644 --- a/stable/authelia/4.0.12/Chart.lock +++ b/stable/authelia/4.0.13/Chart.lock @@ -1,12 +1,12 @@ dependencies: - name: common repository: https://truecharts.org - version: 8.2.2 + version: 8.3.4 - name: postgresql repository: https://truecharts.org/ - version: 3.0.8 + version: 3.0.12 - name: redis repository: https://charts.bitnami.com/bitnami version: 15.4.1 -digest: sha256:bfe11eec09664fb48f91828300383b3cccb92e7f708cb783ba0f8491d8d37ccf -generated: "2021-10-05T12:13:31.25987279Z" +digest: sha256:00ccb5dec57ec1d36f0a3b10f4ffa91c1b8e4b08ea10ca3848396250bdfd11b2 +generated: "2021-10-09T23:21:42.05449075Z" diff --git a/stable/authelia/4.0.12/Chart.yaml b/stable/authelia/4.0.13/Chart.yaml similarity index 94% rename from stable/authelia/4.0.12/Chart.yaml rename to stable/authelia/4.0.13/Chart.yaml index 74ba5895ca..62fb68b5ed 100644 --- a/stable/authelia/4.0.12/Chart.yaml +++ b/stable/authelia/4.0.13/Chart.yaml @@ -3,11 +3,11 @@ appVersion: "4.31.0" dependencies: - name: common repository: https://truecharts.org - version: 8.2.2 + version: 8.3.4 - condition: postgresql.enabled name: postgresql repository: https://truecharts.org/ - version: 3.0.8 + version: 3.0.12 - condition: redis.enabled name: redis repository: https://charts.bitnami.com/bitnami @@ -38,4 +38,4 @@ sources: - https://github.com/authelia/chartrepo - https://github.com/authelia/authelia type: application -version: 4.0.12 +version: 4.0.13 diff --git a/stable/authelia/4.0.12/README.md b/stable/authelia/4.0.13/README.md similarity index 93% rename from stable/authelia/4.0.12/README.md rename to stable/authelia/4.0.13/README.md index 06ec491ecd..4f91502a50 100644 --- a/stable/authelia/4.0.12/README.md +++ b/stable/authelia/4.0.13/README.md @@ -19,8 +19,8 @@ Kubernetes: `>=1.16.0-0` | Repository | Name | Version | |------------|------|---------| | https://charts.bitnami.com/bitnami | redis | 15.4.1 | -| https://truecharts.org/ | postgresql | 3.0.8 | -| https://truecharts.org | common | 8.2.2 | +| https://truecharts.org/ | postgresql | 3.0.12 | +| https://truecharts.org | common | 8.3.4 | ## Installing the Chart diff --git a/stable/authelia/4.0.12/app-readme.md b/stable/authelia/4.0.13/app-readme.md similarity index 100% rename from stable/authelia/4.0.12/app-readme.md rename to stable/authelia/4.0.13/app-readme.md diff --git a/stable/authelia/4.0.13/charts/common-8.3.4.tgz b/stable/authelia/4.0.13/charts/common-8.3.4.tgz new file mode 100644 index 0000000000..0e699cbf44 Binary files /dev/null and b/stable/authelia/4.0.13/charts/common-8.3.4.tgz differ diff --git a/stable/authelia/4.0.13/charts/postgresql-3.0.12.tgz b/stable/authelia/4.0.13/charts/postgresql-3.0.12.tgz new file mode 100644 index 0000000000..337416dd23 Binary files /dev/null and b/stable/authelia/4.0.13/charts/postgresql-3.0.12.tgz differ diff --git a/stable/authelia/4.0.12/charts/redis-15.4.1.tgz b/stable/authelia/4.0.13/charts/redis-15.4.1.tgz similarity index 100% rename from stable/authelia/4.0.12/charts/redis-15.4.1.tgz rename to stable/authelia/4.0.13/charts/redis-15.4.1.tgz diff --git a/stable/authelia/4.0.12/helm-values.md b/stable/authelia/4.0.13/helm-values.md similarity index 90% rename from stable/authelia/4.0.12/helm-values.md rename to stable/authelia/4.0.13/helm-values.md index 0f5bb4632d..01bac4e4dc 100644 --- a/stable/authelia/4.0.12/helm-values.md +++ b/stable/authelia/4.0.13/helm-values.md @@ -64,14 +64,6 @@ You will, however, be able to use all values referenced in the common chart here | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"ghcr.io/authelia/authelia"` | | | image.tag | string | `"4.31.0@sha256:6036f2b1fa3214fdcf189a8f28f40a856372413984b08f15ba4fb5891d77bc0a"` | | -| initContainers.init-postgresdb.command[0] | string | `"sh"` | | -| initContainers.init-postgresdb.command[1] | string | `"-c"` | | -| initContainers.init-postgresdb.command[2] | string | `"until pg_isready -U authelia -h ${pghost} ; do sleep 2 ; done"` | | -| initContainers.init-postgresdb.env[0].name | string | `"pghost"` | | -| initContainers.init-postgresdb.env[0].valueFrom.secretKeyRef.key | string | `"plainhost"` | | -| initContainers.init-postgresdb.env[0].valueFrom.secretKeyRef.name | string | `"dbcreds"` | | -| initContainers.init-postgresdb.image | string | `"{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}"` | | -| initContainers.init-postgresdb.imagePullPolicy | string | `"IfNotPresent"` | | | log.format | string | `"text"` | | | log.level | string | `"trace"` | | | notifier.disable_startup_check | bool | `false` | | @@ -108,9 +100,6 @@ You will, however, be able to use all values referenced in the common chart here | postgresql.existingSecret | string | `"dbcreds"` | | | postgresql.postgresqlDatabase | string | `"authelia"` | | | postgresql.postgresqlUsername | string | `"authelia"` | | -| postgresqlImage.pullPolicy | string | `"IfNotPresent"` | | -| postgresqlImage.repository | string | `"bitnami/postgresql"` | | -| postgresqlImage.tag | string | `"13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a"` | | | probes.liveness.path | string | `"/api/health\""` | | | probes.liveness.type | string | `"HTTP"` | | | probes.readiness.path | string | `"/api/health"` | | diff --git a/stable/authelia/4.0.12/ix_values.yaml b/stable/authelia/4.0.13/ix_values.yaml similarity index 97% rename from stable/authelia/4.0.12/ix_values.yaml rename to stable/authelia/4.0.13/ix_values.yaml index 6b520484a2..1a07671a0e 100644 --- a/stable/authelia/4.0.12/ix_values.yaml +++ b/stable/authelia/4.0.13/ix_values.yaml @@ -9,11 +9,6 @@ image: pullPolicy: IfNotPresent tag: 4.31.0@sha256:6036f2b1fa3214fdcf189a8f28f40a856372413984b08f15ba4fb5891d77bc0a -postgresqlImage: - repository: bitnami/postgresql - pullPolicy: IfNotPresent - tag: 13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a - enableServiceLinks: false @@ -39,9 +34,9 @@ initContainers: # Enabled postgres postgresql: enabled: true + existingSecret: "dbcreds" postgresqlUsername: authelia postgresqlDatabase: authelia - existingSecret: dbcreds persistence: db: storageClass: "SCALE-ZFS" diff --git a/stable/authelia/4.0.12/questions.yaml b/stable/authelia/4.0.13/questions.yaml similarity index 100% rename from stable/authelia/4.0.12/questions.yaml rename to stable/authelia/4.0.13/questions.yaml diff --git a/stable/authelia/4.0.12/templates/_configmap.tpl b/stable/authelia/4.0.13/templates/_configmap.tpl similarity index 100% rename from stable/authelia/4.0.12/templates/_configmap.tpl rename to stable/authelia/4.0.13/templates/_configmap.tpl diff --git a/stable/authelia/4.0.12/templates/_secrets.tpl b/stable/authelia/4.0.13/templates/_secrets.tpl similarity index 73% rename from stable/authelia/4.0.12/templates/_secrets.tpl rename to stable/authelia/4.0.13/templates/_secrets.tpl index c2d10e01fa..0bbf81ef8e 100644 --- a/stable/authelia/4.0.12/templates/_secrets.tpl +++ b/stable/authelia/4.0.13/templates/_secrets.tpl @@ -2,31 +2,6 @@ {{- define "authelia.secrets" -}} --- -apiVersion: v1 -kind: Secret -metadata: - labels: - {{- include "common.labels" . | nindent 4 }} - name: dbcreds -{{- $dbprevious := lookup "v1" "Secret" .Release.Namespace "dbcreds" }} -{{- $dbPass := "" }} -data: -{{- if $dbprevious }} - {{- $dbPass = ( index $dbprevious.data "postgresql-password" ) | b64dec }} - postgresql-password: {{ ( index $dbprevious.data "postgresql-password" ) }} - postgresql-postgres-password: {{ ( index $dbprevious.data "postgresql-postgres-password" ) }} -{{- else }} - {{- $dbPass = randAlphaNum 50 }} - postgresql-password: {{ $dbPass | b64enc | quote }} - postgresql-postgres-password: {{ randAlphaNum 50 | b64enc | quote }} -{{- end }} - url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase ) | b64enc | quote }} - plainhost: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }} -type: Opaque - - ---- - apiVersion: v1 kind: Secret metadata: @@ -88,11 +63,7 @@ data: DUO_API_KEY: {{ .Values.duo_api.plain_api_key | b64enc }} {{- end }} - {{- if $dbprevious }} - STORAGE_PASSWORD: {{ ( index $dbprevious.data "postgresql-password" ) }} - {{- else }} - STORAGE_PASSWORD: {{ $dbPass | b64enc | quote }} - {{- end }} + STORAGE_PASSWORD: {{ .Values.postgresql.postgresqlPassword | trimAll "\"" | b64enc }} {{- if $redisprevious }} REDIS_PASSWORD: {{ ( index $redisprevious.data "redis-password" ) }} diff --git a/stable/authelia/4.0.12/templates/common.yaml b/stable/authelia/4.0.13/templates/common.yaml similarity index 96% rename from stable/authelia/4.0.12/templates/common.yaml rename to stable/authelia/4.0.13/templates/common.yaml index a31b342f9a..0afe8de1d3 100644 --- a/stable/authelia/4.0.12/templates/common.yaml +++ b/stable/authelia/4.0.13/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.values.setup" . }} +{{- include "common.setup" . }} {{/* Render configmap for authelia */}} {{- include "authelia.configmap" . }} @@ -69,4 +69,4 @@ volumeSpec: {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "common.postSetup" . }} diff --git a/stable/authelia/4.0.12/test_values.yaml b/stable/authelia/4.0.13/test_values.yaml similarity index 97% rename from stable/authelia/4.0.12/test_values.yaml rename to stable/authelia/4.0.13/test_values.yaml index 32aaf90f77..ad07070b79 100644 --- a/stable/authelia/4.0.12/test_values.yaml +++ b/stable/authelia/4.0.13/test_values.yaml @@ -5,11 +5,6 @@ image: pullPolicy: IfNotPresent tag: 4.31.0@sha256:6036f2b1fa3214fdcf189a8f28f40a856372413984b08f15ba4fb5891d77bc0a -postgresqlImage: - repository: bitnami/postgresql - pullPolicy: IfNotPresent - tag: 13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a - command: ["authelia"] args: ["--config=/configuration.yaml"] @@ -21,21 +16,6 @@ service: main: port: 9091 -initContainers: - init-postgresdb: - image: "{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}" - command: - - "sh" - - "-c" - - "until pg_isready -U authelia -h ${pghost} ; do sleep 2 ; done" - imagePullPolicy: IfNotPresent - env: - - name: pghost - valueFrom: - secretKeyRef: - name: dbcreds - key: plainhost - persistence: config: enabled: true @@ -54,9 +34,9 @@ persistence: # Enabled postgres postgresql: enabled: true + existingSecret: "dbcreds" postgresqlUsername: authelia postgresqlDatabase: authelia - existingSecret: dbcreds # Enabled redis # ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/redis diff --git a/stable/authelia/4.0.12/values.yaml b/stable/authelia/4.0.13/values.yaml similarity index 100% rename from stable/authelia/4.0.12/values.yaml rename to stable/authelia/4.0.13/values.yaml diff --git a/stable/fireflyiii/9.0.11/CHANGELOG.md b/stable/fireflyiii/9.0.11/CHANGELOG.md deleted file mode 100644 index f9088c5875..0000000000 --- a/stable/fireflyiii/9.0.11/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ - - -### [fireflyiii-9.0.11](https://github.com/truecharts/apps/compare/fireflyiii-9.0.10...fireflyiii-9.0.11) (2021-10-05) - -#### Chore - -* update non-major deps helm releases ([#1099](https://github.com/truecharts/apps/issues/1099)) - diff --git a/stable/fireflyiii/9.0.11/Chart.lock b/stable/fireflyiii/9.0.11/Chart.lock deleted file mode 100644 index e1aa80b030..0000000000 --- a/stable/fireflyiii/9.0.11/Chart.lock +++ /dev/null @@ -1,9 +0,0 @@ -dependencies: -- name: common - repository: https://truecharts.org - version: 8.2.2 -- name: postgresql - repository: https://truecharts.org/ - version: 3.0.8 -digest: sha256:492c4b7106d4921456b7460b2d7b62e769d3c736623c8aff80325387fa44363c -generated: "2021-10-05T12:16:36.305006386Z" diff --git a/stable/fireflyiii/9.0.11/charts/common-8.2.2.tgz b/stable/fireflyiii/9.0.11/charts/common-8.2.2.tgz deleted file mode 100644 index 7d13265fc5..0000000000 Binary files a/stable/fireflyiii/9.0.11/charts/common-8.2.2.tgz and /dev/null differ diff --git a/stable/fireflyiii/9.0.11/charts/postgresql-3.0.8.tgz b/stable/fireflyiii/9.0.11/charts/postgresql-3.0.8.tgz deleted file mode 100644 index 4668ecda1c..0000000000 Binary files a/stable/fireflyiii/9.0.11/charts/postgresql-3.0.8.tgz and /dev/null differ diff --git a/stable/fireflyiii/9.0.11/templates/secrets.yaml b/stable/fireflyiii/9.0.11/templates/secrets.yaml deleted file mode 100644 index 711b9e06d8..0000000000 --- a/stable/fireflyiii/9.0.11/templates/secrets.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: dbcreds -{{- $previous := lookup "v1" "Secret" .Release.Namespace "dbcreds" }} -{{- $dbPass := "" }} -data: -{{- if $previous }} - {{- $dbPass = ( index $previous.data "postgresql-password" ) | b64dec }} - postgresql-password: {{ ( index $previous.data "postgresql-password" ) }} - postgresql-postgres-password: {{ ( index $previous.data "postgresql-postgres-password" ) }} -{{- else }} - {{- $dbPass = randAlphaNum 50 }} - postgresql-password: {{ $dbPass | b64enc | quote }} - postgresql-postgres-password: {{ randAlphaNum 50 | b64enc | quote }} -{{- end }} - url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase ) | b64enc | quote }} - postgresql_host: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }} - plainhost: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }} -type: Opaque diff --git a/stable/fireflyiii/9.0.12/CHANGELOG.md b/stable/fireflyiii/9.0.12/CHANGELOG.md new file mode 100644 index 0000000000..c8227ab2ae --- /dev/null +++ b/stable/fireflyiii/9.0.12/CHANGELOG.md @@ -0,0 +1,4 @@ + + +### [fireflyiii-9.0.12](https://github.com/truecharts/apps/compare/fireflyiii-9.0.11...fireflyiii-9.0.12) (2021-10-09) + diff --git a/stable/fireflyiii/9.0.11/CONFIG.md b/stable/fireflyiii/9.0.12/CONFIG.md similarity index 100% rename from stable/fireflyiii/9.0.11/CONFIG.md rename to stable/fireflyiii/9.0.12/CONFIG.md diff --git a/stable/fireflyiii/9.0.12/Chart.lock b/stable/fireflyiii/9.0.12/Chart.lock new file mode 100644 index 0000000000..7d3f84ed41 --- /dev/null +++ b/stable/fireflyiii/9.0.12/Chart.lock @@ -0,0 +1,9 @@ +dependencies: +- name: common + repository: https://truecharts.org + version: 8.3.4 +- name: postgresql + repository: https://truecharts.org/ + version: 3.0.12 +digest: sha256:e7a3ac4f590bf3fb97c3062d1443aa9987913a6d0f53fb1e2d1100ce9fedf324 +generated: "2021-10-09T23:22:03.323072665Z" diff --git a/stable/fireflyiii/9.0.11/Chart.yaml b/stable/fireflyiii/9.0.12/Chart.yaml similarity index 93% rename from stable/fireflyiii/9.0.11/Chart.yaml rename to stable/fireflyiii/9.0.12/Chart.yaml index 9d96f7a78a..9d199799f1 100644 --- a/stable/fireflyiii/9.0.11/Chart.yaml +++ b/stable/fireflyiii/9.0.12/Chart.yaml @@ -3,11 +3,11 @@ appVersion: "5.5.12" dependencies: - name: common repository: https://truecharts.org - version: 8.2.2 + version: 8.3.4 - condition: postgresql.enabled name: postgresql repository: https://truecharts.org/ - version: 3.0.8 + version: 3.0.12 deprecated: false description: A free and open source personal finance manager home: https://github.com/firefly-iii/firefly-iii/ @@ -27,4 +27,4 @@ name: fireflyiii sources: - https://github.com/firefly-iii/firefly-iii/ type: application -version: 9.0.11 +version: 9.0.12 diff --git a/stable/fireflyiii/9.0.11/README.md b/stable/fireflyiii/9.0.12/README.md similarity index 92% rename from stable/fireflyiii/9.0.11/README.md rename to stable/fireflyiii/9.0.12/README.md index 387d835ac7..459539e3cc 100644 --- a/stable/fireflyiii/9.0.11/README.md +++ b/stable/fireflyiii/9.0.12/README.md @@ -17,8 +17,8 @@ Kubernetes: `>=1.16.0-0` | Repository | Name | Version | |------------|------|---------| -| https://truecharts.org/ | postgresql | 3.0.8 | -| https://truecharts.org | common | 8.2.2 | +| https://truecharts.org/ | postgresql | 3.0.12 | +| https://truecharts.org | common | 8.3.4 | ## Installing the Chart diff --git a/stable/fireflyiii/9.0.11/app-readme.md b/stable/fireflyiii/9.0.12/app-readme.md similarity index 100% rename from stable/fireflyiii/9.0.11/app-readme.md rename to stable/fireflyiii/9.0.12/app-readme.md diff --git a/stable/fireflyiii/9.0.12/charts/common-8.3.4.tgz b/stable/fireflyiii/9.0.12/charts/common-8.3.4.tgz new file mode 100644 index 0000000000..0e699cbf44 Binary files /dev/null and b/stable/fireflyiii/9.0.12/charts/common-8.3.4.tgz differ diff --git a/stable/fireflyiii/9.0.12/charts/postgresql-3.0.12.tgz b/stable/fireflyiii/9.0.12/charts/postgresql-3.0.12.tgz new file mode 100644 index 0000000000..337416dd23 Binary files /dev/null and b/stable/fireflyiii/9.0.12/charts/postgresql-3.0.12.tgz differ diff --git a/stable/fireflyiii/9.0.11/helm-values.md b/stable/fireflyiii/9.0.12/helm-values.md similarity index 67% rename from stable/fireflyiii/9.0.11/helm-values.md rename to stable/fireflyiii/9.0.12/helm-values.md index 910492e370..03de13ebbe 100644 --- a/stable/fireflyiii/9.0.11/helm-values.md +++ b/stable/fireflyiii/9.0.12/helm-values.md @@ -16,21 +16,13 @@ You will, however, be able to use all values referenced in the common chart here | env.DB_DATABASE | string | `"firefly"` | | | env.DB_PORT | int | `5432` | | | env.DB_USERNAME | string | `"firefly"` | | -| envValueFrom.DB_HOST.secretKeyRef.key | string | `"postgresql_host"` | | +| envValueFrom.DB_HOST.secretKeyRef.key | string | `"plainhost"` | | | envValueFrom.DB_HOST.secretKeyRef.name | string | `"dbcreds"` | | | envValueFrom.DB_PASSWORD.secretKeyRef.key | string | `"postgresql-password"` | | | envValueFrom.DB_PASSWORD.secretKeyRef.name | string | `"dbcreds"` | | | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"fireflyiii/core"` | | | image.tag | string | `"version-5.5.12@sha256:9a1f87a8ad38694675390756be9686fe9d8ba941fe1f145641626135c7eb5e4b"` | | -| initContainers.init-postgresdb.command[0] | string | `"sh"` | | -| initContainers.init-postgresdb.command[1] | string | `"-c"` | | -| initContainers.init-postgresdb.command[2] | string | `"until pg_isready -U firefly -h ${pghost} ; do sleep 2 ; done"` | | -| initContainers.init-postgresdb.env[0].name | string | `"pghost"` | | -| initContainers.init-postgresdb.env[0].valueFrom.secretKeyRef.key | string | `"plainhost"` | | -| initContainers.init-postgresdb.env[0].valueFrom.secretKeyRef.name | string | `"dbcreds"` | | -| initContainers.init-postgresdb.image | string | `"{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}"` | | -| initContainers.init-postgresdb.imagePullPolicy | string | `"IfNotPresent"` | | | persistence.data.accessMode | string | `"ReadWriteOnce"` | | | persistence.data.enabled | bool | `true` | | | persistence.data.mountPath | string | `"/var/www/html/storage/upload"` | | @@ -40,9 +32,6 @@ You will, however, be able to use all values referenced in the common chart here | postgresql.existingSecret | string | `"dbcreds"` | | | postgresql.postgresqlDatabase | string | `"firefly"` | | | postgresql.postgresqlUsername | string | `"firefly"` | | -| postgresqlImage.pullPolicy | string | `"IfNotPresent"` | | -| postgresqlImage.repository | string | `"bitnami/postgresql"` | | -| postgresqlImage.tag | string | `"13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a"` | | | probes.liveness.path | string | `"/login"` | | | probes.readiness.path | string | `"/login"` | | | probes.startup.path | string | `"/login"` | | diff --git a/stable/fireflyiii/9.0.11/ix_values.yaml b/stable/fireflyiii/9.0.12/ix_values.yaml similarity index 64% rename from stable/fireflyiii/9.0.11/ix_values.yaml rename to stable/fireflyiii/9.0.12/ix_values.yaml index 957453b5ca..83a0a486e1 100644 --- a/stable/fireflyiii/9.0.11/ix_values.yaml +++ b/stable/fireflyiii/9.0.12/ix_values.yaml @@ -9,27 +9,6 @@ image: pullPolicy: IfNotPresent tag: version-5.5.12@sha256:9a1f87a8ad38694675390756be9686fe9d8ba941fe1f145641626135c7eb5e4b - -postgresqlImage: - repository: bitnami/postgresql - pullPolicy: IfNotPresent - tag: 13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a - -initContainers: - init-postgresdb: - image: "{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}" - command: - - "sh" - - "-c" - - "until pg_isready -U authelia -h ${pghost} ; do sleep 2 ; done" - imagePullPolicy: IfNotPresent - env: - - name: pghost - valueFrom: - secretKeyRef: - name: dbcreds - key: plainhost - probes: liveness: path: "/login" @@ -50,7 +29,7 @@ envValueFrom: DB_HOST: secretKeyRef: name: dbcreds - key: postgresql_host + key: plainhost DB_PASSWORD: secretKeyRef: name: dbcreds @@ -59,9 +38,9 @@ envValueFrom: # Enabled postgres postgresql: enabled: true + existingSecret: "dbcreds" postgresqlUsername: fireflyiii postgresqlDatabase: fireflyiii - existingSecret: dbcreds persistence: db: storageClass: "SCALE-ZFS" diff --git a/stable/fireflyiii/9.0.11/questions.yaml b/stable/fireflyiii/9.0.12/questions.yaml similarity index 100% rename from stable/fireflyiii/9.0.11/questions.yaml rename to stable/fireflyiii/9.0.12/questions.yaml diff --git a/stable/fireflyiii/9.0.11/templates/common.yaml b/stable/fireflyiii/9.0.12/templates/common.yaml similarity index 54% rename from stable/fireflyiii/9.0.11/templates/common.yaml rename to stable/fireflyiii/9.0.12/templates/common.yaml index 64e027ac0f..da58e96d9e 100644 --- a/stable/fireflyiii/9.0.11/templates/common.yaml +++ b/stable/fireflyiii/9.0.12/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.values.setup" . }} +{{- include "common.setup" . }} {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "common.postSetup" . }} diff --git a/stable/fireflyiii/9.0.11/test_values.yaml b/stable/fireflyiii/9.0.12/test_values.yaml similarity index 60% rename from stable/fireflyiii/9.0.11/test_values.yaml rename to stable/fireflyiii/9.0.12/test_values.yaml index a0462dbfff..fe12d8a9a6 100644 --- a/stable/fireflyiii/9.0.11/test_values.yaml +++ b/stable/fireflyiii/9.0.12/test_values.yaml @@ -8,32 +8,12 @@ image: securityContext: readOnlyRootFilesystem: false -postgresqlImage: - repository: bitnami/postgresql - pullPolicy: IfNotPresent - tag: 13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a - service: main: ports: main: port: 8080 -initContainers: - init-postgresdb: - image: "{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}" - command: - - "sh" - - "-c" - - "until pg_isready -U firefly -h ${pghost} ; do sleep 2 ; done" - imagePullPolicy: IfNotPresent - env: - - name: pghost - valueFrom: - secretKeyRef: - name: dbcreds - key: plainhost - probes: liveness: path: "/login" @@ -55,7 +35,7 @@ envValueFrom: DB_HOST: secretKeyRef: name: dbcreds - key: postgresql_host + key: plainhost DB_PASSWORD: secretKeyRef: name: dbcreds @@ -72,6 +52,6 @@ persistence: # Enabled postgres postgresql: enabled: true + existingSecret: "dbcreds" postgresqlUsername: firefly postgresqlDatabase: firefly - existingSecret: dbcreds diff --git a/stable/fireflyiii/9.0.11/values.yaml b/stable/fireflyiii/9.0.12/values.yaml similarity index 100% rename from stable/fireflyiii/9.0.11/values.yaml rename to stable/fireflyiii/9.0.12/values.yaml diff --git a/stable/gitea/1.0.3/CHANGELOG.md b/stable/gitea/1.0.3/CHANGELOG.md deleted file mode 100644 index f7f1da661e..0000000000 --- a/stable/gitea/1.0.3/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ - - -### [gitea-1.0.3](https://github.com/truecharts/apps/compare/gitea-1.0.2...gitea-1.0.3) (2021-10-05) - -#### Chore - -* update non-major deps helm releases ([#1099](https://github.com/truecharts/apps/issues/1099)) - diff --git a/stable/gitea/1.0.3/charts/common-8.2.2.tgz b/stable/gitea/1.0.3/charts/common-8.2.2.tgz deleted file mode 100644 index 7d13265fc5..0000000000 Binary files a/stable/gitea/1.0.3/charts/common-8.2.2.tgz and /dev/null differ diff --git a/stable/gitea/1.0.3/charts/postgresql-3.0.8.tgz b/stable/gitea/1.0.3/charts/postgresql-3.0.8.tgz deleted file mode 100644 index 4668ecda1c..0000000000 Binary files a/stable/gitea/1.0.3/charts/postgresql-3.0.8.tgz and /dev/null differ diff --git a/stable/gitea/1.0.4/CHANGELOG.md b/stable/gitea/1.0.4/CHANGELOG.md new file mode 100644 index 0000000000..c9f2ae867b --- /dev/null +++ b/stable/gitea/1.0.4/CHANGELOG.md @@ -0,0 +1,4 @@ + + +### [gitea-1.0.4](https://github.com/truecharts/apps/compare/gitea-1.0.3...gitea-1.0.4) (2021-10-09) + diff --git a/stable/gitea/1.0.3/CONFIG.md b/stable/gitea/1.0.4/CONFIG.md similarity index 100% rename from stable/gitea/1.0.3/CONFIG.md rename to stable/gitea/1.0.4/CONFIG.md diff --git a/stable/gitea/1.0.3/Chart.lock b/stable/gitea/1.0.4/Chart.lock similarity index 56% rename from stable/gitea/1.0.3/Chart.lock rename to stable/gitea/1.0.4/Chart.lock index e1326e0448..c30db70a84 100644 --- a/stable/gitea/1.0.3/Chart.lock +++ b/stable/gitea/1.0.4/Chart.lock @@ -1,12 +1,12 @@ dependencies: - name: common repository: https://truecharts.org - version: 8.2.2 + version: 8.3.4 - name: postgresql repository: https://truecharts.org/ - version: 3.0.8 + version: 3.0.12 - name: memcached repository: https://charts.bitnami.com/bitnami version: 5.15.4 -digest: sha256:505855bf97f71b5fae35edae4dbb54d3da6d8fd7209ff18b57a46b96d86acdd8 -generated: "2021-10-05T12:18:02.581959864Z" +digest: sha256:70eef654ba78195dc69f7fef5bf059f6c258fcb597335cb0a1af133ed343b640 +generated: "2021-10-09T23:22:20.924446095Z" diff --git a/stable/gitea/1.0.3/Chart.yaml b/stable/gitea/1.0.4/Chart.yaml similarity index 94% rename from stable/gitea/1.0.3/Chart.yaml rename to stable/gitea/1.0.4/Chart.yaml index d443b68e97..e6dc6eb2b2 100644 --- a/stable/gitea/1.0.3/Chart.yaml +++ b/stable/gitea/1.0.4/Chart.yaml @@ -3,11 +3,11 @@ appVersion: "1.15.3" dependencies: - name: common repository: https://truecharts.org - version: 8.2.2 + version: 8.3.4 - condition: postgresql.enabled name: postgresql repository: https://truecharts.org/ - version: 3.0.8 + version: 3.0.12 - condition: memcached.enabled name: memcached repository: https://charts.bitnami.com/bitnami @@ -34,4 +34,4 @@ sources: - https://github.com/go-gitea/gitea - https://hub.docker.com/r/gitea/gitea/ type: application -version: 1.0.3 +version: 1.0.4 diff --git a/stable/gitea/1.0.3/README.md b/stable/gitea/1.0.4/README.md similarity index 93% rename from stable/gitea/1.0.3/README.md rename to stable/gitea/1.0.4/README.md index c9f343e09d..e5821773ae 100644 --- a/stable/gitea/1.0.3/README.md +++ b/stable/gitea/1.0.4/README.md @@ -20,8 +20,8 @@ Kubernetes: `>=1.16.0-0` | Repository | Name | Version | |------------|------|---------| | https://charts.bitnami.com/bitnami | memcached | 5.15.4 | -| https://truecharts.org/ | postgresql | 3.0.8 | -| https://truecharts.org | common | 8.2.2 | +| https://truecharts.org/ | postgresql | 3.0.12 | +| https://truecharts.org | common | 8.3.4 | ## Installing the Chart diff --git a/stable/gitea/1.0.3/app-readme.md b/stable/gitea/1.0.4/app-readme.md similarity index 100% rename from stable/gitea/1.0.3/app-readme.md rename to stable/gitea/1.0.4/app-readme.md diff --git a/stable/gitea/1.0.4/charts/common-8.3.4.tgz b/stable/gitea/1.0.4/charts/common-8.3.4.tgz new file mode 100644 index 0000000000..0e699cbf44 Binary files /dev/null and b/stable/gitea/1.0.4/charts/common-8.3.4.tgz differ diff --git a/stable/gitea/1.0.3/charts/memcached-5.15.4.tgz b/stable/gitea/1.0.4/charts/memcached-5.15.4.tgz similarity index 100% rename from stable/gitea/1.0.3/charts/memcached-5.15.4.tgz rename to stable/gitea/1.0.4/charts/memcached-5.15.4.tgz diff --git a/stable/gitea/1.0.4/charts/postgresql-3.0.12.tgz b/stable/gitea/1.0.4/charts/postgresql-3.0.12.tgz new file mode 100644 index 0000000000..337416dd23 Binary files /dev/null and b/stable/gitea/1.0.4/charts/postgresql-3.0.12.tgz differ diff --git a/stable/gitea/1.0.3/ci/basic-values.yaml b/stable/gitea/1.0.4/ci/basic-values.yaml similarity index 100% rename from stable/gitea/1.0.3/ci/basic-values.yaml rename to stable/gitea/1.0.4/ci/basic-values.yaml diff --git a/stable/gitea/1.0.3/ci/ingress-values.yaml b/stable/gitea/1.0.4/ci/ingress-values.yaml similarity index 100% rename from stable/gitea/1.0.3/ci/ingress-values.yaml rename to stable/gitea/1.0.4/ci/ingress-values.yaml diff --git a/stable/gitea/1.0.3/helm-values.md b/stable/gitea/1.0.4/helm-values.md similarity index 81% rename from stable/gitea/1.0.3/helm-values.md rename to stable/gitea/1.0.4/helm-values.md index c89e628676..bd5da5f262 100644 --- a/stable/gitea/1.0.3/helm-values.md +++ b/stable/gitea/1.0.4/helm-values.md @@ -21,14 +21,6 @@ You will, however, be able to use all values referenced in the common chart here | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"gitea/gitea"` | | | image.tag | string | `"1.15.3-rootless"` | | -| initContainers.0-init-postgresdb.command[0] | string | `"sh"` | | -| initContainers.0-init-postgresdb.command[1] | string | `"-c"` | | -| initContainers.0-init-postgresdb.command[2] | string | `"until pg_isready -U gitea -h ${pghost} ; do sleep 2 ; done"` | | -| initContainers.0-init-postgresdb.env[0].name | string | `"pghost"` | | -| initContainers.0-init-postgresdb.env[0].valueFrom.secretKeyRef.key | string | `"plainhost"` | | -| initContainers.0-init-postgresdb.env[0].valueFrom.secretKeyRef.name | string | `"dbcreds"` | | -| initContainers.0-init-postgresdb.image | string | `"{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}"` | | -| initContainers.0-init-postgresdb.imagePullPolicy | string | `"IfNotPresent"` | | | initContainers.1-init-directories.command[0] | string | `"/usr/sbin/init_directory_structure.sh"` | | | initContainers.1-init-directories.envFrom[0].configMapRef.name | string | `"gitea-env"` | | | initContainers.1-init-directories.image | string | `"{{ .Values.image.repository }}:{{ .Values.image.tag }}"` | | @@ -71,9 +63,6 @@ You will, however, be able to use all values referenced in the common chart here | postgresql.existingSecret | string | `"dbcreds"` | | | postgresql.postgresqlDatabase | string | `"gitea"` | | | postgresql.postgresqlUsername | string | `"gitea"` | | -| postgresqlImage.pullPolicy | string | `"IfNotPresent"` | | -| postgresqlImage.repository | string | `"bitnami/postgresql"` | | -| postgresqlImage.tag | string | `"13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a"` | | | service.main.ports.main.port | int | `3000` | | | service.ssh.ports.ssh.port | int | `2222` | | | service.ssh.ports.ssh.targetPort | int | `2222` | | diff --git a/stable/gitea/1.0.3/ix_values.yaml b/stable/gitea/1.0.4/ix_values.yaml similarity index 80% rename from stable/gitea/1.0.3/ix_values.yaml rename to stable/gitea/1.0.4/ix_values.yaml index 9451acc479..f16bd2bbde 100644 --- a/stable/gitea/1.0.3/ix_values.yaml +++ b/stable/gitea/1.0.4/ix_values.yaml @@ -9,29 +9,11 @@ image: tag: 1.15.3-rootless pullPolicy: IfNotPresent -postgresqlImage: - repository: bitnami/postgresql - pullPolicy: IfNotPresent - tag: 13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a - envFrom: - configMapRef: name: gitea-env initContainers: - 0-init-postgresdb: - image: "{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}" - command: - - "sh" - - "-c" - - "until pg_isready -U gitea -h ${pghost} ; do sleep 2 ; done" - imagePullPolicy: IfNotPresent - env: - - name: pghost - valueFrom: - secretKeyRef: - name: dbcreds - key: plainhost 1-init-directories: image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" command: ["/usr/sbin/init_directory_structure.sh"] diff --git a/stable/gitea/1.0.3/questions.yaml b/stable/gitea/1.0.4/questions.yaml similarity index 100% rename from stable/gitea/1.0.3/questions.yaml rename to stable/gitea/1.0.4/questions.yaml diff --git a/stable/gitea/1.0.3/templates/_configmap.tpl b/stable/gitea/1.0.4/templates/_configmap.tpl similarity index 100% rename from stable/gitea/1.0.3/templates/_configmap.tpl rename to stable/gitea/1.0.4/templates/_configmap.tpl diff --git a/stable/gitea/1.0.3/templates/_secrets.tpl b/stable/gitea/1.0.4/templates/_secrets.tpl similarity index 89% rename from stable/gitea/1.0.3/templates/_secrets.tpl rename to stable/gitea/1.0.4/templates/_secrets.tpl index 4dda8d1fe2..19e21be7b8 100644 --- a/stable/gitea/1.0.3/templates/_secrets.tpl +++ b/stable/gitea/1.0.4/templates/_secrets.tpl @@ -1,29 +1,5 @@ {{/* Define the secrets */}} {{- define "gitea.secrets" -}} ---- - -apiVersion: v1 -kind: Secret -metadata: - labels: - {{- include "common.labels" . | nindent 4 }} - name: dbcreds -{{- $dbprevious := lookup "v1" "Secret" .Release.Namespace "dbcreds" }} -{{- $dbPass := "" }} -data: -{{- if $dbprevious }} - {{- $dbPass = ( index $dbprevious.data "postgresql-password" ) | b64dec }} - postgresql-password: {{ ( index $dbprevious.data "postgresql-password" ) }} - postgresql-postgres-password: {{ ( index $dbprevious.data "postgresql-postgres-password" ) }} -{{- else }} - {{- $dbPass = randAlphaNum 50 }} - postgresql-password: {{ $dbPass | b64enc | quote }} - postgresql-postgres-password: {{ randAlphaNum 50 | b64enc | quote }} -{{- end }} - url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase ) | b64enc | quote }} - plainhost: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }} -type: Opaque - --- @@ -60,7 +36,7 @@ stringData: DB_TYPE = postgres HOST = {{ printf "%v-%v:%v" .Release.Name "postgresql" "5432" }} NAME = {{ .Values.postgresql.postgresqlDatabase }} - PASSWD = {{ $dbPass }} + PASSWD = {{ .Values.postgresql.postgresqlPassword }} USER = {{ .Values.postgresql.postgresqlUsername }} {{- range $catindex, $catvalue := .Values.customConfig }} {{- if eq $catvalue.name "database" }} diff --git a/stable/gitea/1.0.3/templates/common.yaml b/stable/gitea/1.0.4/templates/common.yaml similarity index 93% rename from stable/gitea/1.0.3/templates/common.yaml rename to stable/gitea/1.0.4/templates/common.yaml index be40973719..703865da3d 100644 --- a/stable/gitea/1.0.3/templates/common.yaml +++ b/stable/gitea/1.0.4/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.values.setup" . }} +{{- include "common.setup" . }} {{/* Render secrets for gitea */}} {{- include "gitea.secrets" . }} @@ -35,4 +35,4 @@ volumeSpec: {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "common.postSetup" . }} diff --git a/stable/gitea/1.0.3/test_values.yaml b/stable/gitea/1.0.4/test_values.yaml similarity index 81% rename from stable/gitea/1.0.3/test_values.yaml rename to stable/gitea/1.0.4/test_values.yaml index 186cc34443..7190ac7523 100644 --- a/stable/gitea/1.0.3/test_values.yaml +++ b/stable/gitea/1.0.4/test_values.yaml @@ -3,11 +3,6 @@ image: tag: 1.15.3-rootless pullPolicy: IfNotPresent -postgresqlImage: - repository: bitnami/postgresql - pullPolicy: IfNotPresent - tag: 13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a - service: main: ports: @@ -24,19 +19,6 @@ envFrom: name: gitea-env initContainers: - 0-init-postgresdb: - image: "{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}" - command: - - "sh" - - "-c" - - "until pg_isready -U gitea -h ${pghost} ; do sleep 2 ; done" - imagePullPolicy: IfNotPresent - env: - - name: pghost - valueFrom: - secretKeyRef: - name: dbcreds - key: plainhost 1-init-directories: image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" command: ["/usr/sbin/init_directory_structure.sh"] @@ -143,9 +125,9 @@ customConfig: [] # Enabled postgres postgresql: enabled: true + existingSecret: "dbcreds" postgresqlUsername: gitea postgresqlDatabase: gitea - existingSecret: dbcreds # -- memcached dependency settings memcached: diff --git a/stable/gitea/1.0.3/values.yaml b/stable/gitea/1.0.4/values.yaml similarity index 100% rename from stable/gitea/1.0.3/values.yaml rename to stable/gitea/1.0.4/values.yaml diff --git a/stable/nextcloud/6.0.13/CHANGELOG.md b/stable/nextcloud/6.0.13/CHANGELOG.md deleted file mode 100644 index 4ddcf5ef19..0000000000 --- a/stable/nextcloud/6.0.13/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ - - -### [nextcloud-6.0.13](https://github.com/truecharts/apps/compare/nextcloud-6.0.12...nextcloud-6.0.13) (2021-10-05) - -#### Chore - -* update non-major ([#1103](https://github.com/truecharts/apps/issues/1103)) - diff --git a/stable/nextcloud/6.0.13/charts/common-8.2.2.tgz b/stable/nextcloud/6.0.13/charts/common-8.2.2.tgz deleted file mode 100644 index 7d13265fc5..0000000000 Binary files a/stable/nextcloud/6.0.13/charts/common-8.2.2.tgz and /dev/null differ diff --git a/stable/nextcloud/6.0.13/charts/postgresql-3.0.8.tgz b/stable/nextcloud/6.0.13/charts/postgresql-3.0.8.tgz deleted file mode 100644 index 4668ecda1c..0000000000 Binary files a/stable/nextcloud/6.0.13/charts/postgresql-3.0.8.tgz and /dev/null differ diff --git a/stable/nextcloud/6.0.13/templates/_secrets.tpl b/stable/nextcloud/6.0.13/templates/_secrets.tpl deleted file mode 100644 index d9ae0df858..0000000000 --- a/stable/nextcloud/6.0.13/templates/_secrets.tpl +++ /dev/null @@ -1,50 +0,0 @@ -{{/* Define the secrets */}} -{{- define "nextcloud.secrets" -}} - ---- - -apiVersion: v1 -kind: Secret -metadata: - labels: - {{- include "common.labels" . | nindent 4 }} - name: dbcreds -{{- $previous := lookup "v1" "Secret" .Release.Namespace "dbcreds" }} -{{- $dbPass := "" }} -data: -{{- if $previous }} - {{- $dbPass = ( index $previous.data "postgresql-password" ) | b64dec }} - postgresql-password: {{ ( index $previous.data "postgresql-password" ) }} - postgresql-postgres-password: {{ ( index $previous.data "postgresql-postgres-password" ) }} -{{- else }} - {{- $dbPass = randAlphaNum 50 }} - postgresql-password: {{ $dbPass | b64enc | quote }} - postgresql-postgres-password: {{ randAlphaNum 50 | b64enc | quote }} -{{- end }} - url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase ) | b64enc | quote }} - host: {{ ( printf "%v-%v:5432" .Release.Name "postgresql" ) | b64enc | quote }} - plainhost: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }} -type: Opaque - ---- - -apiVersion: v1 -kind: Secret -metadata: - labels: - {{- include "common.labels" . | nindent 4 }} - name: rediscreds -{{- $redisprevious := lookup "v1" "Secret" .Release.Namespace "rediscreds" }} -{{- $redisPass := "" }} -data: -{{- if $redisprevious }} - {{- $redisPass = ( index $redisprevious.data "redis-password" ) | b64dec }} - redis-password: {{ ( index $redisprevious.data "redis-password" ) }} -{{- else }} - {{- $redisPass = randAlphaNum 50 }} - redis-password: {{ $redisPass | b64enc | quote }} -{{- end }} - masterhost: {{ ( printf "%v-%v" .Release.Name "redis-master" ) | b64enc | quote }} - slavehost: {{ ( printf "%v-%v" .Release.Name "redis-master" ) | b64enc | quote }} -type: Opaque -{{- end -}} diff --git a/stable/nextcloud/6.0.14/CHANGELOG.md b/stable/nextcloud/6.0.14/CHANGELOG.md new file mode 100644 index 0000000000..16c7feab7c --- /dev/null +++ b/stable/nextcloud/6.0.14/CHANGELOG.md @@ -0,0 +1,4 @@ + + +### [nextcloud-6.0.14](https://github.com/truecharts/apps/compare/nextcloud-6.0.13...nextcloud-6.0.14) (2021-10-09) + diff --git a/stable/nextcloud/6.0.13/CONFIG.md b/stable/nextcloud/6.0.14/CONFIG.md similarity index 100% rename from stable/nextcloud/6.0.13/CONFIG.md rename to stable/nextcloud/6.0.14/CONFIG.md diff --git a/stable/nextcloud/6.0.13/Chart.lock b/stable/nextcloud/6.0.14/Chart.lock similarity index 56% rename from stable/nextcloud/6.0.13/Chart.lock rename to stable/nextcloud/6.0.14/Chart.lock index b39e9526f8..ca6ba9abf1 100644 --- a/stable/nextcloud/6.0.13/Chart.lock +++ b/stable/nextcloud/6.0.14/Chart.lock @@ -1,12 +1,12 @@ dependencies: - name: common repository: https://truecharts.org - version: 8.2.2 + version: 8.3.4 - name: postgresql repository: https://truecharts.org/ - version: 3.0.8 + version: 3.0.12 - name: redis repository: https://charts.bitnami.com/bitnami version: 15.4.1 -digest: sha256:bfe11eec09664fb48f91828300383b3cccb92e7f708cb783ba0f8491d8d37ccf -generated: "2021-10-05T23:04:55.77374211Z" +digest: sha256:00ccb5dec57ec1d36f0a3b10f4ffa91c1b8e4b08ea10ca3848396250bdfd11b2 +generated: "2021-10-09T23:22:43.722953725Z" diff --git a/stable/nextcloud/6.0.13/Chart.yaml b/stable/nextcloud/6.0.14/Chart.yaml similarity index 94% rename from stable/nextcloud/6.0.13/Chart.yaml rename to stable/nextcloud/6.0.14/Chart.yaml index ba5a345c38..f53dbbfc3a 100644 --- a/stable/nextcloud/6.0.13/Chart.yaml +++ b/stable/nextcloud/6.0.14/Chart.yaml @@ -3,11 +3,11 @@ appVersion: "22.2.0" dependencies: - name: common repository: https://truecharts.org - version: 8.2.2 + version: 8.3.4 - condition: postgresql.enabled name: postgresql repository: https://truecharts.org/ - version: 3.0.8 + version: 3.0.12 - condition: redis.enabled name: redis repository: https://charts.bitnami.com/bitnami @@ -33,4 +33,4 @@ sources: - https://github.com/nextcloud/docker - https://github.com/nextcloud/helm type: application -version: 6.0.13 +version: 6.0.14 diff --git a/stable/nextcloud/6.0.13/README.md b/stable/nextcloud/6.0.14/README.md similarity index 93% rename from stable/nextcloud/6.0.13/README.md rename to stable/nextcloud/6.0.14/README.md index 6b4f35bc92..b116009d5d 100644 --- a/stable/nextcloud/6.0.13/README.md +++ b/stable/nextcloud/6.0.14/README.md @@ -19,8 +19,8 @@ Kubernetes: `>=1.16.0-0` | Repository | Name | Version | |------------|------|---------| | https://charts.bitnami.com/bitnami | redis | 15.4.1 | -| https://truecharts.org/ | postgresql | 3.0.8 | -| https://truecharts.org | common | 8.2.2 | +| https://truecharts.org/ | postgresql | 3.0.12 | +| https://truecharts.org | common | 8.3.4 | ## Installing the Chart diff --git a/stable/nextcloud/6.0.13/app-readme.md b/stable/nextcloud/6.0.14/app-readme.md similarity index 100% rename from stable/nextcloud/6.0.13/app-readme.md rename to stable/nextcloud/6.0.14/app-readme.md diff --git a/stable/nextcloud/6.0.14/charts/common-8.3.4.tgz b/stable/nextcloud/6.0.14/charts/common-8.3.4.tgz new file mode 100644 index 0000000000..0e699cbf44 Binary files /dev/null and b/stable/nextcloud/6.0.14/charts/common-8.3.4.tgz differ diff --git a/stable/nextcloud/6.0.14/charts/postgresql-3.0.12.tgz b/stable/nextcloud/6.0.14/charts/postgresql-3.0.12.tgz new file mode 100644 index 0000000000..337416dd23 Binary files /dev/null and b/stable/nextcloud/6.0.14/charts/postgresql-3.0.12.tgz differ diff --git a/stable/nextcloud/6.0.13/charts/redis-15.4.1.tgz b/stable/nextcloud/6.0.14/charts/redis-15.4.1.tgz similarity index 100% rename from stable/nextcloud/6.0.13/charts/redis-15.4.1.tgz rename to stable/nextcloud/6.0.14/charts/redis-15.4.1.tgz diff --git a/stable/nextcloud/6.0.13/helm-values.md b/stable/nextcloud/6.0.14/helm-values.md similarity index 81% rename from stable/nextcloud/6.0.13/helm-values.md rename to stable/nextcloud/6.0.14/helm-values.md index 955e0fe753..44fb753227 100644 --- a/stable/nextcloud/6.0.13/helm-values.md +++ b/stable/nextcloud/6.0.14/helm-values.md @@ -21,7 +21,7 @@ You will, however, be able to use all values referenced in the common chart here | envFrom[0].configMapRef.name | string | `"nextcloudconfig"` | | | envTpl.POSTGRES_DB | string | `"{{ .Values.postgresql.postgresqlDatabase }}"` | | | envTpl.POSTGRES_USER | string | `"{{ .Values.postgresql.postgresqlUsername }}"` | | -| envValueFrom.POSTGRES_HOST.secretKeyRef.key | string | `"host"` | | +| envValueFrom.POSTGRES_HOST.secretKeyRef.key | string | `"plainporthost"` | | | envValueFrom.POSTGRES_HOST.secretKeyRef.name | string | `"dbcreds"` | | | envValueFrom.POSTGRES_PASSWORD.secretKeyRef.key | string | `"postgresql-password"` | | | envValueFrom.POSTGRES_PASSWORD.secretKeyRef.name | string | `"dbcreds"` | | @@ -32,14 +32,6 @@ You will, however, be able to use all values referenced in the common chart here | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"docker.io/nextcloud"` | | | image.tag | string | `"22.2.0@sha256:50d4d103bf6a229ec0d589785e057ecdaa8cb718f197056739fa14f483e0071b"` | | -| initContainers.init-postgresdb.command[0] | string | `"sh"` | | -| initContainers.init-postgresdb.command[1] | string | `"-c"` | | -| initContainers.init-postgresdb.command[2] | string | `"until pg_isready -U nextcloud -h ${pghost} ; do sleep 2 ; done"` | | -| initContainers.init-postgresdb.env[0].name | string | `"pghost"` | | -| initContainers.init-postgresdb.env[0].valueFrom.secretKeyRef.key | string | `"plainhost"` | | -| initContainers.init-postgresdb.env[0].valueFrom.secretKeyRef.name | string | `"dbcreds"` | | -| initContainers.init-postgresdb.image | string | `"{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}"` | | -| initContainers.init-postgresdb.imagePullPolicy | string | `"IfNotPresent"` | | | persistence.data.accessMode | string | `"ReadWriteOnce"` | | | persistence.data.enabled | bool | `true` | | | persistence.data.mountPath | string | `"/var/www/html"` | | @@ -58,9 +50,6 @@ You will, however, be able to use all values referenced in the common chart here | postgresql.existingSecret | string | `"dbcreds"` | | | postgresql.postgresqlDatabase | string | `"nextcloud"` | | | postgresql.postgresqlUsername | string | `"nextcloud"` | | -| postgresqlImage.pullPolicy | string | `"IfNotPresent"` | | -| postgresqlImage.repository | string | `"bitnami/postgresql"` | | -| postgresqlImage.tag | string | `"13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a"` | | | probes | object | See below | Probe configuration -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) | | probes.liveness | object | See below | Liveness probe configuration | | probes.liveness.spec | object | "/" | If a HTTP probe is used (default for HTTP/HTTPS services) this path is used | diff --git a/stable/nextcloud/6.0.13/ix_values.yaml b/stable/nextcloud/6.0.14/ix_values.yaml similarity index 85% rename from stable/nextcloud/6.0.13/ix_values.yaml rename to stable/nextcloud/6.0.14/ix_values.yaml index 387cac6f52..ae88fdb7d1 100644 --- a/stable/nextcloud/6.0.13/ix_values.yaml +++ b/stable/nextcloud/6.0.14/ix_values.yaml @@ -9,17 +9,11 @@ image: pullPolicy: IfNotPresent tag: 22.2.0@sha256:50d4d103bf6a229ec0d589785e057ecdaa8cb718f197056739fa14f483e0071b -postgresqlImage: - repository: bitnami/postgresql - pullPolicy: IfNotPresent - tag: 13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a - strategy: type: Recreate env: {} - envTpl: POSTGRES_DB: "{{ .Values.postgresql.postgresqlDatabase }}" POSTGRES_USER: "{{ .Values.postgresql.postgresqlUsername }}" @@ -36,7 +30,7 @@ envValueFrom: POSTGRES_HOST: secretKeyRef: name: dbcreds - key: host + key: plainporthost REDIS_HOST: secretKeyRef: name: rediscreds @@ -46,21 +40,6 @@ envValueFrom: name: rediscreds key: redis-password -initContainers: - init-postgresdb: - image: "{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}" - command: - - "sh" - - "-c" - - "until pg_isready -U nextcloud -h ${pghost} ; do sleep 2 ; done" - imagePullPolicy: IfNotPresent - env: - - name: pghost - valueFrom: - secretKeyRef: - name: dbcreds - key: plainhost - # -- Probe configuration # -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) # @default -- See below @@ -134,9 +113,9 @@ cronjob: # Enabled postgres postgresql: enabled: true + existingSecret: "dbcreds" postgresqlUsername: nextcloud postgresqlDatabase: nextcloud - existingSecret: dbcreds persistence: db: storageClass: "SCALE-ZFS" diff --git a/stable/nextcloud/6.0.13/questions.yaml b/stable/nextcloud/6.0.14/questions.yaml similarity index 100% rename from stable/nextcloud/6.0.13/questions.yaml rename to stable/nextcloud/6.0.14/questions.yaml diff --git a/stable/nextcloud/6.0.13/templates/_configmap.tpl b/stable/nextcloud/6.0.14/templates/_configmap.tpl similarity index 100% rename from stable/nextcloud/6.0.13/templates/_configmap.tpl rename to stable/nextcloud/6.0.14/templates/_configmap.tpl diff --git a/stable/nextcloud/6.0.13/templates/_cronjob.tpl b/stable/nextcloud/6.0.14/templates/_cronjob.tpl similarity index 100% rename from stable/nextcloud/6.0.13/templates/_cronjob.tpl rename to stable/nextcloud/6.0.14/templates/_cronjob.tpl diff --git a/stable/nextcloud/6.0.14/templates/_secrets.tpl b/stable/nextcloud/6.0.14/templates/_secrets.tpl new file mode 100644 index 0000000000..5674413886 --- /dev/null +++ b/stable/nextcloud/6.0.14/templates/_secrets.tpl @@ -0,0 +1,25 @@ +{{/* Define the secrets */}} +{{- define "nextcloud.secrets" -}} + +--- + +apiVersion: v1 +kind: Secret +metadata: + labels: + {{- include "common.labels" . | nindent 4 }} + name: rediscreds +{{- $redisprevious := lookup "v1" "Secret" .Release.Namespace "rediscreds" }} +{{- $redisPass := "" }} +data: +{{- if $redisprevious }} + {{- $redisPass = ( index $redisprevious.data "redis-password" ) | b64dec }} + redis-password: {{ ( index $redisprevious.data "redis-password" ) }} +{{- else }} + {{- $redisPass = randAlphaNum 50 }} + redis-password: {{ $redisPass | b64enc | quote }} +{{- end }} + masterhost: {{ ( printf "%v-%v" .Release.Name "redis-master" ) | b64enc | quote }} + slavehost: {{ ( printf "%v-%v" .Release.Name "redis-master" ) | b64enc | quote }} +type: Opaque +{{- end -}} diff --git a/stable/nextcloud/6.0.13/templates/common.yaml b/stable/nextcloud/6.0.14/templates/common.yaml similarity index 87% rename from stable/nextcloud/6.0.13/templates/common.yaml rename to stable/nextcloud/6.0.14/templates/common.yaml index 53b4b7b25b..e73a8b7783 100644 --- a/stable/nextcloud/6.0.13/templates/common.yaml +++ b/stable/nextcloud/6.0.14/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.values.setup" . }} +{{- include "common.setup" . }} {{/* Render configmap for nextcloud */}} {{- include "nextcloud.configmap" . }} @@ -14,4 +14,4 @@ {{- include "nextcloud.cronjob" . }} {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "common.postSetup" . }} diff --git a/stable/nextcloud/6.0.13/test_values.yaml b/stable/nextcloud/6.0.14/test_values.yaml similarity index 86% rename from stable/nextcloud/6.0.13/test_values.yaml rename to stable/nextcloud/6.0.14/test_values.yaml index d30df4b8ac..c3ca983375 100644 --- a/stable/nextcloud/6.0.13/test_values.yaml +++ b/stable/nextcloud/6.0.14/test_values.yaml @@ -14,10 +14,6 @@ podSecurityContext: runAsGroup: 0 fsGroup: 33 -postgresqlImage: - repository: bitnami/postgresql - pullPolicy: IfNotPresent - tag: 13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a service: main: ports: @@ -51,7 +47,7 @@ envValueFrom: POSTGRES_HOST: secretKeyRef: name: dbcreds - key: host + key: plainporthost REDIS_HOST: secretKeyRef: name: rediscreds @@ -77,21 +73,6 @@ persistence: accessMode: ReadWriteOnce size: "100Gi" -initContainers: - init-postgresdb: - image: "{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}" - command: - - "sh" - - "-c" - - "until pg_isready -U nextcloud -h ${pghost} ; do sleep 2 ; done" - imagePullPolicy: IfNotPresent - env: - - name: pghost - valueFrom: - secretKeyRef: - name: dbcreds - key: plainhost - # -- Probe configuration # -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) # @default -- See below @@ -165,9 +146,9 @@ cronjob: # Enabled postgres postgresql: enabled: true + existingSecret: "dbcreds" postgresqlUsername: nextcloud postgresqlDatabase: nextcloud - existingSecret: dbcreds # Enabled redis # ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/redis diff --git a/stable/nextcloud/6.0.13/values.yaml b/stable/nextcloud/6.0.14/values.yaml similarity index 100% rename from stable/nextcloud/6.0.13/values.yaml rename to stable/nextcloud/6.0.14/values.yaml diff --git a/stable/postgresql/3.0.12/CHANGELOG.md b/stable/postgresql/3.0.12/CHANGELOG.md deleted file mode 100644 index d571fefce5..0000000000 --- a/stable/postgresql/3.0.12/CHANGELOG.md +++ /dev/null @@ -1,4 +0,0 @@ - - -### [postgresql-3.0.12](https://github.com/truecharts/apps/compare/postgresql-3.0.11...postgresql-3.0.12) (2021-10-09) - diff --git a/stable/postgresql/3.0.12/Chart.lock b/stable/postgresql/3.0.12/Chart.lock deleted file mode 100644 index 6125e10c1c..0000000000 --- a/stable/postgresql/3.0.12/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: https://truecharts.org - version: 8.3.3 -digest: sha256:31a855d86fcc903545f9ab9bb8f6f0726eddb9915052450372c7bed59fdd831a -generated: "2021-10-09T22:09:45.314901193Z" diff --git a/stable/postgresql/3.0.12/charts/common-8.3.3.tgz b/stable/postgresql/3.0.12/charts/common-8.3.3.tgz deleted file mode 100644 index 1b84fd2c81..0000000000 Binary files a/stable/postgresql/3.0.12/charts/common-8.3.3.tgz and /dev/null differ diff --git a/stable/postgresql/3.0.13/CHANGELOG.md b/stable/postgresql/3.0.13/CHANGELOG.md new file mode 100644 index 0000000000..554614de41 --- /dev/null +++ b/stable/postgresql/3.0.13/CHANGELOG.md @@ -0,0 +1,4 @@ + + +### [postgresql-3.0.13](https://github.com/truecharts/apps/compare/postgresql-3.0.12...postgresql-3.0.13) (2021-10-09) + diff --git a/stable/postgresql/3.0.12/CONFIG.md b/stable/postgresql/3.0.13/CONFIG.md similarity index 100% rename from stable/postgresql/3.0.12/CONFIG.md rename to stable/postgresql/3.0.13/CONFIG.md diff --git a/stable/postgresql/3.0.13/Chart.lock b/stable/postgresql/3.0.13/Chart.lock new file mode 100644 index 0000000000..02cda19ae0 --- /dev/null +++ b/stable/postgresql/3.0.13/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://truecharts.org + version: 8.3.4 +digest: sha256:466b32ced71cf390f328801389648fd3a7a5ffb737231272e7073fb567cd5c20 +generated: "2021-10-09T23:23:04.0275511Z" diff --git a/stable/postgresql/3.0.12/Chart.yaml b/stable/postgresql/3.0.13/Chart.yaml similarity index 94% rename from stable/postgresql/3.0.12/Chart.yaml rename to stable/postgresql/3.0.13/Chart.yaml index e7bf7b71ff..5176d9bf7e 100644 --- a/stable/postgresql/3.0.12/Chart.yaml +++ b/stable/postgresql/3.0.13/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "13.4.0" dependencies: - name: common repository: https://truecharts.org - version: 8.3.3 + version: 8.3.4 deprecated: false description: PostgresSQL home: https://github.com/truecharts/apps/tree/master/stable/postgres @@ -25,4 +25,4 @@ name: postgresql sources: - https://www.postgresql.org/ type: application -version: 3.0.12 +version: 3.0.13 diff --git a/stable/postgresql/3.0.12/README.md b/stable/postgresql/3.0.13/README.md similarity index 96% rename from stable/postgresql/3.0.12/README.md rename to stable/postgresql/3.0.13/README.md index f9467cc7a0..97269dcb6e 100644 --- a/stable/postgresql/3.0.12/README.md +++ b/stable/postgresql/3.0.13/README.md @@ -17,7 +17,7 @@ Kubernetes: `>=1.16.0-0` | Repository | Name | Version | |------------|------|---------| -| https://truecharts.org | common | 8.3.3 | +| https://truecharts.org | common | 8.3.4 | ## Installing the Chart diff --git a/stable/postgresql/3.0.12/app-readme.md b/stable/postgresql/3.0.13/app-readme.md similarity index 100% rename from stable/postgresql/3.0.12/app-readme.md rename to stable/postgresql/3.0.13/app-readme.md diff --git a/stable/postgresql/3.0.13/charts/common-8.3.4.tgz b/stable/postgresql/3.0.13/charts/common-8.3.4.tgz new file mode 100644 index 0000000000..0e699cbf44 Binary files /dev/null and b/stable/postgresql/3.0.13/charts/common-8.3.4.tgz differ diff --git a/stable/postgresql/3.0.12/helm-values.md b/stable/postgresql/3.0.13/helm-values.md similarity index 99% rename from stable/postgresql/3.0.12/helm-values.md rename to stable/postgresql/3.0.13/helm-values.md index b21011235f..bbe3581c60 100644 --- a/stable/postgresql/3.0.12/helm-values.md +++ b/stable/postgresql/3.0.13/helm-values.md @@ -16,6 +16,7 @@ You will, however, be able to use all values referenced in the common chart here | envTpl.POSTGRES_USER | string | `"{{ .Values.postgresqlUsername }}"` | | | envValueFrom.POSTGRES_PASSWORD.secretKeyRef.key | string | `"postgresql-password"` | | | envValueFrom.POSTGRES_PASSWORD.secretKeyRef.name | string | `"{{ ( tpl .Values.existingSecret $ ) | default ( include \"common.names.fullname\" . ) }}"` | | +| existingSecret | string | `""` | | | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"bitnami/postgresql"` | | | image.tag | string | `"13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a"` | | diff --git a/stable/postgresql/3.0.12/ix_values.yaml b/stable/postgresql/3.0.13/ix_values.yaml similarity index 100% rename from stable/postgresql/3.0.12/ix_values.yaml rename to stable/postgresql/3.0.13/ix_values.yaml diff --git a/stable/postgresql/3.0.12/questions.yaml b/stable/postgresql/3.0.13/questions.yaml similarity index 100% rename from stable/postgresql/3.0.12/questions.yaml rename to stable/postgresql/3.0.13/questions.yaml diff --git a/stable/postgresql/3.0.12/templates/backup-postgres-config.yaml b/stable/postgresql/3.0.13/templates/backup-postgres-config.yaml similarity index 100% rename from stable/postgresql/3.0.12/templates/backup-postgres-config.yaml rename to stable/postgresql/3.0.13/templates/backup-postgres-config.yaml diff --git a/stable/postgresql/3.0.12/templates/common.yaml b/stable/postgresql/3.0.13/templates/common.yaml similarity index 100% rename from stable/postgresql/3.0.12/templates/common.yaml rename to stable/postgresql/3.0.13/templates/common.yaml diff --git a/stable/postgresql/3.0.12/templates/secret.yaml b/stable/postgresql/3.0.13/templates/secret.yaml similarity index 100% rename from stable/postgresql/3.0.12/templates/secret.yaml rename to stable/postgresql/3.0.13/templates/secret.yaml diff --git a/stable/postgresql/3.0.12/templates/upgrade-backup-postgres-hook.yaml b/stable/postgresql/3.0.13/templates/upgrade-backup-postgres-hook.yaml similarity index 100% rename from stable/postgresql/3.0.12/templates/upgrade-backup-postgres-hook.yaml rename to stable/postgresql/3.0.13/templates/upgrade-backup-postgres-hook.yaml diff --git a/stable/postgresql/3.0.12/test_values.yaml b/stable/postgresql/3.0.13/test_values.yaml similarity index 98% rename from stable/postgresql/3.0.12/test_values.yaml rename to stable/postgresql/3.0.13/test_values.yaml index 5eaa03170b..f2a6408379 100644 --- a/stable/postgresql/3.0.12/test_values.yaml +++ b/stable/postgresql/3.0.13/test_values.yaml @@ -66,7 +66,7 @@ persistence: postgresqlPassword: "testpass" postgresqlUsername: "test" postgresqlDatabase: "test" -# existingSecret: "" +existingSecret: "" envValueFrom: POSTGRES_PASSWORD: diff --git a/stable/postgresql/3.0.12/values.yaml b/stable/postgresql/3.0.13/values.yaml similarity index 100% rename from stable/postgresql/3.0.12/values.yaml rename to stable/postgresql/3.0.13/values.yaml diff --git a/stable/vaultwarden/9.0.11/CHANGELOG.md b/stable/vaultwarden/9.0.11/CHANGELOG.md deleted file mode 100644 index 414c2fedc9..0000000000 --- a/stable/vaultwarden/9.0.11/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ - - -### [vaultwarden-9.0.11](https://github.com/truecharts/apps/compare/vaultwarden-9.0.10...vaultwarden-9.0.11) (2021-10-05) - -#### Chore - -* update non-major deps helm releases ([#1099](https://github.com/truecharts/apps/issues/1099)) - diff --git a/stable/vaultwarden/9.0.11/Chart.lock b/stable/vaultwarden/9.0.11/Chart.lock deleted file mode 100644 index f4437e591f..0000000000 --- a/stable/vaultwarden/9.0.11/Chart.lock +++ /dev/null @@ -1,9 +0,0 @@ -dependencies: -- name: common - repository: https://truecharts.org - version: 8.2.2 -- name: postgresql - repository: https://truecharts.org/ - version: 3.0.8 -digest: sha256:492c4b7106d4921456b7460b2d7b62e769d3c736623c8aff80325387fa44363c -generated: "2021-10-05T12:31:45.861838503Z" diff --git a/stable/vaultwarden/9.0.11/charts/common-8.2.2.tgz b/stable/vaultwarden/9.0.11/charts/common-8.2.2.tgz deleted file mode 100644 index 7d13265fc5..0000000000 Binary files a/stable/vaultwarden/9.0.11/charts/common-8.2.2.tgz and /dev/null differ diff --git a/stable/vaultwarden/9.0.11/charts/postgresql-3.0.8.tgz b/stable/vaultwarden/9.0.11/charts/postgresql-3.0.8.tgz deleted file mode 100644 index 4668ecda1c..0000000000 Binary files a/stable/vaultwarden/9.0.11/charts/postgresql-3.0.8.tgz and /dev/null differ diff --git a/stable/vaultwarden/9.0.12/CHANGELOG.md b/stable/vaultwarden/9.0.12/CHANGELOG.md new file mode 100644 index 0000000000..6c87ce0e72 --- /dev/null +++ b/stable/vaultwarden/9.0.12/CHANGELOG.md @@ -0,0 +1,4 @@ + + +### [vaultwarden-9.0.12](https://github.com/truecharts/apps/compare/vaultwarden-9.0.11...vaultwarden-9.0.12) (2021-10-09) + diff --git a/stable/vaultwarden/9.0.11/CONFIG.md b/stable/vaultwarden/9.0.12/CONFIG.md similarity index 100% rename from stable/vaultwarden/9.0.11/CONFIG.md rename to stable/vaultwarden/9.0.12/CONFIG.md diff --git a/stable/vaultwarden/9.0.12/Chart.lock b/stable/vaultwarden/9.0.12/Chart.lock new file mode 100644 index 0000000000..bcb4cf7449 --- /dev/null +++ b/stable/vaultwarden/9.0.12/Chart.lock @@ -0,0 +1,9 @@ +dependencies: +- name: common + repository: https://truecharts.org + version: 8.3.4 +- name: postgresql + repository: https://truecharts.org/ + version: 3.0.12 +digest: sha256:e7a3ac4f590bf3fb97c3062d1443aa9987913a6d0f53fb1e2d1100ce9fedf324 +generated: "2021-10-09T23:23:17.466484902Z" diff --git a/stable/vaultwarden/9.0.11/Chart.yaml b/stable/vaultwarden/9.0.12/Chart.yaml similarity index 85% rename from stable/vaultwarden/9.0.11/Chart.yaml rename to stable/vaultwarden/9.0.12/Chart.yaml index 261e022e47..107d5e0180 100644 --- a/stable/vaultwarden/9.0.11/Chart.yaml +++ b/stable/vaultwarden/9.0.12/Chart.yaml @@ -3,11 +3,11 @@ appVersion: "1.22.2" dependencies: - name: common repository: https://truecharts.org - version: 8.2.2 + version: 8.3.4 - condition: postgresql.enabled name: postgresql repository: https://truecharts.org/ - version: 3.0.8 + version: 3.0.12 deprecated: false description: Unofficial Bitwarden compatible server written in Rust home: https://github.com/truecharts/apps/tree/master/charts/stable/vaultwarden @@ -24,11 +24,8 @@ maintainers: - email: info@truecharts.org name: TrueCharts url: truecharts.org -- email: kjeld@schouten-lebbing.nl - name: Ornias1993 - url: truecharts.org name: vaultwarden sources: - https://github.com/dani-garcia/vaultwarden type: application -version: 9.0.11 +version: 9.0.12 diff --git a/stable/vaultwarden/9.0.11/README.md b/stable/vaultwarden/9.0.12/README.md similarity index 92% rename from stable/vaultwarden/9.0.11/README.md rename to stable/vaultwarden/9.0.12/README.md index 25cc639c96..bad59433a6 100644 --- a/stable/vaultwarden/9.0.11/README.md +++ b/stable/vaultwarden/9.0.12/README.md @@ -17,8 +17,8 @@ Kubernetes: `>=1.16.0-0` | Repository | Name | Version | |------------|------|---------| -| https://truecharts.org/ | postgresql | 3.0.8 | -| https://truecharts.org | common | 8.2.2 | +| https://truecharts.org/ | postgresql | 3.0.12 | +| https://truecharts.org | common | 8.3.4 | ## Installing the Chart diff --git a/stable/vaultwarden/9.0.11/app-readme.md b/stable/vaultwarden/9.0.12/app-readme.md similarity index 100% rename from stable/vaultwarden/9.0.11/app-readme.md rename to stable/vaultwarden/9.0.12/app-readme.md diff --git a/stable/vaultwarden/9.0.12/charts/common-8.3.4.tgz b/stable/vaultwarden/9.0.12/charts/common-8.3.4.tgz new file mode 100644 index 0000000000..0e699cbf44 Binary files /dev/null and b/stable/vaultwarden/9.0.12/charts/common-8.3.4.tgz differ diff --git a/stable/vaultwarden/9.0.12/charts/postgresql-3.0.12.tgz b/stable/vaultwarden/9.0.12/charts/postgresql-3.0.12.tgz new file mode 100644 index 0000000000..337416dd23 Binary files /dev/null and b/stable/vaultwarden/9.0.12/charts/postgresql-3.0.12.tgz differ diff --git a/stable/vaultwarden/9.0.11/helm-values.md b/stable/vaultwarden/9.0.12/helm-values.md similarity index 83% rename from stable/vaultwarden/9.0.11/helm-values.md rename to stable/vaultwarden/9.0.12/helm-values.md index 5630c644c9..d1d475e66b 100644 --- a/stable/vaultwarden/9.0.11/helm-values.md +++ b/stable/vaultwarden/9.0.12/helm-values.md @@ -35,14 +35,6 @@ You will, however, be able to use all values referenced in the common chart here | ingress.main.nameOverride | string | `nil` | Override the name suffix that is used for this ingress. | | ingress.main.primary | bool | `true` | Make this the primary ingress (used in probes, notes, etc...). If there is more than 1 ingress, make sure that only 1 ingress is marked as primary. | | ingress.main.tls | list | `[]` | Configure TLS for the ingress. Both secretName and hosts can process a Helm template. | -| initContainers.init-postgresdb.command[0] | string | `"sh"` | | -| initContainers.init-postgresdb.command[1] | string | `"-c"` | | -| initContainers.init-postgresdb.command[2] | string | `"until pg_isready -U authelia -h ${pghost} ; do sleep 2 ; done"` | | -| initContainers.init-postgresdb.env[0].name | string | `"pghost"` | | -| initContainers.init-postgresdb.env[0].valueFrom.secretKeyRef.key | string | `"plainhost"` | | -| initContainers.init-postgresdb.env[0].valueFrom.secretKeyRef.name | string | `"dbcreds"` | | -| initContainers.init-postgresdb.image | string | `"{{ .Values.postgresqlImage.repository }}:{{ .Values.postgresqlImage.tag }}"` | | -| initContainers.init-postgresdb.imagePullPolicy | string | `"IfNotPresent"` | | | persistence.data.accessMode | string | `"ReadWriteOnce"` | | | persistence.data.enabled | bool | `true` | | | persistence.data.mountPath | string | `"/data"` | | @@ -52,9 +44,6 @@ You will, however, be able to use all values referenced in the common chart here | postgresql.existingSecret | string | `"dbcreds"` | | | postgresql.postgresqlDatabase | string | `"vaultwarden"` | | | postgresql.postgresqlUsername | string | `"vaultwarden"` | | -| postgresqlImage.pullPolicy | string | `"IfNotPresent"` | | -| postgresqlImage.repository | string | `"bitnami/postgresql"` | | -| postgresqlImage.tag | string | `"13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a"` | | | service.main.ports.main.port | int | `8080` | | | service.ws.ports.ws.enabled | bool | `true` | | | service.ws.ports.ws.port | int | `3012` | | diff --git a/stable/vaultwarden/9.0.11/ix_values.yaml b/stable/vaultwarden/9.0.12/ix_values.yaml similarity index 74% rename from stable/vaultwarden/9.0.11/ix_values.yaml rename to stable/vaultwarden/9.0.12/ix_values.yaml index 3f6daddae7..72e0ea5c9f 100644 --- a/stable/vaultwarden/9.0.11/ix_values.yaml +++ b/stable/vaultwarden/9.0.12/ix_values.yaml @@ -9,11 +9,6 @@ image: pullPolicy: IfNotPresent tag: v1.22.2@sha256:8693c057298731f507128a395395172d60093be9b299f6bf9e5c35512a74d457 -postgresqlImage: - repository: bitnami/postgresql - pullPolicy: IfNotPresent - tag: 13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a - envTpl: DOMAIN: "https://{{ if .Values.ingress }}{{ if .Values.ingress.main.enabled }}{{ ( index .Values.ingress.main.hosts 0 ).host }}{{ else }}placeholder.com{{ end }}{{ else }}placeholder.com{{ end }}" @@ -24,21 +19,6 @@ envFrom: - secretRef: name: vaultwardensecret -initContainers: - init-postgresdb: - image: "{{ .Values.postgresqlImage.repository }}:{{ .Values.postgresqlImage.tag }}" - command: - - "sh" - - "-c" - - "until pg_isready -U authelia -h ${pghost} ; do sleep 2 ; done" - imagePullPolicy: IfNotPresent - env: - - name: pghost - valueFrom: - secretKeyRef: - name: dbcreds - key: plainhost - envValueFrom: DATABASE_URL: @@ -61,9 +41,9 @@ database: # Enabled postgres postgresql: enabled: true + existingSecret: "dbcreds" postgresqlUsername: vaultwarden postgresqlDatabase: vaultwarden - existingSecret: dbcreds persistence: db: storageClass: "SCALE-ZFS" diff --git a/stable/vaultwarden/9.0.11/questions.yaml b/stable/vaultwarden/9.0.12/questions.yaml similarity index 100% rename from stable/vaultwarden/9.0.11/questions.yaml rename to stable/vaultwarden/9.0.12/questions.yaml diff --git a/stable/vaultwarden/9.0.11/templates/_configmap.tpl b/stable/vaultwarden/9.0.12/templates/_configmap.tpl similarity index 100% rename from stable/vaultwarden/9.0.11/templates/_configmap.tpl rename to stable/vaultwarden/9.0.12/templates/_configmap.tpl diff --git a/stable/vaultwarden/9.0.11/templates/_secrets.tpl b/stable/vaultwarden/9.0.12/templates/_secrets.tpl similarity index 56% rename from stable/vaultwarden/9.0.11/templates/_secrets.tpl rename to stable/vaultwarden/9.0.12/templates/_secrets.tpl index 7218b7c5cd..ca5ec74b0a 100644 --- a/stable/vaultwarden/9.0.11/templates/_secrets.tpl +++ b/stable/vaultwarden/9.0.12/templates/_secrets.tpl @@ -33,28 +33,4 @@ data: YUBICO_CLIENT_ID: {{ $yubicoClientId }} YUBICO_SECRET_KEY: {{ required "Yubico Secret Key required" .Values.vaultwarden.yubico.secretKey | b64enc | quote }} {{- end }} - ---- - -apiVersion: v1 -kind: Secret -metadata: - labels: - {{- include "common.labels" . | nindent 4 }} - name: dbcreds -{{- $previous := lookup "v1" "Secret" .Release.Namespace "dbcreds" }} -{{- $dbPass := "" }} -data: -{{- if $previous }} - {{- $dbPass = ( index $previous.data "postgresql-password" ) | b64dec }} - postgresql-password: {{ ( index $previous.data "postgresql-password" ) }} - postgresql-postgres-password: {{ ( index $previous.data "postgresql-postgres-password" ) }} -{{- else }} - {{- $dbPass = randAlphaNum 50 }} - postgresql-password: {{ $dbPass | b64enc | quote }} - postgresql-postgres-password: {{ randAlphaNum 50 | b64enc | quote }} -{{- end }} - url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase ) | b64enc | quote }} - plainhost: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }} -type: Opaque {{- end -}} diff --git a/stable/vaultwarden/9.0.11/templates/_validate.tpl b/stable/vaultwarden/9.0.12/templates/_validate.tpl similarity index 100% rename from stable/vaultwarden/9.0.11/templates/_validate.tpl rename to stable/vaultwarden/9.0.12/templates/_validate.tpl diff --git a/stable/vaultwarden/9.0.11/templates/common.yaml b/stable/vaultwarden/9.0.12/templates/common.yaml similarity index 93% rename from stable/vaultwarden/9.0.11/templates/common.yaml rename to stable/vaultwarden/9.0.12/templates/common.yaml index 6af2072556..23381ff8a0 100644 --- a/stable/vaultwarden/9.0.11/templates/common.yaml +++ b/stable/vaultwarden/9.0.12/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.values.setup" . }} +{{- include "common.setup" . }} {{/* Render configmap for vaultwarden */}} @@ -35,4 +35,4 @@ service: {{- include "vaultwarden.websocketinjector" . }} {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "common.postSetup" . }} diff --git a/stable/vaultwarden/9.0.11/test_values.yaml b/stable/vaultwarden/9.0.12/test_values.yaml similarity index 93% rename from stable/vaultwarden/9.0.11/test_values.yaml rename to stable/vaultwarden/9.0.12/test_values.yaml index 4ba28e4c3d..d54ee9102e 100644 --- a/stable/vaultwarden/9.0.11/test_values.yaml +++ b/stable/vaultwarden/9.0.12/test_values.yaml @@ -5,11 +5,6 @@ image: pullPolicy: IfNotPresent tag: v1.22.2@sha256:8693c057298731f507128a395395172d60093be9b299f6bf9e5c35512a74d457 -postgresqlImage: - repository: bitnami/postgresql - pullPolicy: IfNotPresent - tag: 13.4.0@sha256:e7526fc32deec708740784d907bcea2ef6c78bc5ab5265026eff96e70082a54a - service: main: ports: @@ -91,21 +86,6 @@ ingress: # hosts: # - chart-example.local -initContainers: - init-postgresdb: - image: "{{ .Values.postgresqlImage.repository }}:{{ .Values.postgresqlImage.tag }}" - command: - - "sh" - - "-c" - - "until pg_isready -U authelia -h ${pghost} ; do sleep 2 ; done" - imagePullPolicy: IfNotPresent - env: - - name: pghost - valueFrom: - secretKeyRef: - name: dbcreds - key: plainhost - envTpl: DOMAIN: "https://{{ if .Values.ingress }}{{ if .Values.ingress.main.enabled }}{{ ( index .Values.ingress.main.hosts 0 ).host }}{{ else }}placeholder.com{{ end }}{{ else }}placeholder.com{{ end }}" @@ -241,6 +221,6 @@ persistence: # Enabled postgres postgresql: enabled: true + existingSecret: "dbcreds" postgresqlUsername: vaultwarden postgresqlDatabase: vaultwarden - existingSecret: dbcreds diff --git a/stable/vaultwarden/9.0.11/values.yaml b/stable/vaultwarden/9.0.12/values.yaml similarity index 100% rename from stable/vaultwarden/9.0.11/values.yaml rename to stable/vaultwarden/9.0.12/values.yaml