diff --git a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml index 6ff14fd..84c5020 100644 --- a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml +++ b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml @@ -70,10 +70,7 @@ spec: - name: REDIS_HOST_PORT value: "6379" - name: REDIS_HOST_PASSWORD - valueFrom: - secretKeyRef: - name: nextcloud - key: redis-password + value: changeme resources: {} volumeMounts: diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml index b8225a6..ddc6f04 100644 --- a/apps/nextcloud/index.yaml +++ b/apps/nextcloud/index.yaml @@ -6,35 +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 - 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 @@ -45,89 +16,11 @@ options: 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 - 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 issuer: default: letsencrypt-prod examples: - letsencrypt-prod type: string - 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 - version: - default: '14' - 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 images: default: exporter: @@ -231,11 +124,118 @@ options: type: string type: object type: object + ingress-class: + default: traefik + examples: + - traefik + 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 + 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 + domain-name: + default: your_company.com + examples: + - your_company.com + 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 + 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 + domain: + default: your-company + examples: + - your-company + type: string dependencies: [] providers: kubernetes: true diff --git a/apps/nextcloud/redis.tf b/apps/nextcloud/redis.tf index 650a883..0ac78d6 100644 --- a/apps/nextcloud/redis.tf +++ b/apps/nextcloud/redis.tf @@ -15,9 +15,6 @@ resource "kubectl_manifest" "prj_redis" { kubernetesConfig: image: "${var.redis.image}" imagePullPolicy: "IfNotPresent" - redisSecret: - name: nextcloud - key: redis-password storage: volumeClaimTemplate: spec: diff --git a/apps/nextcloud/secret.tf b/apps/nextcloud/secret.tf index cb32fda..5cb6064 100644 --- a/apps/nextcloud/secret.tf +++ b/apps/nextcloud/secret.tf @@ -17,7 +17,5 @@ resource "kubectl_manifest" "gitea_secret" { length: "32" - fieldName: "nextcloud-token" length: "32" - - fieldName: "redis-password" - length: "32" EOF }