From 6de31cc5b7b5da317cc075e51cff0e945c1ba012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Wed, 26 Jul 2023 14:23:24 +0200 Subject: [PATCH] fix --- .../apps_v1_Deployment_nextcloud.yaml | 2 +- apps/nextcloud/index.yaml | 270 +++++++++--------- .../v1_ConfigMap_nextcloud-config.yaml | 1 + 3 files changed, 137 insertions(+), 136 deletions(-) diff --git a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml index cabca15..c76be37 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: e3528280a5ebf78c1c934053feb645aa74d99cff64da293e278fea43f01f1ff2 + nextcloud-config-hash: 7a924d09bed7cbc4b9b05c68827424cc392a736c8f4cc812ec0d897a15188de5 php-config-hash: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a nginx-config-hash: 18dd8f905a93ed27f032e9ae68084222ed7e5926f7144cda17b979780f4da54b spec: diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml index 13828a9..33de1cc 100644 --- a/apps/nextcloud/index.yaml +++ b/apps/nextcloud/index.yaml @@ -6,86 +6,6 @@ metadata: name: nextcloud description: null options: - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - ingress-class: - default: traefik - examples: - - traefik - type: string - domain: - default: your-company - examples: - - your-company - type: string - 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 - contacts: false - deck: false - groupfolders: true - notes: false - spreed: false - tasks: false - examples: - - calendar: false - contacts: false - deck: false - groupfolders: true - notes: false - spreed: false - tasks: false - properties: - calendar: - default: false - type: boolean - contacts: - default: false - type: boolean - deck: - default: false - type: boolean - groupfolders: - default: true - type: boolean - notes: - default: false - type: boolean - spreed: - default: false - type: boolean - tasks: - default: false - type: boolean - type: object - openid-name: - default: vynil - examples: - - vynil - type: string postgres: default: replicas: 1 @@ -106,62 +26,20 @@ options: default: '14' type: string type: object - storage: + admin: default: - accessMode: ReadWriteOnce - size: 10Gi + name: nextcloud_admin examples: - - accessMode: ReadWriteOnce - size: 10Gi + - name: nextcloud_admin properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - size: - default: 10Gi + name: + default: nextcloud_admin 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 + domain-name: + default: your_company.com 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 - sub-domain: - default: cloud - examples: - - cloud + - your_company.com type: string images: default: @@ -266,21 +144,143 @@ options: type: string type: object type: object - admin: + redis: default: - name: nextcloud_admin + exporter: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + image: quay.io/opstree/redis:v7.0.5 + storage: 2Gi examples: - - name: nextcloud_admin + - exporter: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + image: quay.io/opstree/redis:v7.0.5 + storage: 2Gi properties: - name: - default: nextcloud_admin + 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 + 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 + contacts: false + deck: false + groupfolders: true + notes: false + spreed: false + tasks: false + examples: + - calendar: false + contacts: false + deck: false + groupfolders: true + notes: false + spreed: false + tasks: false + properties: + calendar: + default: false + type: boolean + contacts: + default: false + type: boolean + deck: + default: false + type: boolean + groupfolders: + default: true + type: boolean + notes: + default: false + type: boolean + spreed: + default: false + type: boolean + tasks: + default: false + type: boolean + type: object + sub-domain: + default: cloud + examples: + - cloud + type: string + domain: + default: your-company + examples: + - your-company + type: string dependencies: [] providers: kubernetes: true diff --git a/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml b/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml index ea9e7b5..197ac95 100644 --- a/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml +++ b/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml @@ -19,6 +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, ); .htaccess: |- # line below if for Apache 2.4