From 27127d897b4ebfa9ff5074c397d84068e71f5726 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Tue, 1 Nov 2022 17:43:28 +0200 Subject: [PATCH] chore(mealie): use API_PORT variable to change api port (#4270) * chore(mealie): use API_PORT variable to change api port * correct port * don't run upgrade --- charts/stable/mealie/Chart.yaml | 2 +- charts/stable/mealie/questions.yaml | 2 +- charts/stable/mealie/templates/_api.tpl | 9 +++------ charts/stable/mealie/templates/_configmap.tpl | 8 ++------ charts/stable/mealie/values.yaml | 15 +++++++-------- 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/charts/stable/mealie/Chart.yaml b/charts/stable/mealie/Chart.yaml index adf3ca51bc1..8b3f29752fa 100644 --- a/charts/stable/mealie/Chart.yaml +++ b/charts/stable/mealie/Chart.yaml @@ -22,7 +22,7 @@ name: mealie sources: - https://github.com/truecharts/charts/tree/master/charts/stable/mealie - https://github.com/hay-kot/mealie -version: 10.0.10 +version: 11.0.0 annotations: truecharts.org/catagories: | - utilities diff --git a/charts/stable/mealie/questions.yaml b/charts/stable/mealie/questions.yaml index 4c96f995b44..2c4e3a4610c 100644 --- a/charts/stable/mealie/questions.yaml +++ b/charts/stable/mealie/questions.yaml @@ -357,7 +357,7 @@ questions: description: The internal(!) port on the container the Application runs on schema: type: int - default: 9000 + default: 10019 # Include{serviceExpertRoot} default: false # Include{serviceExpert} diff --git a/charts/stable/mealie/templates/_api.tpl b/charts/stable/mealie/templates/_api.tpl index e4b30bd66b5..d8909fdfdc9 100644 --- a/charts/stable/mealie/templates/_api.tpl +++ b/charts/stable/mealie/templates/_api.tpl @@ -17,8 +17,7 @@ volumeMounts: readinessProbe: httpGet: path: /docs - port: {{ .Values.service.api.ports.api.targetPort }} - {{/* port: {{ .Values.service.api.ports.api.targetPort }} */}} + port: {{ .Values.service.api.ports.api.port }} initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }} timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }} periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }} @@ -26,8 +25,7 @@ readinessProbe: livenessProbe: httpGet: path: /docs - port: {{ .Values.service.api.ports.api.targetPort }} - {{/* port: {{ .Values.service.api.ports.api.targetPort }} */}} + port: {{ .Values.service.api.ports.api.port }} initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }} timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }} periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }} @@ -35,8 +33,7 @@ livenessProbe: startupProbe: httpGet: path: /docs - port: {{ .Values.service.api.ports.api.targetPort }} - {{/* port: {{ .Values.service.api.ports.api.targetPort }} */}} + port: {{ .Values.service.api.ports.api.port }} initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }} timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }} periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }} diff --git a/charts/stable/mealie/templates/_configmap.tpl b/charts/stable/mealie/templates/_configmap.tpl index 6fe7db65a57..5cf8dd9dfb3 100644 --- a/charts/stable/mealie/templates/_configmap.tpl +++ b/charts/stable/mealie/templates/_configmap.tpl @@ -13,9 +13,7 @@ metadata: labels: {{- include "tc.common.labels" . | nindent 4 }} data: - API_URL: http://localhost:{{ .Values.service.api.ports.api.targetPort }} - {{/* https://github.com/hay-kot/mealie/issues/1666 */}} - {{/* API_URL: http://localhost:{{ .Values.service.api.ports.api.port }} */}} + API_URL: http://localhost:{{ .Values.service.api.ports.api.port }} THEME_LIGHT_PRIMARY: {{ .Values.mealie_frontend.theme.light_primary | default "#E58325" | quote }} THEME_LIGHT_ACCENT: {{ .Values.mealie_frontend.theme.light_accent | default "#007A99" | quote }} THEME_LIGHT_SECONDARY: {{ .Values.mealie_frontend.theme.light_secondary | default "#973542" | quote }} @@ -48,9 +46,7 @@ data: POSTGRES_USER: {{ .Values.postgresql.postgresqlUsername }} POSTGRES_DB: {{ .Values.postgresql.postgresqlDatabase }} POSTGRES_SERVER: {{ printf "%v-%v" .Release.Name "postgresql" }} - API_PORT: {{ .Values.service.api.ports.api.targetPort | quote }} - {{/* https://github.com/hay-kot/mealie/issues/1666 */}} - {{/* API_PORT: {{ .Values.service.api.ports.api.port | quote }} */}} + API_PORT: {{ .Values.service.api.ports.api.port | quote }} {{/* User Defined */}} {{/* General */}} ALLOW_SIGNUP: {{ .Values.mealie_backend.general.allow_signup | quote }} diff --git a/charts/stable/mealie/values.yaml b/charts/stable/mealie/values.yaml index dec210d7666..16e5c6f53c3 100644 --- a/charts/stable/mealie/values.yaml +++ b/charts/stable/mealie/values.yaml @@ -1,11 +1,11 @@ image: repository: tccr.io/truecharts/mealie-frontend - tag: v1.0.0beta@sha256:be031b8c1c6a1698f18e7750a1482ca85f6c311bbb594cf8da46d0e206b0729a + tag: v1.0.0beta@sha256:4158c31d037c2ece8931d2e2b120654b6f658b020f9273e8a2cc289d9e715552 pullPolicy: IfNotPresent apiImage: repository: tccr.io/truecharts/mealie-api - tag: v1.0.0beta@sha256:4dad1521060d896c2e4782f57ca48007e831b2df497746637eb8f2d6a4a23c90 + tag: v1.0.0beta@sha256:1a3b047474f908ae97a78d0f679892aa0f1bbea1e97abaf57c115df1b33d398a pullPolicy: IfNotPresent securityContext: @@ -72,13 +72,13 @@ envFrom: probes: liveness: type: HTTP - path: "/" + path: / readiness: type: HTTP - path: "/" + path: / startup: type: HTTP - path: "/" + path: / service: main: @@ -95,16 +95,15 @@ service: enabled: true protocol: HTTP port: 10019 - targetPort: 9000 persistence: data: enabled: true - mountPath: "/app/data" + mountPath: /app/data postgresql: enabled: true - existingSecret: "dbcreds" + existingSecret: dbcreds postgresqlUsername: mealie postgresqlDatabase: mealie