From 8a562b8fe218129398467795d835efed90676358 Mon Sep 17 00:00:00 2001 From: shadofall Date: Thu, 9 Nov 2023 14:54:43 -0500 Subject: [PATCH] fix(mealie): BREAKING CHANGE to single container version (#14312) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [x] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [x] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [x] ⚖️ My code follows the style guidelines of this project - [ ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [x] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --------- Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> --- charts/stable/mealie/Chart.yaml | 4 +- charts/stable/mealie/questions.yaml | 4 +- charts/stable/mealie/templates/_secrets.tpl | 4 +- charts/stable/mealie/values.yaml | 79 +++++---------------- 4 files changed, 22 insertions(+), 69 deletions(-) diff --git a/charts/stable/mealie/Chart.yaml b/charts/stable/mealie/Chart.yaml index e6e390b4aec..72ad1d84aa7 100644 --- a/charts/stable/mealie/Chart.yaml +++ b/charts/stable/mealie/Chart.yaml @@ -17,8 +17,8 @@ maintainers: name: mealie sources: - https://github.com/truecharts/charts/tree/master/charts/stable/mealie - - https://github.com/hay-kot/mealie -version: 17.0.31 + - https://github.com/mealie-recipes/mealie +version: 18.0.0 annotations: truecharts.org/category: utilities truecharts.org/SCALE-support: "true" diff --git a/charts/stable/mealie/questions.yaml b/charts/stable/mealie/questions.yaml index d510b4493af..00306b9b877 100644 --- a/charts/stable/mealie/questions.yaml +++ b/charts/stable/mealie/questions.yaml @@ -452,13 +452,13 @@ questions: description: "The UserID of the user running the application" schema: type: int - default: 0 + default: 568 - variable: runAsGroup label: "runAsGroup" description: "The groupID of the user running the application" schema: type: int - default: 0 + default: 568 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} diff --git a/charts/stable/mealie/templates/_secrets.tpl b/charts/stable/mealie/templates/_secrets.tpl index 425552b890f..5c7f5413244 100644 --- a/charts/stable/mealie/templates/_secrets.tpl +++ b/charts/stable/mealie/templates/_secrets.tpl @@ -8,7 +8,6 @@ frontend: enabled: true data: {{/* Frontend */}} - API_URL: {{ printf "http://%v-api:%v" $fullname .Values.service.api.ports.api.port }} THEME_LIGHT_PRIMARY: {{ $frontend.theme.light_primary | default "#E58325" | quote }} THEME_LIGHT_ACCENT: {{ $frontend.theme.light_accent | default "#007A99" | quote }} THEME_LIGHT_SECONDARY: {{ $frontend.theme.light_secondary | default "#973542" | quote }} @@ -27,8 +26,7 @@ frontend: api: enabled: true data: - API_PORT: {{ .Values.service.api.ports.api.port | quote }} - API_DOCS: "true" + API_PORT: {{ .Values.service.main.ports.main.port | quote }} {{/* Database */}} DB_ENGINE: "postgres" POSTGRES_PORT: "5432" diff --git a/charts/stable/mealie/values.yaml b/charts/stable/mealie/values.yaml index c963b83d286..0ea5f11081e 100644 --- a/charts/stable/mealie/values.yaml +++ b/charts/stable/mealie/values.yaml @@ -1,10 +1,6 @@ image: - repository: tccr.io/truecharts/mealie-frontend - tag: latest@sha256:f0733931b382a17e2c36e58fff7ea95e9434d125ba5c7eef817328dc20fbf374 - pullPolicy: IfNotPresent -apiImage: - repository: tccr.io/truecharts/mealie-api - tag: latest@sha256:f2fbe97e1c2874c7fc127fc3d1acc1f1d344b1f3ee6488254651566d387baed6 + repository: tccr.io/truecharts/mealie + tag: v1.0.0@sha256:02863d49987ff9f24a3313233bb34eb7b1e4cbb040b42217ad0b6f8c284ba8d6 pullPolicy: IfNotPresent mealie: @@ -67,74 +63,37 @@ workload: podSpec: containers: main: - securityContext: - capabilities: - add: - - NET_BIND_SERVICE probes: liveness: - path: "/" - type: http + enabled: true + type: exec + command: + - python + - /app/mealie/scripts/healthcheck.py readiness: - path: "/" - type: http + enabled: true + type: exec + command: + - python + - /app/mealie/scripts/healthcheck.py startup: - path: "/" - type: http + enabled: true + type: exec + command: + - python + - /app/mealie/scripts/healthcheck.py envFrom: - secretRef: name: frontend - api: - enabled: true - type: Deployment - strategy: RollingUpdate - replicas: 1 - podSpec: - containers: - api: - primary: true - enabled: true - imageSelector: apiImage - probes: - liveness: - path: /api/app/about - type: http - port: "{{ .Values.service.api.ports.api.port }}" - readiness: - path: /api/app/about - type: http - port: "{{ .Values.service.api.ports.api.port }}" - startup: - type: tcp - port: "{{ .Values.service.api.ports.api.port }}" - envFrom: - secretRef: name: api -securityContext: - container: - runAsNonRoot: false - readOnlyRootFilesystem: false - runAsUser: 0 - runAsGroup: 0 - service: main: ports: main: port: 10018 protocol: http - targetPort: 3000 - api: - enabled: true - type: ClusterIP - targetSelector: api - ports: - api: - enabled: true - protocol: http - port: 10019 - targetSelector: api persistence: data: @@ -143,10 +102,6 @@ persistence: main: main: mountPath: /app/data - readOnly: true - api: - api: - mountPath: /app/data cnpg: main: