From 52e91f301b96641f02b8147eb9f2edc83e6221d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Tue, 8 Aug 2023 10:49:56 +0200 Subject: [PATCH] fix --- apps/dolibarr/deploy.tf | 2 +- apps/dolibarr/index.yaml | 238 +++++++++++++++++++-------------------- 2 files changed, 120 insertions(+), 120 deletions(-) diff --git a/apps/dolibarr/deploy.tf b/apps/dolibarr/deploy.tf index b6e70b6..e959013 100644 --- a/apps/dolibarr/deploy.tf +++ b/apps/dolibarr/deploy.tf @@ -145,7 +145,7 @@ spec: valueFrom: secretKeyRef: key: password - name: "${var.component}.${var.instance}-${var.component}.credentials.postgresql.acid.zalan.do" + name: "${var.instance}-${var.component}-pg-app" envFrom: - configMapRef: name: "${kubectl_manifest.config.name}" diff --git a/apps/dolibarr/index.yaml b/apps/dolibarr/index.yaml index 4a4cc63..6b5b6d3 100644 --- a/apps/dolibarr/index.yaml +++ b/apps/dolibarr/index.yaml @@ -47,29 +47,11 @@ options: type: string type: object type: object - issuer: - default: letsencrypt-prod + sub-domain: + default: erp examples: - - letsencrypt-prod + - erp type: string - modules: - default: - - societe - examples: - - - societe - items: - type: string - type: array - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - log-level: - default: 5 - examples: - - 5 - type: integer user-groups: default: - admin: true @@ -85,11 +67,6 @@ options: type: string type: object type: array - ingress-class: - default: traefik - examples: - - traefik - type: string storage: default: accessMode: ReadWriteOnce @@ -117,6 +94,122 @@ options: - block type: string type: object + parameters: + default: + MAIN_LANG_DEFAULT: auto + examples: + - MAIN_LANG_DEFAULT: auto + properties: + MAIN_LANG_DEFAULT: + default: auto + type: string + type: object + domain: + default: your-company + examples: + - your-company + type: string + log-level: + default: 5 + examples: + - 5 + type: integer + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + ingress-class: + default: traefik + examples: + - traefik + 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 + 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 + 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 + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + modules: + default: + - societe + examples: + - - societe + items: + type: string + type: array images: default: dolibarr: @@ -182,99 +275,6 @@ options: type: string type: object type: object - parameters: - default: - MAIN_LANG_DEFAULT: auto - examples: - - MAIN_LANG_DEFAULT: auto - properties: - MAIN_LANG_DEFAULT: - default: auto - 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 - 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: - default: your-company - examples: - - your-company - type: string - 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 - sub-domain: - default: erp - examples: - - erp - type: string dependencies: - dist: null category: share