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
This commit is contained in:
Stavros Kois
2022-11-01 17:43:28 +02:00
committed by GitHub
parent e43307a215
commit 27127d897b
5 changed files with 14 additions and 22 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ name: mealie
sources: sources:
- https://github.com/truecharts/charts/tree/master/charts/stable/mealie - https://github.com/truecharts/charts/tree/master/charts/stable/mealie
- https://github.com/hay-kot/mealie - https://github.com/hay-kot/mealie
version: 10.0.10 version: 11.0.0
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- utilities - utilities
+1 -1
View File
@@ -357,7 +357,7 @@ questions:
description: The internal(!) port on the container the Application runs on description: The internal(!) port on the container the Application runs on
schema: schema:
type: int type: int
default: 9000 default: 10019
# Include{serviceExpertRoot} # Include{serviceExpertRoot}
default: false default: false
# Include{serviceExpert} # Include{serviceExpert}
+3 -6
View File
@@ -17,8 +17,7 @@ volumeMounts:
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /docs path: /docs
port: {{ .Values.service.api.ports.api.targetPort }} port: {{ .Values.service.api.ports.api.port }}
{{/* port: {{ .Values.service.api.ports.api.targetPort }} */}}
initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }} initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }}
timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }} timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }}
periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }} periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }}
@@ -26,8 +25,7 @@ readinessProbe:
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /docs path: /docs
port: {{ .Values.service.api.ports.api.targetPort }} port: {{ .Values.service.api.ports.api.port }}
{{/* port: {{ .Values.service.api.ports.api.targetPort }} */}}
initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }} initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }}
timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }} timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }}
periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }} periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }}
@@ -35,8 +33,7 @@ livenessProbe:
startupProbe: startupProbe:
httpGet: httpGet:
path: /docs path: /docs
port: {{ .Values.service.api.ports.api.targetPort }} port: {{ .Values.service.api.ports.api.port }}
{{/* port: {{ .Values.service.api.ports.api.targetPort }} */}}
initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }} initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }}
timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }} timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }}
periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }} periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }}
@@ -13,9 +13,7 @@ metadata:
labels: labels:
{{- include "tc.common.labels" . | nindent 4 }} {{- include "tc.common.labels" . | nindent 4 }}
data: data:
API_URL: http://localhost:{{ .Values.service.api.ports.api.targetPort }} API_URL: http://localhost:{{ .Values.service.api.ports.api.port }}
{{/* https://github.com/hay-kot/mealie/issues/1666 */}}
{{/* API_URL: http://localhost:{{ .Values.service.api.ports.api.port }} */}}
THEME_LIGHT_PRIMARY: {{ .Values.mealie_frontend.theme.light_primary | default "#E58325" | quote }} 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_ACCENT: {{ .Values.mealie_frontend.theme.light_accent | default "#007A99" | quote }}
THEME_LIGHT_SECONDARY: {{ .Values.mealie_frontend.theme.light_secondary | default "#973542" | quote }} THEME_LIGHT_SECONDARY: {{ .Values.mealie_frontend.theme.light_secondary | default "#973542" | quote }}
@@ -48,9 +46,7 @@ data:
POSTGRES_USER: {{ .Values.postgresql.postgresqlUsername }} POSTGRES_USER: {{ .Values.postgresql.postgresqlUsername }}
POSTGRES_DB: {{ .Values.postgresql.postgresqlDatabase }} POSTGRES_DB: {{ .Values.postgresql.postgresqlDatabase }}
POSTGRES_SERVER: {{ printf "%v-%v" .Release.Name "postgresql" }} POSTGRES_SERVER: {{ printf "%v-%v" .Release.Name "postgresql" }}
API_PORT: {{ .Values.service.api.ports.api.targetPort | quote }} API_PORT: {{ .Values.service.api.ports.api.port | quote }}
{{/* https://github.com/hay-kot/mealie/issues/1666 */}}
{{/* API_PORT: {{ .Values.service.api.ports.api.port | quote }} */}}
{{/* User Defined */}} {{/* User Defined */}}
{{/* General */}} {{/* General */}}
ALLOW_SIGNUP: {{ .Values.mealie_backend.general.allow_signup | quote }} ALLOW_SIGNUP: {{ .Values.mealie_backend.general.allow_signup | quote }}
+7 -8
View File
@@ -1,11 +1,11 @@
image: image:
repository: tccr.io/truecharts/mealie-frontend repository: tccr.io/truecharts/mealie-frontend
tag: v1.0.0beta@sha256:be031b8c1c6a1698f18e7750a1482ca85f6c311bbb594cf8da46d0e206b0729a tag: v1.0.0beta@sha256:4158c31d037c2ece8931d2e2b120654b6f658b020f9273e8a2cc289d9e715552
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
apiImage: apiImage:
repository: tccr.io/truecharts/mealie-api repository: tccr.io/truecharts/mealie-api
tag: v1.0.0beta@sha256:4dad1521060d896c2e4782f57ca48007e831b2df497746637eb8f2d6a4a23c90 tag: v1.0.0beta@sha256:1a3b047474f908ae97a78d0f679892aa0f1bbea1e97abaf57c115df1b33d398a
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
securityContext: securityContext:
@@ -72,13 +72,13 @@ envFrom:
probes: probes:
liveness: liveness:
type: HTTP type: HTTP
path: "/" path: /
readiness: readiness:
type: HTTP type: HTTP
path: "/" path: /
startup: startup:
type: HTTP type: HTTP
path: "/" path: /
service: service:
main: main:
@@ -95,16 +95,15 @@ service:
enabled: true enabled: true
protocol: HTTP protocol: HTTP
port: 10019 port: 10019
targetPort: 9000
persistence: persistence:
data: data:
enabled: true enabled: true
mountPath: "/app/data" mountPath: /app/data
postgresql: postgresql:
enabled: true enabled: true
existingSecret: "dbcreds" existingSecret: dbcreds
postgresqlUsername: mealie postgresqlUsername: mealie
postgresqlDatabase: mealie postgresqlDatabase: mealie