From f38ba19c89078ed612577e4a8853746c72326d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Wed, 26 Jul 2023 14:25:26 +0200 Subject: [PATCH] fix --- .../apps_v1_Deployment_nextcloud.yaml | 2 +- apps/nextcloud/index.yaml | 204 +++++++++--------- .../v1_ConfigMap_nextcloud-config.yaml | 2 +- 3 files changed, 104 insertions(+), 104 deletions(-) diff --git a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml index c76be37..3bf5407 100644 --- a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml +++ b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml @@ -25,7 +25,7 @@ spec: app.kubernetes.io/instance: nextcloud app.kubernetes.io/component: app annotations: - nextcloud-config-hash: 7a924d09bed7cbc4b9b05c68827424cc392a736c8f4cc812ec0d897a15188de5 + nextcloud-config-hash: eaabbc40fb401a27b2f639448f5dfca0797897ee168ccf25aa48b827611cba20 php-config-hash: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a nginx-config-hash: 18dd8f905a93ed27f032e9ae68084222ed7e5926f7144cda17b979780f4da54b spec: diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml index 33de1cc..b3a5883 100644 --- a/apps/nextcloud/index.yaml +++ b/apps/nextcloud/index.yaml @@ -6,24 +6,37 @@ metadata: name: nextcloud description: null options: - postgres: + redis: default: - replicas: 1 - storage: 5Gi - version: '14' + exporter: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + image: quay.io/opstree/redis:v7.0.5 + storage: 2Gi examples: - - replicas: 1 - storage: 5Gi - version: '14' + - exporter: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + image: quay.io/opstree/redis:v7.0.5 + storage: 2Gi properties: - replicas: - default: 1 - type: integer - storage: - default: 5Gi + 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 - version: - default: '14' + storage: + default: 2Gi type: string type: object admin: @@ -36,10 +49,20 @@ options: default: nextcloud_admin type: string type: object - domain-name: - default: your_company.com + openid-name: + default: vynil examples: - - your_company.com + - vynil + type: string + sub-domain: + default: cloud + examples: + - cloud + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod type: string images: default: @@ -144,93 +167,41 @@ options: type: string type: object 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 + domain: + default: your-company examples: - - exporter: - enabled: true - image: quay.io/opstree/redis-exporter:v1.44.0 - image: quay.io/opstree/redis:v7.0.5 - storage: 2Gi + - your-company + type: string + postgres: + default: + replicas: 1 + storage: 5Gi + version: '14' + examples: + - replicas: 1 + storage: 5Gi + version: '14' 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 + replicas: + default: 1 + type: integer storage: - default: 2Gi + default: 5Gi + type: string + version: + default: '14' type: string type: object + domain-name: + default: your_company.com + examples: + - your_company.com + type: string ingress-class: default: traefik examples: - traefik type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - openid-name: - default: vynil - examples: - - vynil - type: string - storage: - default: - accessMode: ReadWriteOnce - size: 10Gi - examples: - - accessMode: ReadWriteOnce - size: 10Gi - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - size: - default: 10Gi - type: string - type: object - hpa: - default: - avg-cpu: 50 - max-replicas: 5 - min-replicas: 1 - examples: - - 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 apps: default: calendar: false @@ -271,16 +242,45 @@ options: default: false type: boolean type: object - sub-domain: - default: cloud + storage: + default: + accessMode: ReadWriteOnce + size: 10Gi examples: - - cloud - type: string - domain: - default: your-company + - accessMode: ReadWriteOnce + size: 10Gi + properties: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: + default: 10Gi + type: string + type: object + hpa: + default: + avg-cpu: 50 + max-replicas: 5 + min-replicas: 1 examples: - - your-company - 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 dependencies: [] providers: kubernetes: true diff --git a/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml b/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml index 197ac95..f2e2a00 100644 --- a/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml +++ b/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml @@ -19,7 +19,7 @@ data: 'loglevel' => 0, 'logdateformat' => 'F d, Y H:i:s', 'trusted_proxies' => array('10.244.0.0/16','2001:cafe:42::1'), - 'allow_local_remote_servers’ => true, + 'allow_local_remote_servers' => true, ); .htaccess: |- # line below if for Apache 2.4