From 26c370a93f39bcd3ae9bff15cf44a84fff387014 Mon Sep 17 00:00:00 2001 From: yodatak Date: Sat, 31 Aug 2024 12:27:37 +0200 Subject: [PATCH] fix(vikunja) Update vikunja to last version (#25614) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** โš’๏ธ Fixes Remove and rename unncesseray container **โš™๏ธ Type of change** - [x] ๐Ÿช› Bugfix - [x] ๐Ÿ”ƒ Refactor of current code **๐Ÿงช How Has This Been Tested?** On upgrading my existing vikunja cluste **โœ”๏ธ Checklist:** - [x] โš–๏ธ My code follows the style guidelines of this project - [x] ๐Ÿ‘€ 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 - [x] I made sure the title starts with `feat(chart-name):`, `fix(chart-name):` or `chore(chart-name):` --------- Signed-off-by: yodatak Signed-off-by: alfi0812 <43101280+alfi0812@users.noreply.github.com> Co-authored-by: yodatak Co-authored-by: alfi0812 <43101280+alfi0812@users.noreply.github.com> --- charts/stable/vikunja/Chart.yaml | 14 +++-- charts/stable/vikunja/templates/_secrets.tpl | 17 +----- charts/stable/vikunja/values.yaml | 54 +++----------------- 3 files changed, 13 insertions(+), 72 deletions(-) diff --git a/charts/stable/vikunja/Chart.yaml b/charts/stable/vikunja/Chart.yaml index c59af1fa19f..29e0242c5ba 100644 --- a/charts/stable/vikunja/Chart.yaml +++ b/charts/stable/vikunja/Chart.yaml @@ -6,17 +6,17 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 0.22.1 +appVersion: 0.24.2 dependencies: - name: common - version: 24.1.5 + version: 24.1.14 repository: oci://tccr.io/truecharts condition: "" alias: "" tags: [] import-values: [] - name: redis - version: 15.1.5 + version: 15.2.2 repository: oci://tccr.io/truecharts condition: redis.enabled alias: "" @@ -28,7 +28,7 @@ home: https://truecharts.org/charts/stable/vikunja icon: https://truecharts.org/img/hotlink-ok/chart-icons/vikunja.webp keywords: - vikunja -kubeVersion: '>=1.24.0-0' +kubeVersion: ">=1.24.0-0" maintainers: - name: TrueCharts email: info@truecharts.org @@ -36,9 +36,7 @@ maintainers: name: vikunja sources: - https://github.com/truecharts/charts/tree/master/charts/stable/vikunja - - https://hub.docker.com/_/nginx - - https://hub.docker.com/r/vikunja/api - - https://hub.docker.com/r/vikunja/frontend + - https://hub.docker.com/r/vikunja/vikunja - https://vikunja.io/docs type: application -version: 15.2.8 +version: 16.0.0 diff --git a/charts/stable/vikunja/templates/_secrets.tpl b/charts/stable/vikunja/templates/_secrets.tpl index 771b2610db0..76a015095ec 100644 --- a/charts/stable/vikunja/templates/_secrets.tpl +++ b/charts/stable/vikunja/templates/_secrets.tpl @@ -37,7 +37,7 @@ secret: type: redis service: - interface: ":3456" + interface: {{ .Values.vikunja.service.interface | quote }} JWTSecret: {{ $jwtSecret }} timezone: {{ .Values.TZ | quote }} {{- /* Multiply by 1, so large integers are not rendered in scientific notation @@ -178,19 +178,4 @@ secret: timezone: {{ . | quote }} {{- end }} -configmap: - nginx-config: - enabled: true - data: - nginx-config: | - server { - listen {{ .Values.service.main.ports.main.port }}; - location / { - proxy_pass http://localhost:80; - } - location ~* ^/(api|dav|\.well-known)/ { - proxy_pass http://localhost:3456; - client_max_body_size {{ .Values.vikunja.files.maxsize | upper | trimSuffix "B" }}; - } - } {{- end -}} diff --git a/charts/stable/vikunja/values.yaml b/charts/stable/vikunja/values.yaml index b839f582adb..4c9f85fb9d1 100644 --- a/charts/stable/vikunja/values.yaml +++ b/charts/stable/vikunja/values.yaml @@ -1,14 +1,7 @@ image: - repository: vikunja/api - tag: 0.22.1@sha256:c9415431e6235229302bb8f9ee6660b74c24859d1e8adbc4a3e25bd418604b57 + repository: vikunja/vikunja + tag: 0.24.2@sha256:c31c7d6cad49038ab8a7d1414845d4c45539b43dd6ddd082bcd148e6fcd7b01c pullPolicy: IfNotPresent -frontendImage: - repository: vikunja/frontend - tag: 0.22.1@sha256:f0223d441997fe29c377d0b476dc4bb2fc091b44b9c24d76b1b88c213df520c5 - pullPolicy: IfNotPresent -nginxImage: - repository: nginx - tag: 1.27.1@sha256:1540e37eebb9abc5afa4256de1bade6542d50bf69b61b1dd855cb7804aaaf444 workload: main: podSpec: @@ -17,48 +10,23 @@ workload: probes: liveness: type: http - port: 3456 + port: 10220 path: /health readiness: type: http - port: 3456 + port: 10220 path: /health startup: type: http - port: 3456 + port: 10220 path: /health - frontend: - enabled: true - imageSelector: frontendImage - probes: - liveness: - type: http - port: 80 - readiness: - type: http - port: 80 - startup: - type: http - port: 80 - proxy: - enabled: true - imageSelector: nginxImage - probes: - liveness: - type: http - port: "{{ .Values.service.main.ports.main.port }}" - readiness: - type: http - port: "{{ .Values.service.main.ports.main.port }}" - startup: - type: http - port: "{{ .Values.service.main.ports.main.port }}" vikunja: service: jwtttl: 259200 jwtttllong: 2592000 motd: Welcome to your new Vikunja instance frontendurl: http://localhost:10220 + interface: ":10220" maxitemsperpage: 50 enablecaldav: true enablelinksharing: true @@ -165,16 +133,6 @@ persistence: files: enabled: true mountPath: /app/vikunja/files - vikunja-nginx: - enabled: true - noMount: true - type: configmap - objectName: nginx-config - targetSelector: - main: - proxy: - mountPath: /etc/nginx/conf.d/default.conf - subPath: nginx-config vikunja-config: enabled: true type: secret