diff --git a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml index 84c5020..6ff14fd 100644 --- a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml +++ b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml @@ -70,7 +70,10 @@ spec: - name: REDIS_HOST_PORT value: "6379" - name: REDIS_HOST_PASSWORD - value: changeme + valueFrom: + secretKeyRef: + name: nextcloud + key: redis-password resources: {} volumeMounts: diff --git a/apps/nextcloud/datas.tf b/apps/nextcloud/datas.tf index efb12ed..8a646ce 100644 --- a/apps/nextcloud/datas.tf +++ b/apps/nextcloud/datas.tf @@ -54,8 +54,6 @@ data "kustomization_overlay" "data" { value: "${local.dns-name}" - name: REDIS_HOST value: "${var.instance}-${var.component}-redis.${var.namespace}.svc" - - name: REDIS_HOST_PASSWORD - value: "" resources: {} - name: nextcloud-nginx diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml index 076f2c0..79d37d0 100644 --- a/apps/nextcloud/index.yaml +++ b/apps/nextcloud/index.yaml @@ -6,41 +6,6 @@ metadata: name: nextcloud description: null options: - 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 - 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 ingress-class: default: traefik examples: @@ -51,6 +16,11 @@ options: examples: - letsencrypt-prod type: string + sub-domain: + default: cloud + examples: + - cloud + type: string images: default: exporter: @@ -154,11 +124,6 @@ options: type: string type: object type: object - sub-domain: - default: cloud - examples: - - cloud - type: string postgres: default: replicas: 1 @@ -179,11 +144,46 @@ options: default: '14' type: string type: object + domain: + default: your-company + examples: + - your-company + 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: + 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 redis: default: exporter: diff --git a/apps/nextcloud/secret.tf b/apps/nextcloud/secret.tf index 5cb6064..cb32fda 100644 --- a/apps/nextcloud/secret.tf +++ b/apps/nextcloud/secret.tf @@ -17,5 +17,7 @@ resource "kubectl_manifest" "gitea_secret" { length: "32" - fieldName: "nextcloud-token" length: "32" + - fieldName: "redis-password" + length: "32" EOF }