diff --git a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml index a483900..796c33f 100644 --- a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml +++ b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml @@ -24,7 +24,6 @@ spec: app.kubernetes.io/name: nextcloud app.kubernetes.io/instance: nextcloud app.kubernetes.io/component: app - nextcloud-redis-client: "true" annotations: nextcloud-config-hash: d4320fdaefff5b70c7a5104cb95c93f3525ec8c8ca505ca7d8b36aea48f2539c php-config-hash: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a @@ -65,12 +64,6 @@ spec: value: "1" - name: NEXTCLOUD_DATA_DIR value: "/var/www/html/data" - - name: REDIS_HOST - value: nextcloud-redis-master - - name: REDIS_HOST_PORT - value: "6379" - - name: REDIS_HOST_PASSWORD - value: resources: {} volumeMounts: diff --git a/apps/nextcloud/datas.tf b/apps/nextcloud/datas.tf index 8a646ce..290d2f6 100644 --- a/apps/nextcloud/datas.tf +++ b/apps/nextcloud/datas.tf @@ -54,6 +54,8 @@ data "kustomization_overlay" "data" { value: "${local.dns-name}" - name: REDIS_HOST value: "${var.instance}-${var.component}-redis.${var.namespace}.svc" + - name: REDIS_HOST_PORT + value: "6379" resources: {} - name: nextcloud-nginx diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml index 496b01c..3164f56 100644 --- a/apps/nextcloud/index.yaml +++ b/apps/nextcloud/index.yaml @@ -6,23 +6,69 @@ metadata: name: nextcloud description: null options: - storage: - default: - accessMode: ReadWriteOnce - size: 10Gi + sub-domain: + default: cloud examples: - - accessMode: ReadWriteOnce - size: 10Gi + - cloud + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + ingress-class: + default: traefik + examples: + - traefik + type: string + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + hpa: + default: + avg-cpu: 50 + max-replicas: 5 + min-replicas: 1 + examples: + - avg-cpu: 50 + max-replicas: 5 + min-replicas: 1 properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany + avg-cpu: + default: 50 + type: integer + max-replicas: + default: 5 + type: integer + min-replicas: + default: 1 + type: integer + type: object + domain: + default: your-company + examples: + - your-company + type: string + postgres: + default: + replicas: 1 + storage: 5Gi + version: '14' + examples: + - replicas: 1 + storage: 5Gi + version: '14' + properties: + replicas: + default: 1 + type: integer + storage: + default: 5Gi type: string - size: - default: 10Gi + version: + default: '14' type: string type: object redis: @@ -58,6 +104,35 @@ options: default: 2Gi type: string type: object + 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 + admin: + default: + name: nextcloud_admin + examples: + - name: nextcloud_admin + properties: + name: + default: nextcloud_admin + type: string + type: object images: default: exporter: @@ -161,81 +236,6 @@ options: type: string type: object type: object - domain: - default: your-company - examples: - - your-company - type: string - admin: - default: - name: nextcloud_admin - examples: - - name: nextcloud_admin - properties: - name: - default: nextcloud_admin - 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 - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - ingress-class: - default: traefik - examples: - - traefik - type: string - sub-domain: - default: cloud - examples: - - cloud - type: string - postgres: - default: - replicas: 1 - storage: 5Gi - version: '14' - examples: - - replicas: 1 - storage: 5Gi - version: '14' - properties: - replicas: - default: 1 - type: integer - storage: - default: 5Gi - type: string - version: - default: '14' - type: string - type: object - domain-name: - default: your_company.com - examples: - - your_company.com - type: string dependencies: [] providers: kubernetes: true