From fbefead704bc4d313a5681d01f187b9720c8a048 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Mon, 2 Dec 2024 14:32:37 +0100 Subject: [PATCH] some fixes --- apps/todos/deployment.yaml | 11 ++-- apps/todos/kustomization.yaml | 1 + apps/todos/placeholder-config.configmap.yaml | 12 +++++ apps/todos/values.yaml | 54 -------------------- kluster-deployments/todos/kustomization.yaml | 1 - kluster-deployments/todos/repo.yaml | 12 ----- 6 files changed, 21 insertions(+), 70 deletions(-) create mode 100644 apps/todos/placeholder-config.configmap.yaml delete mode 100644 apps/todos/values.yaml delete mode 100644 kluster-deployments/todos/repo.yaml diff --git a/apps/todos/deployment.yaml b/apps/todos/deployment.yaml index 4d3c1b9..e22a2c5 100644 --- a/apps/todos/deployment.yaml +++ b/apps/todos/deployment.yaml @@ -32,11 +32,11 @@ spec: - name: VIKUNJA_DATABASE_PATH value: /app/vikunja/files/vikunja.db - name: VIKUNJA_SERVICE_ENABLEREGISTRATION - value: false + value: "false" - name: VIKUNJA_AUTH_LOCAL_ENABLED - value: false + value: "false" - name: VIKUNJA_AUTH_OPENID_ENABLED - value: true + value: "true" envFrom: - secretRef: name: todos-oidc @@ -47,7 +47,12 @@ spec: volumeMounts: - name: data mountPath: /app/vikunja/files + - name: placeholder-config + mountPath: /app/vikunja volumes: - name: data persistentVolumeClaim: claimName: data + - name: placeholder-config + configMap: + name: placeholder-config diff --git a/apps/todos/kustomization.yaml b/apps/todos/kustomization.yaml index c24a21e..26901a9 100644 --- a/apps/todos/kustomization.yaml +++ b/apps/todos/kustomization.yaml @@ -7,6 +7,7 @@ resources: - namespace.yaml - pvc.yaml - todos-oidc.sealedsecret.yaml + - placeholder-config.configmap.yaml - deployment.yaml - service.yaml - ingress.yaml diff --git a/apps/todos/placeholder-config.configmap.yaml b/apps/todos/placeholder-config.configmap.yaml new file mode 100644 index 0000000..c56174a --- /dev/null +++ b/apps/todos/placeholder-config.configmap.yaml @@ -0,0 +1,12 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: placeholder-config +data: + config.yml: | + auth: + openid: + enabled: true + providers: + authelia: + name: authelia diff --git a/apps/todos/values.yaml b/apps/todos/values.yaml deleted file mode 100644 index c857e53..0000000 --- a/apps/todos/values.yaml +++ /dev/null @@ -1,54 +0,0 @@ -###################### -# VIKUNJA COMPONENTS # -###################### - -image: - tag: 0.22.1 -# You can find the default values that this `values.yaml` overrides, in the comment at the top of this file. -api: - enabled: true - image: - tag: 0.22.1 - persistence: - # This is your Vikunja data will live, you can either let - # the chart create a new PVC for you or provide an existing one. - data: - enabled: true - existingClaim: data - accessMode: ReadWriteOnce - size: 10Gi - mountPath: /app/vikunja/files - - ingress: - main: - enabled: false - - configMaps: - # The configuration for Vikunja's api. - # https://vikunja.io/docs/config-options/ - config: - enabled: true - data: - config.yml: | - service: - frontendUrl: https://todos.kluster.moll.re - database: - type: sqlite - path: /app/vikunja/files/vikunja.db - registration: false - - -frontend: - enabled: true - image: - tag: 0.22.1 - ingress: - main: - enabled: false - -postgresql: - enabled: false -redis: - enabled: false -typesense: - enabled: false diff --git a/kluster-deployments/todos/kustomization.yaml b/kluster-deployments/todos/kustomization.yaml index 36563a8..977dcfe 100644 --- a/kluster-deployments/todos/kustomization.yaml +++ b/kluster-deployments/todos/kustomization.yaml @@ -2,4 +2,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - application.yaml - # - repo.yaml \ No newline at end of file diff --git a/kluster-deployments/todos/repo.yaml b/kluster-deployments/todos/repo.yaml deleted file mode 100644 index 3d8c381..0000000 --- a/kluster-deployments/todos/repo.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - labels: - argocd.argoproj.io/secret-type: repository - name: kolaente-helm-oci - -stringData: - url: kolaente.dev/vikunja - name: vikunja - type: helm - enableOCI: "true"