From 4be2413a7b5c014e318a4d5881a4b5d934ee596a Mon Sep 17 00:00:00 2001 From: TrueCharts-Bot Date: Fri, 12 Jan 2024 23:40:28 +0000 Subject: [PATCH] Commit new Chart releases for TrueCharts Signed-off-by: TrueCharts-Bot --- stable/kitchenowl/8.2.2/app-changelog.md | 9 -- .../kitchenowl/8.2.2/templates/_configmap.tpl | 10 -- .../kitchenowl/8.2.2/templates/_secrets.tpl | 15 --- .../kitchenowl/{8.2.2 => 8.3.0}/CHANGELOG.md | 18 ++-- stable/kitchenowl/{8.2.2 => 8.3.0}/Chart.yaml | 4 +- stable/kitchenowl/{8.2.2 => 8.3.0}/README.md | 0 stable/kitchenowl/8.3.0/app-changelog.md | 9 ++ .../kitchenowl/{8.2.2 => 8.3.0}/app-readme.md | 0 .../charts/common-17.2.22.tgz | Bin .../{8.2.2 => 8.3.0}/ix_values.yaml | 94 ++++++++++-------- .../{8.2.2 => 8.3.0}/questions.yaml | 0 .../{8.2.2 => 8.3.0}/templates/NOTES.txt | 0 .../kitchenowl/8.3.0/templates/_secrets.tpl | 14 +++ .../{8.2.2 => 8.3.0}/templates/common.yaml | 6 -- .../kitchenowl/{8.2.2 => 8.3.0}/values.yaml | 0 15 files changed, 88 insertions(+), 91 deletions(-) delete mode 100644 stable/kitchenowl/8.2.2/app-changelog.md delete mode 100644 stable/kitchenowl/8.2.2/templates/_configmap.tpl delete mode 100644 stable/kitchenowl/8.2.2/templates/_secrets.tpl rename stable/kitchenowl/{8.2.2 => 8.3.0}/CHANGELOG.md (85%) rename stable/kitchenowl/{8.2.2 => 8.3.0}/Chart.yaml (93%) rename stable/kitchenowl/{8.2.2 => 8.3.0}/README.md (100%) create mode 100644 stable/kitchenowl/8.3.0/app-changelog.md rename stable/kitchenowl/{8.2.2 => 8.3.0}/app-readme.md (100%) rename stable/kitchenowl/{8.2.2 => 8.3.0}/charts/common-17.2.22.tgz (100%) rename stable/kitchenowl/{8.2.2 => 8.3.0}/ix_values.yaml (76%) rename stable/kitchenowl/{8.2.2 => 8.3.0}/questions.yaml (100%) rename stable/kitchenowl/{8.2.2 => 8.3.0}/templates/NOTES.txt (100%) create mode 100644 stable/kitchenowl/8.3.0/templates/_secrets.tpl rename stable/kitchenowl/{8.2.2 => 8.3.0}/templates/common.yaml (57%) rename stable/kitchenowl/{8.2.2 => 8.3.0}/values.yaml (100%) diff --git a/stable/kitchenowl/8.2.2/app-changelog.md b/stable/kitchenowl/8.2.2/app-changelog.md deleted file mode 100644 index 3bee68efa7..0000000000 --- a/stable/kitchenowl/8.2.2/app-changelog.md +++ /dev/null @@ -1,9 +0,0 @@ - - -## [kitchenowl-8.2.2](https://github.com/truecharts/charts/compare/kitchenowl-8.2.1...kitchenowl-8.2.2) (2024-01-09) - -### Chore - - - -- update container image common to v17.2.22[@e7c9056](https://github.com/e7c9056) by renovate ([#16986](https://github.com/truecharts/charts/issues/16986)) \ No newline at end of file diff --git a/stable/kitchenowl/8.2.2/templates/_configmap.tpl b/stable/kitchenowl/8.2.2/templates/_configmap.tpl deleted file mode 100644 index 619cf789f8..0000000000 --- a/stable/kitchenowl/8.2.2/templates/_configmap.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{/* Define the configmap */}} -{{- define "kitchenowl.configmap" -}} - -{{- $fullname := (include "tc.v1.common.lib.chart.names.fullname" $) -}} - -enabled: true -data: - BACK_URL: {{ printf "%v-backend:%v" $fullname .Values.service.backend.ports.backend.port }} - -{{- end -}} diff --git a/stable/kitchenowl/8.2.2/templates/_secrets.tpl b/stable/kitchenowl/8.2.2/templates/_secrets.tpl deleted file mode 100644 index a006f45cdd..0000000000 --- a/stable/kitchenowl/8.2.2/templates/_secrets.tpl +++ /dev/null @@ -1,15 +0,0 @@ -{{/* Define the secrets */}} -{{- define "kitchenowl.secrets" -}} -{{- $secretName := (printf "%s-secrets" (include "tc.v1.common.lib.chart.names.fullname" $)) }} -{{- $kitchenowlprevious := lookup "v1" "Secret" .Release.Namespace $secretName }} - -enabled: true -data: - {{- if $kitchenowlprevious }} - JWT_SECRET_KEY: {{ index $kitchenowlprevious.data "JWT_SECRET_KEY" | b64dec }} - {{- else }} - {{- $jwtsecret := randAlphaNum 50 }} - JWT_SECRET_KEY: {{ $jwtsecret }} - {{- end }} - -{{- end -}} diff --git a/stable/kitchenowl/8.2.2/CHANGELOG.md b/stable/kitchenowl/8.3.0/CHANGELOG.md similarity index 85% rename from stable/kitchenowl/8.2.2/CHANGELOG.md rename to stable/kitchenowl/8.3.0/CHANGELOG.md index f98619cbc9..1679a8cc54 100644 --- a/stable/kitchenowl/8.2.2/CHANGELOG.md +++ b/stable/kitchenowl/8.3.0/CHANGELOG.md @@ -7,6 +7,15 @@ title: Changelog +## [kitchenowl-8.3.0](https://github.com/truecharts/charts/compare/kitchenowl-8.2.2...kitchenowl-8.3.0) (2024-01-12) + +### Fix + + + +- assign backend environment variables ([#17050](https://github.com/truecharts/charts/issues/17050)) + + ## [kitchenowl-8.2.2](https://github.com/truecharts/charts/compare/kitchenowl-8.2.1...kitchenowl-8.2.2) (2024-01-09) ### Chore @@ -88,12 +97,3 @@ title: Changelog - update container image common to v17.2.18[@085ba3c](https://github.com/085ba3c) by renovate ([#16732](https://github.com/truecharts/charts/issues/16732)) - standardize ./img references ([#16704](https://github.com/truecharts/charts/issues/16704)) - -- lints some docs, uses front-matter instead of # h1, and fix list items in changelog ([#16589](https://github.com/truecharts/charts/issues/16589)) -## [kitchenowl-8.1.0](https://github.com/truecharts/charts/compare/kitchenowl-8.0.1...kitchenowl-8.1.0) (2023-12-30) - -### Chore - -- update helm general minor by renovate ([#16579](https://github.com/truecharts/charts/issues/16579)) - -## [kitchenowl-8.0.1](https://github.com/truecharts/charts/compare/kitchenowl-8.0.0...kitchenowl-8.0.1) (2023-12-26) diff --git a/stable/kitchenowl/8.2.2/Chart.yaml b/stable/kitchenowl/8.3.0/Chart.yaml similarity index 93% rename from stable/kitchenowl/8.2.2/Chart.yaml rename to stable/kitchenowl/8.3.0/Chart.yaml index d89099f8a9..8a1886a794 100644 --- a/stable/kitchenowl/8.2.2/Chart.yaml +++ b/stable/kitchenowl/8.3.0/Chart.yaml @@ -1,7 +1,7 @@ kubeVersion: ">=1.24.0-0" apiVersion: v2 name: kitchenowl -version: 8.2.2 +version: 8.3.0 appVersion: latest description: KitchenOwl is a smart self-hosted grocery list and recipe manager. home: https://truecharts.org/charts/stable/kitchenowl @@ -10,7 +10,7 @@ deprecated: false sources: - https://tombursch.github.io/kitchenowl - https://github.com/truecharts/charts/tree/master/charts/stable/kitchenowl - - https://hub.docker.com/r/tombursch/kitchenowl + - https://hub.docker.com/r/tombursch/kitchenowl-web maintainers: - name: TrueCharts email: info@truecharts.org diff --git a/stable/kitchenowl/8.2.2/README.md b/stable/kitchenowl/8.3.0/README.md similarity index 100% rename from stable/kitchenowl/8.2.2/README.md rename to stable/kitchenowl/8.3.0/README.md diff --git a/stable/kitchenowl/8.3.0/app-changelog.md b/stable/kitchenowl/8.3.0/app-changelog.md new file mode 100644 index 0000000000..ab45f3c747 --- /dev/null +++ b/stable/kitchenowl/8.3.0/app-changelog.md @@ -0,0 +1,9 @@ + + +## [kitchenowl-8.3.0](https://github.com/truecharts/charts/compare/kitchenowl-8.2.2...kitchenowl-8.3.0) (2024-01-12) + +### Fix + + + +- assign backend environment variables ([#17050](https://github.com/truecharts/charts/issues/17050)) \ No newline at end of file diff --git a/stable/kitchenowl/8.2.2/app-readme.md b/stable/kitchenowl/8.3.0/app-readme.md similarity index 100% rename from stable/kitchenowl/8.2.2/app-readme.md rename to stable/kitchenowl/8.3.0/app-readme.md diff --git a/stable/kitchenowl/8.2.2/charts/common-17.2.22.tgz b/stable/kitchenowl/8.3.0/charts/common-17.2.22.tgz similarity index 100% rename from stable/kitchenowl/8.2.2/charts/common-17.2.22.tgz rename to stable/kitchenowl/8.3.0/charts/common-17.2.22.tgz diff --git a/stable/kitchenowl/8.2.2/ix_values.yaml b/stable/kitchenowl/8.3.0/ix_values.yaml similarity index 76% rename from stable/kitchenowl/8.2.2/ix_values.yaml rename to stable/kitchenowl/8.3.0/ix_values.yaml index 44e15fcc8d..6187064cae 100644 --- a/stable/kitchenowl/8.2.2/ix_values.yaml +++ b/stable/kitchenowl/8.3.0/ix_values.yaml @@ -6,82 +6,66 @@ backendImage: repository: tombursch/kitchenowl pullPolicy: IfNotPresent tag: latest@sha256:0a4ae56f82b25a9e6362689af500b3f7f6248e898db7e4c5fcbd1b42bfa9b119 + service: main: enabled: true - targetSelector: main + # Target frontend pod + targetSelector: frontend ports: main: enabled: true - targetSelector: main + # Target frontend container + targetSelector: frontend protocol: http targetPort: 80 port: 10246 backend: enabled: true - targetSelector: backend + # Target main(backend) pod + targetSelector: main ports: backend: enabled: true - targetSelector: backend + # Target main(backend) container + targetSelector: main protocol: http targetPort: 5000 port: 10247 + persistence: data: enabled: true targetSelector: - backend: - backend: + main: + main: mountPath: /data + portal: open: enabled: true + securityContext: container: readOnlyRootFilesystem: false runAsNonRoot: false runAsUser: 0 runAsGroup: 0 + workload: main: + enabled: true + primary: true type: Deployment - strategy: RollingUpdate - replicas: 1 podSpec: containers: main: - enabled: true - primary: true - envFrom: - - configMapRef: - name: kitchenowl-config - env: - FRONT_URL: "{{ .Values.workload.main.podSpec.containers.main.env.FRONT_URL }}" - probes: - liveness: - type: http - path: / - port: "{{ .Values.service.main.ports.main.targetPort }}" - readiness: - type: http - path: / - port: "{{ .Values.service.main.ports.main.targetPort }}" - startup: - type: http - path: / - port: "{{ .Values.service.main.ports.main.targetPort }}" - backend: - enabled: true - type: Deployment - podSpec: - containers: - backend: + # Backend enabled: true primary: true imageSelector: backendImage env: - FRONT_URL: "{{ .Values.workload.main.podSpec.containers.main.env.FRONT_URL }}" + FRONT_URL: "" OIDC_ISSUER: "" OIDC_CLIENT_ID: "" OIDC_CLIENT_SECRET: "" @@ -89,12 +73,11 @@ workload: APPLE_CLIENT_SECRET: "" GOOGLE_CLIENT_ID: "" GOOGLE_CLIENT_SECRET: "" - # Changed port to 10248 to avoid conflict with frontend - HTTP_PORT: "10248" JWT_SECRET_KEY: secretKeyRef: name: kitchenowl-secrets key: JWT_SECRET_KEY + STORAGE_PATH: "{{ .Values.persistence.data.targetSelector.main.main.mountPath }}" DB_DRIVER: "postgresql" DB_HOST: secretKeyRef: @@ -109,20 +92,51 @@ workload: probes: liveness: enabled: true - type: tcp + type: exec port: "{{ .Values.service.backend.ports.backend.targetPort }}" + command: + - uwsgi_curl + - localhost:5000 + - /api/health/8M4F88S8ooi4sMbLBfkkV7ctWwgibW6V readiness: enabled: true - type: tcp + type: exec port: "{{ .Values.service.backend.ports.backend.targetPort }}" + command: + - uwsgi_curl + - localhost:5000 + - /api/health/8M4F88S8ooi4sMbLBfkkV7ctWwgibW6V startup: enabled: true type: tcp port: "{{ .Values.service.backend.ports.backend.targetPort }}" + frontend: + enabled: true + type: Deployment + strategy: RollingUpdate + replicas: 1 + podSpec: + containers: + frontend: + enabled: true + primary: true + env: + BACK_URL: '{{ printf "%s-backend:%v" (include "tc.v1.common.lib.chart.names.fullname" $) .Values.service.backend.ports.backend.port }}' + probes: + liveness: + type: http + path: / + port: "{{ .Values.service.main.ports.main.targetPort }}" + readiness: + type: http + path: / + port: "{{ .Values.service.main.ports.main.targetPort }}" + startup: + type: tcp + port: "{{ .Values.service.main.ports.main.targetPort }}" # Enabled postgres cnpg: main: enabled: true user: kitchenowl database: kitchenowl -updated: true diff --git a/stable/kitchenowl/8.2.2/questions.yaml b/stable/kitchenowl/8.3.0/questions.yaml similarity index 100% rename from stable/kitchenowl/8.2.2/questions.yaml rename to stable/kitchenowl/8.3.0/questions.yaml diff --git a/stable/kitchenowl/8.2.2/templates/NOTES.txt b/stable/kitchenowl/8.3.0/templates/NOTES.txt similarity index 100% rename from stable/kitchenowl/8.2.2/templates/NOTES.txt rename to stable/kitchenowl/8.3.0/templates/NOTES.txt diff --git a/stable/kitchenowl/8.3.0/templates/_secrets.tpl b/stable/kitchenowl/8.3.0/templates/_secrets.tpl new file mode 100644 index 0000000000..5e19352d50 --- /dev/null +++ b/stable/kitchenowl/8.3.0/templates/_secrets.tpl @@ -0,0 +1,14 @@ +{{/* Define the secrets */}} +{{- define "kitchenowl.secrets" -}} + +{{- $secretName := printf "%s-kitchenowl-secrets" (include "tc.v1.common.lib.chart.names.fullname" $) }} + +{{- $jwt := randAlphaNum 50 -}} +{{- with lookup "v1" "Secret" .Release.Namespace $secretName -}} + {{- $jwt = index .data "JWT_SECRET_KEY" | b64dec -}} +{{- end }} + +enabled: true +data: + JWT_SECRET_KEY: {{ $jwt }} +{{- end -}} diff --git a/stable/kitchenowl/8.2.2/templates/common.yaml b/stable/kitchenowl/8.3.0/templates/common.yaml similarity index 57% rename from stable/kitchenowl/8.2.2/templates/common.yaml rename to stable/kitchenowl/8.3.0/templates/common.yaml index e233b9249b..609f9b3629 100644 --- a/stable/kitchenowl/8.2.2/templates/common.yaml +++ b/stable/kitchenowl/8.3.0/templates/common.yaml @@ -6,10 +6,4 @@ {{- $_ := set .Values.secret "kitchenowl-secrets" $secrets -}} {{- end -}} -{{/* Render configmap for Kitchenowl */}} -{{- $configmap := include "kitchenowl.configmap" . | fromYaml -}} -{{- if $configmap -}} - {{- $_ := set .Values.configmap "kitchenowl-config" $configmap -}} -{{- end -}} - {{ include "tc.v1.common.loader.apply" . }} diff --git a/stable/kitchenowl/8.2.2/values.yaml b/stable/kitchenowl/8.3.0/values.yaml similarity index 100% rename from stable/kitchenowl/8.2.2/values.yaml rename to stable/kitchenowl/8.3.0/values.yaml