From ff247ebee14649a5c88b7ad944b47ea5640b2bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Tue, 18 Jul 2023 10:48:45 +0200 Subject: [PATCH] fix --- .../apps_v1_Deployment_nextcloud.yaml | 2 +- apps/nextcloud/index.yaml | 174 +++++++++--------- .../v1_ConfigMap_nextcloud-config.yaml | 2 + 3 files changed, 90 insertions(+), 88 deletions(-) diff --git a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml index 3f73507..84c5020 100644 --- a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml +++ b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml @@ -26,7 +26,7 @@ spec: app.kubernetes.io/component: app nextcloud-redis-client: "true" annotations: - nextcloud-config-hash: e6f7218d8e724ad4d0f1d5c4d12b491c1db2f33fb0dd470a9e05cc7d371db965 + nextcloud-config-hash: d4320fdaefff5b70c7a5104cb95c93f3525ec8c8ca505ca7d8b36aea48f2539c php-config-hash: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a nginx-config-hash: 18dd8f905a93ed27f032e9ae68084222ed7e5926f7144cda17b979780f4da54b spec: diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml index 68943b9..076f2c0 100644 --- a/apps/nextcloud/index.yaml +++ b/apps/nextcloud/index.yaml @@ -6,83 +6,51 @@ metadata: name: nextcloud description: null options: - ingress-class: - default: traefik + hpa: + default: + avg-cpu: 50 + max-replicas: 5 + min-replicas: 1 examples: - - traefik - type: string + - avg-cpu: 50 + max-replicas: 5 + min-replicas: 1 + properties: + avg-cpu: + default: 50 + type: integer + max-replicas: + default: 5 + type: integer + min-replicas: + default: 1 + type: integer + type: object + admin: + default: + name: nextcloud_admin + examples: + - name: nextcloud_admin + properties: + name: + default: nextcloud_admin + type: string + type: object domain: default: your-company examples: - your-company type: string - storage: - default: - accessMode: ReadWriteOnce - size: 10Gi + ingress-class: + default: traefik examples: - - accessMode: ReadWriteOnce - size: 10Gi - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - size: - default: 10Gi - type: string - type: object - redis: - default: - exporter: - enabled: true - image: quay.io/opstree/redis-exporter:v1.44.0 - image: quay.io/opstree/redis:v7.0.5 - storage: 2Gi - examples: - - exporter: - enabled: true - image: quay.io/opstree/redis-exporter:v1.44.0 - image: quay.io/opstree/redis:v7.0.5 - storage: 2Gi - properties: - exporter: - default: - enabled: true - image: quay.io/opstree/redis-exporter:v1.44.0 - properties: - enabled: - default: true - type: boolean - image: - default: quay.io/opstree/redis-exporter:v1.44.0 - type: string - type: object - image: - default: quay.io/opstree/redis:v7.0.5 - type: string - storage: - default: 2Gi - type: string - type: object + - traefik + type: string issuer: default: letsencrypt-prod examples: - letsencrypt-prod type: string - sub-domain: - default: cloud - examples: - - cloud - type: string - domain-name: - default: your_company.com - examples: - - your_company.com - type: string images: default: exporter: @@ -186,6 +154,11 @@ options: type: string type: object type: object + sub-domain: + default: cloud + examples: + - cloud + type: string postgres: default: replicas: 1 @@ -206,34 +179,61 @@ options: default: '14' type: string type: object - hpa: - default: - avg-cpu: 50 - max-replicas: 5 - min-replicas: 1 + domain-name: + default: your_company.com examples: - - avg-cpu: 50 - max-replicas: 5 - min-replicas: 1 + - your_company.com + type: string + redis: + default: + exporter: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + image: quay.io/opstree/redis:v7.0.5 + storage: 2Gi + examples: + - exporter: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + image: quay.io/opstree/redis:v7.0.5 + storage: 2Gi properties: - avg-cpu: - default: 50 - type: integer - max-replicas: - default: 5 - type: integer - min-replicas: - default: 1 - type: integer + exporter: + default: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + properties: + enabled: + default: true + type: boolean + image: + default: quay.io/opstree/redis-exporter:v1.44.0 + type: string + type: object + image: + default: quay.io/opstree/redis:v7.0.5 + type: string + storage: + default: 2Gi + type: string type: object - admin: + storage: default: - name: nextcloud_admin + accessMode: ReadWriteOnce + size: 10Gi examples: - - name: nextcloud_admin + - accessMode: ReadWriteOnce + size: 10Gi properties: - name: - default: nextcloud_admin + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: + default: 10Gi type: string type: object dependencies: [] diff --git a/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml b/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml index 7bff5f5..408489c 100644 --- a/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml +++ b/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml @@ -15,6 +15,8 @@ data: 'default_language' => 'fr', 'default_locale' => 'fr_FR', 'default_phone_region' => 'FR', + 'log_type' => 'errorlog', + 'loglevel' => 0, 'logdateformat' => 'F d, Y H:i:s', ); .htaccess: |-