From 1982cb9e626e5d0b4832ba0429ce2f46f33fdd03 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Tue, 20 Aug 2024 17:29:40 +0000 Subject: [PATCH] Publish new changes in catalog --- .../1.0.15/templates/_vikunja_frontend.tpl | 40 ------------------ .../1.0.15/templates/_vikunja_nginx.tpl | 36 ---------------- .../vikunja/1.0.15/templates/_wait-url.tpl | 17 -------- .../vikunja/{1.0.15 => 2.0.0}/Chart.lock | 0 .../vikunja/{1.0.15 => 2.0.0}/Chart.yaml | 6 +-- community/vikunja/{1.0.15 => 2.0.0}/README.md | 0 .../vikunja/{1.0.15 => 2.0.0}/app-readme.md | 0 .../{1.0.15 => 2.0.0}/charts/common-1.2.9.tgz | Bin .../{1.0.15 => 2.0.0}/ci/basic-values.yaml | 0 .../{1.0.15 => 2.0.0}/ci/extra-values.yaml | 0 .../vikunja/{1.0.15 => 2.0.0}/ix_values.yaml | 21 ++------- .../vikunja/{1.0.15 => 2.0.0}/metadata.yaml | 0 .../vikunja/{1.0.15 => 2.0.0}/questions.yaml | 0 .../{1.0.15 => 2.0.0}/templates/NOTES.txt | 0 .../templates/_configuration.tpl | 29 +------------ .../templates/_persistence.tpl | 29 +------------ .../{1.0.15 => 2.0.0}/templates/_portal.tpl | 0 .../{1.0.15 => 2.0.0}/templates/_postgres.tpl | 0 .../{1.0.15 => 2.0.0}/templates/_redis.tpl | 0 .../{1.0.15 => 2.0.0}/templates/_service.tpl | 26 ++---------- .../templates/_vikunja_api.tpl | 10 ++--- .../{1.0.15 => 2.0.0}/templates/common.yaml | 2 - 22 files changed, 16 insertions(+), 200 deletions(-) delete mode 100644 community/vikunja/1.0.15/templates/_vikunja_frontend.tpl delete mode 100644 community/vikunja/1.0.15/templates/_vikunja_nginx.tpl delete mode 100644 community/vikunja/1.0.15/templates/_wait-url.tpl rename community/vikunja/{1.0.15 => 2.0.0}/Chart.lock (100%) rename community/vikunja/{1.0.15 => 2.0.0}/Chart.yaml (90%) rename community/vikunja/{1.0.15 => 2.0.0}/README.md (100%) rename community/vikunja/{1.0.15 => 2.0.0}/app-readme.md (100%) rename community/vikunja/{1.0.15 => 2.0.0}/charts/common-1.2.9.tgz (100%) rename community/vikunja/{1.0.15 => 2.0.0}/ci/basic-values.yaml (100%) rename community/vikunja/{1.0.15 => 2.0.0}/ci/extra-values.yaml (100%) rename community/vikunja/{1.0.15 => 2.0.0}/ix_values.yaml (75%) rename community/vikunja/{1.0.15 => 2.0.0}/metadata.yaml (100%) rename community/vikunja/{1.0.15 => 2.0.0}/questions.yaml (100%) rename community/vikunja/{1.0.15 => 2.0.0}/templates/NOTES.txt (100%) rename community/vikunja/{1.0.15 => 2.0.0}/templates/_configuration.tpl (71%) rename community/vikunja/{1.0.15 => 2.0.0}/templates/_persistence.tpl (69%) rename community/vikunja/{1.0.15 => 2.0.0}/templates/_portal.tpl (100%) rename community/vikunja/{1.0.15 => 2.0.0}/templates/_postgres.tpl (100%) rename community/vikunja/{1.0.15 => 2.0.0}/templates/_redis.tpl (100%) rename community/vikunja/{1.0.15 => 2.0.0}/templates/_service.tpl (56%) rename community/vikunja/{1.0.15 => 2.0.0}/templates/_vikunja_api.tpl (88%) rename community/vikunja/{1.0.15 => 2.0.0}/templates/common.yaml (81%) diff --git a/community/vikunja/1.0.15/templates/_vikunja_frontend.tpl b/community/vikunja/1.0.15/templates/_vikunja_frontend.tpl deleted file mode 100644 index 6f17bbcc46..0000000000 --- a/community/vikunja/1.0.15/templates/_vikunja_frontend.tpl +++ /dev/null @@ -1,40 +0,0 @@ -{{- define "vikunja.frontend" -}} -{{- $fullname := (include "ix.v1.common.lib.chart.names.fullname" $) -}} -{{- $apiUrl := printf "http://%v:%v/health" $fullname .Values.vikunjaPorts.api }} -workload: - vikunja-frontend: - enabled: true - type: Deployment - podSpec: - hostNetwork: false - containers: - vikunja-frontend: - enabled: true - primary: true - imageSelector: frontendImage - securityContext: - runAsUser: 101 - runAsGroup: 101 - readOnlyRootFilesystem: false - envFrom: - - configMapRef: - name: vikunja-frontend - probes: - liveness: - enabled: true - type: http - port: {{ .Values.vikunjaPorts.frontHttp }} - path: /ready - readiness: - enabled: true - type: http - port: {{ .Values.vikunjaPorts.frontHttp }} - path: /ready - startup: - enabled: true - type: http - port: {{ .Values.vikunjaPorts.frontHttp }} - path: /ready - initContainers: - {{- include "vikunja.wait.init" (dict "url" $apiUrl) | indent 8 }} -{{- end -}} diff --git a/community/vikunja/1.0.15/templates/_vikunja_nginx.tpl b/community/vikunja/1.0.15/templates/_vikunja_nginx.tpl deleted file mode 100644 index e7ff2d5fed..0000000000 --- a/community/vikunja/1.0.15/templates/_vikunja_nginx.tpl +++ /dev/null @@ -1,36 +0,0 @@ -{{- define "vikunja.nginx" -}} -{{- $fullname := (include "ix.v1.common.lib.chart.names.fullname" $) -}} -{{- $frontUrl := printf "http://%v-frontend:%v/ready" $fullname .Values.vikunjaPorts.frontHttp }} -workload: - vikunja-proxy: - enabled: true - type: Deployment - podSpec: - hostNetwork: false - containers: - vikunja-proxy: - enabled: true - primary: true - imageSelector: nginxImage - securityContext: - runAsUser: 101 - runAsGroup: 101 - probes: - liveness: - enabled: true - type: http - port: {{ .Values.vikunjaNetwork.webPort }} - path: /nginx-health - readiness: - enabled: true - type: http - port: {{ .Values.vikunjaNetwork.webPort }} - path: /nginx-health - startup: - enabled: true - type: http - port: {{ .Values.vikunjaNetwork.webPort }} - path: /nginx-health - initContainers: - {{- include "vikunja.wait.init" (dict "url" $frontUrl) | indent 8 }} -{{- end -}} diff --git a/community/vikunja/1.0.15/templates/_wait-url.tpl b/community/vikunja/1.0.15/templates/_wait-url.tpl deleted file mode 100644 index 1d1afaa46a..0000000000 --- a/community/vikunja/1.0.15/templates/_wait-url.tpl +++ /dev/null @@ -1,17 +0,0 @@ -{{- define "vikunja.wait.init" -}} -{{- $url := .url }} -wait-url: - enabled: true - type: init - imageSelector: bashImage - command: - - /bin/ash - - -c - - | - echo "Pinging [{{ $url }}] until it is ready..." - until wget --spider --quiet "{{ $url }}"; do - echo "Waiting for [{{ $url }}] to be ready..." - sleep 2 - done - echo "URL [{{ $url }}] is ready!" -{{- end -}} diff --git a/community/vikunja/1.0.15/Chart.lock b/community/vikunja/2.0.0/Chart.lock similarity index 100% rename from community/vikunja/1.0.15/Chart.lock rename to community/vikunja/2.0.0/Chart.lock diff --git a/community/vikunja/1.0.15/Chart.yaml b/community/vikunja/2.0.0/Chart.yaml similarity index 90% rename from community/vikunja/1.0.15/Chart.yaml rename to community/vikunja/2.0.0/Chart.yaml index e29061d6f8..72e117f9c3 100644 --- a/community/vikunja/1.0.15/Chart.yaml +++ b/community/vikunja/2.0.0/Chart.yaml @@ -3,10 +3,10 @@ description: Vikunja is an open-source, self-hostable to-do app. annotations: title: Vikunja type: application -version: 1.0.15 +version: 2.0.0 apiVersion: v2 -appVersion: 0.22.1 -kubeVersion: '>=1.16.0-0' +appVersion: 0.24.2 +kubeVersion: ">=1.16.0-0" maintainers: - name: truenas url: https://www.truenas.com/ diff --git a/community/vikunja/1.0.15/README.md b/community/vikunja/2.0.0/README.md similarity index 100% rename from community/vikunja/1.0.15/README.md rename to community/vikunja/2.0.0/README.md diff --git a/community/vikunja/1.0.15/app-readme.md b/community/vikunja/2.0.0/app-readme.md similarity index 100% rename from community/vikunja/1.0.15/app-readme.md rename to community/vikunja/2.0.0/app-readme.md diff --git a/community/vikunja/1.0.15/charts/common-1.2.9.tgz b/community/vikunja/2.0.0/charts/common-1.2.9.tgz similarity index 100% rename from community/vikunja/1.0.15/charts/common-1.2.9.tgz rename to community/vikunja/2.0.0/charts/common-1.2.9.tgz diff --git a/community/vikunja/1.0.15/ci/basic-values.yaml b/community/vikunja/2.0.0/ci/basic-values.yaml similarity index 100% rename from community/vikunja/1.0.15/ci/basic-values.yaml rename to community/vikunja/2.0.0/ci/basic-values.yaml diff --git a/community/vikunja/1.0.15/ci/extra-values.yaml b/community/vikunja/2.0.0/ci/extra-values.yaml similarity index 100% rename from community/vikunja/1.0.15/ci/extra-values.yaml rename to community/vikunja/2.0.0/ci/extra-values.yaml diff --git a/community/vikunja/1.0.15/ix_values.yaml b/community/vikunja/2.0.0/ix_values.yaml similarity index 75% rename from community/vikunja/1.0.15/ix_values.yaml rename to community/vikunja/2.0.0/ix_values.yaml index 841bb10d18..6a7073486c 100644 --- a/community/vikunja/1.0.15/ix_values.yaml +++ b/community/vikunja/2.0.0/ix_values.yaml @@ -1,15 +1,7 @@ image: - repository: vikunja/api + repository: vikunja/vikunja pullPolicy: IfNotPresent - tag: 0.22.1 -frontendImage: - repository: vikunja/frontend - pullPolicy: IfNotPresent - tag: 0.22.1 -nginxImage: - repository: nginx - pullPolicy: IfNotPresent - tag: 1.27.1 + tag: 0.24.2 resources: limits: @@ -17,7 +9,7 @@ resources: memory: 8Gi vikunjaConfig: - url: '' + url: "" maxFileSize: 20 additionalEnvs: [] @@ -60,10 +52,3 @@ notes: {{- $_ := unset .Values "vikunjaDbPass" }} {{- $_ := unset .Values "vikunjaDbHost" }} - -# Not exposed to the user, -# just used internally -vikunjaPorts: - api: 3456 - frontHttp: 5000 - frontHttp2: 5001 diff --git a/community/vikunja/1.0.15/metadata.yaml b/community/vikunja/2.0.0/metadata.yaml similarity index 100% rename from community/vikunja/1.0.15/metadata.yaml rename to community/vikunja/2.0.0/metadata.yaml diff --git a/community/vikunja/1.0.15/questions.yaml b/community/vikunja/2.0.0/questions.yaml similarity index 100% rename from community/vikunja/1.0.15/questions.yaml rename to community/vikunja/2.0.0/questions.yaml diff --git a/community/vikunja/1.0.15/templates/NOTES.txt b/community/vikunja/2.0.0/templates/NOTES.txt similarity index 100% rename from community/vikunja/1.0.15/templates/NOTES.txt rename to community/vikunja/2.0.0/templates/NOTES.txt diff --git a/community/vikunja/1.0.15/templates/_configuration.tpl b/community/vikunja/2.0.0/templates/_configuration.tpl similarity index 71% rename from community/vikunja/1.0.15/templates/_configuration.tpl rename to community/vikunja/2.0.0/templates/_configuration.tpl index 37f366ca2a..5af3f5bf61 100644 --- a/community/vikunja/1.0.15/templates/_configuration.tpl +++ b/community/vikunja/2.0.0/templates/_configuration.tpl @@ -61,36 +61,11 @@ configmap: enabled: true data: VIKUNJA_SERVICE_TIMEZONE: {{ .Values.TZ }} - VIKUNJA_SERVICE_INTERFACE: VIKUNJA_REDIS_ENABLED: "true" VIKUNJA_KEYVALUE_TYPE: redis VIKUNJA_DATABASE_TYPE: postgres - VIKUNJA_SERVICE_INTERFACE: {{ printf ":%v" .Values.vikunjaPorts.api | quote }} + VIKUNJA_SERVICE_INTERFACE: {{ printf ":%v" .Values.vikunjaNetwork.webPort | quote }} VIKUNJA_FILES_MAXSIZE: {{ printf "%vMB" .Values.vikunjaConfig.maxFileSize }} VIKUNJA_FILES_BASEPATH: /app/vikunja/files - VIKUNJA_SERVICE_FRONTENDURL: {{ printf "%s/" (.Values.vikunjaConfig.url | trimSuffix "/") }} - - vikunja-frontend: - enabled: true - data: - VIKUNJA_HTTP_PORT: {{ .Values.vikunjaPorts.frontHttp | quote }} - VIKUNJA_HTTP2_PORT: {{ .Values.vikunjaPorts.frontHttp2 | quote }} - - nginx-config: - enabled: true - data: - nginx-config: | - server { - listen {{ .Values.vikunjaNetwork.webPort }}; - location /nginx-health { - return 200; - } - location / { - proxy_pass {{ printf "http://%s-frontend:%v" $fullname .Values.vikunjaPorts.frontHttp }}; - } - location ~* ^/(api|dav|\.well-known)/ { - proxy_pass {{ printf "http://%s:%v" $fullname .Values.vikunjaPorts.api }}; - client_max_body_size {{ printf "%vM" .Values.vikunjaConfig.maxFileSize }}; - } - } + VIKUNJA_SERVICE_PUBLICURL: {{ printf "%s/" (.Values.vikunjaConfig.url | trimSuffix "/") }} {{- end -}} diff --git a/community/vikunja/1.0.15/templates/_persistence.tpl b/community/vikunja/2.0.0/templates/_persistence.tpl similarity index 69% rename from community/vikunja/1.0.15/templates/_persistence.tpl rename to community/vikunja/2.0.0/templates/_persistence.tpl index d77808d3d8..cbcd46bb3d 100644 --- a/community/vikunja/1.0.15/templates/_persistence.tpl +++ b/community/vikunja/2.0.0/templates/_persistence.tpl @@ -4,23 +4,9 @@ persistence: enabled: true type: emptyDir targetSelector: - vikunja: - vikunja: + vikunja-api: + vikunja-api: mountPath: /tmp - nginxvar: - enabled: true - type: emptyDir - targetSelector: - vikunja-proxy: - vikunja-proxy: - mountPath: /var/cache/nginx - nginxrun: - enabled: true - type: emptyDir - targetSelector: - vikunja-proxy: - vikunja-proxy: - mountPath: /var/run data: enabled: true {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.vikunjaStorage.data) | nindent 4 }} @@ -33,17 +19,6 @@ persistence: 01-permissions: mountPath: /mnt/directories/data {{- end }} - nginx: - enabled: true - type: configmap - objectName: nginx-config - defaultMode: "0600" - targetSelector: - vikunja-proxy: - vikunja-proxy: - mountPath: /etc/nginx/conf.d/default.conf - subPath: nginx-config - readOnly: true {{- range $idx, $storage := .Values.vikunjaStorage.additionalStorages }} {{ printf "vikunja-%v" (int $idx) }}: diff --git a/community/vikunja/1.0.15/templates/_portal.tpl b/community/vikunja/2.0.0/templates/_portal.tpl similarity index 100% rename from community/vikunja/1.0.15/templates/_portal.tpl rename to community/vikunja/2.0.0/templates/_portal.tpl diff --git a/community/vikunja/1.0.15/templates/_postgres.tpl b/community/vikunja/2.0.0/templates/_postgres.tpl similarity index 100% rename from community/vikunja/1.0.15/templates/_postgres.tpl rename to community/vikunja/2.0.0/templates/_postgres.tpl diff --git a/community/vikunja/1.0.15/templates/_redis.tpl b/community/vikunja/2.0.0/templates/_redis.tpl similarity index 100% rename from community/vikunja/1.0.15/templates/_redis.tpl rename to community/vikunja/2.0.0/templates/_redis.tpl diff --git a/community/vikunja/1.0.15/templates/_service.tpl b/community/vikunja/2.0.0/templates/_service.tpl similarity index 56% rename from community/vikunja/1.0.15/templates/_service.tpl rename to community/vikunja/2.0.0/templates/_service.tpl index 6dc6e6dbb4..b9a0477639 100644 --- a/community/vikunja/1.0.15/templates/_service.tpl +++ b/community/vikunja/2.0.0/templates/_service.tpl @@ -1,37 +1,17 @@ {{- define "vikunja.service" -}} service: - vikunja: + vikunja-api: enabled: true primary: true - type: ClusterIP + type: NodePort targetSelector: vikunja-api ports: api: - enabled: true - primary: true - port: {{ .Values.vikunjaPorts.api }} - targetSelector: vikunja-api - proxy: - enabled: true - type: NodePort - targetSelector: vikunja-proxy - ports: - webui: enabled: true primary: true port: {{ .Values.vikunjaNetwork.webPort }} nodePort: {{ .Values.vikunjaNetwork.webPort }} - targetSelector: vikunja-proxy - frontend: - enabled: true - type: ClusterIP - targetSelector: vikunja-frontend - ports: - webui: - enabled: true - primary: true - port: {{ .Values.vikunjaPorts.frontHttp }} - targetSelector: vikunja-frontend + targetSelector: vikunja-api redis: enabled: true type: ClusterIP diff --git a/community/vikunja/1.0.15/templates/_vikunja_api.tpl b/community/vikunja/2.0.0/templates/_vikunja_api.tpl similarity index 88% rename from community/vikunja/1.0.15/templates/_vikunja_api.tpl rename to community/vikunja/2.0.0/templates/_vikunja_api.tpl index 0152bece64..462649cd8f 100644 --- a/community/vikunja/1.0.15/templates/_vikunja_api.tpl +++ b/community/vikunja/2.0.0/templates/_vikunja_api.tpl @@ -15,10 +15,6 @@ workload: runAsUser: {{ .Values.vikunjaRunAs.user }} runAsGroup: {{ .Values.vikunjaRunAs.group }} runAsNonRoot: false - env: - # Make vikunja skip user creation - PUID: "" - PGID: "" envFrom: - secretRef: name: vikunja-creds @@ -35,17 +31,17 @@ workload: liveness: enabled: true type: http - port: {{ .Values.vikunjaPorts.api }} + port: {{ .Values.vikunjaNetwork.webPort }} path: /health readiness: enabled: true type: http - port: {{ .Values.vikunjaPorts.api }} + port: {{ .Values.vikunjaNetwork.webPort }} path: /health startup: enabled: true type: http - port: {{ .Values.vikunjaPorts.api }} + port: {{ .Values.vikunjaNetwork.webPort }} path: /health initContainers: {{- include "ix.v1.common.app.permissions" (dict "containerName" "01-permissions" diff --git a/community/vikunja/1.0.15/templates/common.yaml b/community/vikunja/2.0.0/templates/common.yaml similarity index 81% rename from community/vikunja/1.0.15/templates/common.yaml rename to community/vikunja/2.0.0/templates/common.yaml index 8f70d45a4c..07d607a8a5 100644 --- a/community/vikunja/1.0.15/templates/common.yaml +++ b/community/vikunja/2.0.0/templates/common.yaml @@ -6,8 +6,6 @@ {{- $_ := mustMergeOverwrite .Values (include "vikunja.service" $ | fromYaml) -}} {{- $_ := mustMergeOverwrite .Values (include "vikunja.redis" $ | fromYaml) -}} {{- $_ := mustMergeOverwrite .Values (include "vikunja.postgres" $ | fromYaml) -}} -{{- $_ := mustMergeOverwrite .Values (include "vikunja.nginx" $ | fromYaml) -}} -{{- $_ := mustMergeOverwrite .Values (include "vikunja.frontend" $ | fromYaml) -}} {{- $_ := mustMergeOverwrite .Values (include "vikunja.api" $ | fromYaml) -}} {{/* Create the configmap for portal manually*/}}