From 1a023a18e58ab2ae5a2d45bc67ef20f56d28250c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Sun, 29 Oct 2023 17:03:22 +0100 Subject: [PATCH] fix --- apps/code-server/index.yaml | 122 +++---- apps/dbgate/deploy.tf | 3 + apps/dbgate/index.yaml | 182 +++++----- apps/dolibarr/deploy.tf | 3 + apps/dolibarr/index.yaml | 328 ++++++++--------- apps/gitea/datas.tf | 2 + apps/gitea/index.yaml | 234 ++++++------ apps/k8s-api/index.yaml | 10 +- .../apps_v1_Deployment_nextcloud-metrics.yaml | 2 +- .../apps_v1_Deployment_nextcloud.yaml | 4 +- ..._v1_HorizontalPodAutoscaler_nextcloud.yaml | 2 +- apps/nextcloud/datas.tf | 4 + apps/nextcloud/index.yaml | 338 +++++++++--------- ...oreos.com_v1_ServiceMonitor_nextcloud.yaml | 2 +- .../v1_ConfigMap_nextcloud-config.yaml | 2 +- .../v1_ConfigMap_nextcloud-nginxconfig.yaml | 2 +- ...istentVolumeClaim_nextcloud-nextcloud.yaml | 2 +- .../v1_Service_nextcloud-metrics.yaml | 2 +- apps/nextcloud/v1_Service_nextcloud.yaml | 2 +- apps/okd/index.yaml | 36 +- apps/traefik-ui/index.yaml | 20 +- apps/woodpecker/index.yaml | 134 +++---- share/division/index.yaml | 28 +- share/organisation/gitea-user.tf | 4 +- share/organisation/index.yaml | 76 ++-- 25 files changed, 778 insertions(+), 766 deletions(-) diff --git a/apps/code-server/index.yaml b/apps/code-server/index.yaml index 1213bbc..bef5b6a 100644 --- a/apps/code-server/index.yaml +++ b/apps/code-server/index.yaml @@ -6,63 +6,31 @@ metadata: name: code-server description: null options: - app-group: - default: dev - examples: - - dev - type: string ingress-class: default: traefik examples: - traefik type: string - domain: - default: your-company + sub-domain: + default: code examples: - - your-company + - code type: string - storage: - default: - accessMode: ReadWriteOnce - size: 20Gi - type: Filesystem + app-group: + default: dev examples: - - accessMode: ReadWriteOnce - size: 20Gi - type: Filesystem - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - size: - default: 20Gi - type: string - type: - default: Filesystem - enum: - - Filesystem - - Block - type: string - type: object - admin: - default: - cluster: false - namespace: false + - dev + type: string + no-editor: + default: false examples: - - cluster: false - namespace: false - properties: - cluster: - default: false - type: boolean - namespace: - default: false - type: boolean - type: object + - false + type: boolean + timezone: + default: Europe/Paris + examples: + - Europe/Paris + type: string images: default: codeserver: @@ -102,31 +70,63 @@ options: type: number type: object type: object - sub-domain: - default: code - examples: - - code - type: string domain-name: default: your_company.com examples: - your_company.com type: string + domain: + default: your-company + examples: + - your-company + type: string issuer: default: letsencrypt-prod examples: - letsencrypt-prod type: string - timezone: - default: Europe/Paris + admin: + default: + cluster: false + namespace: false examples: - - Europe/Paris - type: string - no-editor: - default: false + - cluster: false + namespace: false + properties: + cluster: + default: false + type: boolean + namespace: + default: false + type: boolean + type: object + storage: + default: + accessMode: ReadWriteOnce + size: 20Gi + type: Filesystem examples: - - false - type: boolean + - accessMode: ReadWriteOnce + size: 20Gi + type: Filesystem + properties: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: + default: 20Gi + type: string + type: + default: Filesystem + enum: + - Filesystem + - Block + type: string + type: object dependencies: - dist: null category: share diff --git a/apps/dbgate/deploy.tf b/apps/dbgate/deploy.tf index f9b8a7d..6c8944b 100644 --- a/apps/dbgate/deploy.tf +++ b/apps/dbgate/deploy.tf @@ -29,6 +29,9 @@ resource "kubectl_manifest" "deploy" { name: "${var.component}-${var.instance}" namespace: "${var.namespace}" labels: ${jsonencode(local.common-labels)} + annotations: + configmap.reloader.stakater.com/reload: "${var.component}-${var.instance}" + secret.reloader.stakater.com/reload: "${var.component}-${var.instance}" spec: replicas: 1 selector: diff --git a/apps/dbgate/index.yaml b/apps/dbgate/index.yaml index 724c02d..870495f 100644 --- a/apps/dbgate/index.yaml +++ b/apps/dbgate/index.yaml @@ -6,6 +6,91 @@ metadata: name: dbgate description: null options: + mongo: + default: [] + examples: + - [] + items: + properties: + dbname: + default: '' + type: string + name: + default: '' + type: string + namespace: + default: '' + type: string + secret: + properties: + key: + default: '' + type: string + name: + default: '' + type: string + type: object + username: + default: '' + type: string + type: object + type: array + domain: + default: your-company + examples: + - your-company + type: string + redis: + default: [] + examples: + - [] + items: + properties: + name: + default: '' + type: string + namespace: + default: '' + type: string + type: object + type: array + app-group: + default: dev + examples: + - dev + type: string + storage: + default: + accessMode: ReadWriteOnce + size: 1Gi + type: Filesystem + examples: + - accessMode: ReadWriteOnce + size: 1Gi + type: Filesystem + properties: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: + default: 1Gi + type: string + type: + default: Filesystem + enum: + - Filesystem + - Block + type: string + type: object + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string domain-name: default: your_company.com examples: @@ -40,7 +125,7 @@ options: type: string type: object type: array - mongo: + maria: default: [] examples: - [] @@ -69,6 +154,11 @@ options: type: string type: object type: array + ingress-class: + default: traefik + examples: + - traefik + type: string images: default: dbgate: @@ -108,96 +198,6 @@ options: type: string type: object type: object - domain: - default: your-company - examples: - - your-company - type: string - ingress-class: - default: traefik - examples: - - traefik - type: string - app-group: - default: dev - examples: - - dev - type: string - storage: - default: - accessMode: ReadWriteOnce - size: 1Gi - type: Filesystem - examples: - - accessMode: ReadWriteOnce - size: 1Gi - type: Filesystem - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - size: - default: 1Gi - type: string - type: - default: Filesystem - enum: - - Filesystem - - Block - type: string - type: object - redis: - default: [] - examples: - - [] - items: - properties: - name: - default: '' - type: string - namespace: - default: '' - type: string - type: object - type: array - maria: - default: [] - examples: - - [] - items: - properties: - dbname: - default: '' - type: string - name: - default: '' - type: string - namespace: - default: '' - type: string - secret: - properties: - key: - default: '' - type: string - name: - default: '' - type: string - type: object - username: - default: '' - type: string - type: object - type: array - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string sub-domain: default: dbgate examples: diff --git a/apps/dolibarr/deploy.tf b/apps/dolibarr/deploy.tf index e959013..c5f9082 100644 --- a/apps/dolibarr/deploy.tf +++ b/apps/dolibarr/deploy.tf @@ -36,6 +36,9 @@ metadata: name: ${var.instance} namespace: ${var.namespace} labels: ${jsonencode(local.deploy-labels)} + annotations: + configmap.reloader.stakater.com/reload: "${kubectl_manifest.nginx-config.name},${kubectl_manifest.config.name}" + secret.reloader.stakater.com/reload: "${kubectl_manifest.dolibarr_ldap.name},${kubectl_manifest.saml_certificate.name},${var.instance}-${var.component}-pg-app" spec: selector: matchLabels: ${jsonencode(local.deploy-labels)} diff --git a/apps/dolibarr/index.yaml b/apps/dolibarr/index.yaml index 352cf28..727b53c 100644 --- a/apps/dolibarr/index.yaml +++ b/apps/dolibarr/index.yaml @@ -6,6 +6,11 @@ metadata: name: dolibarr description: null options: + app-group: + default: '' + examples: + - '' + type: string issuer: default: letsencrypt-prod examples: @@ -44,74 +49,86 @@ options: default: 2Gi type: string type: object - storage: - default: - accessMode: ReadWriteOnce - size: 10Gi - type: Filesystem + ingress-class: + default: traefik examples: - - accessMode: ReadWriteOnce - size: 10Gi - type: Filesystem - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - size: - default: 10Gi - type: string - type: - default: Filesystem - enum: - - Filesystem - - block - type: string - type: object - resources: + - traefik + type: string + images: default: - limits: - cpu: 200m - memory: 256Mi - requests: - cpu: 50m - memory: 100Mi + dolibarr: + pullPolicy: IfNotPresent + registry: docker.io + repository: sebt3/dolibarr + tag: 18.0.2 + nginx: + pullPolicy: IfNotPresent + registry: docker.io + repository: nginx + tag: alpine examples: - - limits: - cpu: 200m - memory: 256Mi - requests: - cpu: 50m - memory: 100Mi + - dolibarr: + pullPolicy: IfNotPresent + registry: docker.io + repository: sebt3/dolibarr + tag: 18.0.2 + nginx: + pullPolicy: IfNotPresent + registry: docker.io + repository: nginx + tag: alpine properties: - limits: + dolibarr: default: - cpu: 200m - memory: 256Mi + pullPolicy: IfNotPresent + registry: docker.io + repository: sebt3/dolibarr + tag: 18.0.2 properties: - cpu: - default: 200m + pullPolicy: + default: IfNotPresent type: string - memory: - default: 256Mi + registry: + default: docker.io + type: string + repository: + default: sebt3/dolibarr + type: string + tag: + default: 18.0.2 type: string type: object - requests: + nginx: default: - cpu: 50m - memory: 100Mi + pullPolicy: IfNotPresent + registry: docker.io + repository: nginx + tag: alpine properties: - cpu: - default: 50m + pullPolicy: + default: IfNotPresent type: string - memory: - default: 100Mi + registry: + default: docker.io + type: string + repository: + default: nginx + type: string + tag: + default: alpine type: string type: object type: object + sub-domain: + default: erp + examples: + - erp + type: string + log-level: + default: 5 + examples: + - 5 + type: integer backups: default: enable: false @@ -218,36 +235,57 @@ options: default: false type: boolean type: object - hpa: + resources: default: - avg-cpu: 50 - max-replicas: 5 - min-replicas: 1 + limits: + cpu: 200m + memory: 256Mi + requests: + cpu: 50m + memory: 100Mi examples: - - avg-cpu: 50 - max-replicas: 5 - min-replicas: 1 + - limits: + cpu: 200m + memory: 256Mi + requests: + cpu: 50m + memory: 100Mi properties: - avg-cpu: - default: 50 - type: integer - max-replicas: - default: 5 - type: integer - min-replicas: - default: 1 - type: integer + limits: + default: + cpu: 200m + memory: 256Mi + properties: + cpu: + default: 200m + type: string + memory: + default: 256Mi + type: string + type: object + requests: + default: + cpu: 50m + memory: 100Mi + properties: + cpu: + default: 50m + type: string + memory: + default: 100Mi + type: string + type: object type: object - domain: - default: your-company + parameters: + default: + MAIN_LANG_DEFAULT: auto examples: - - your-company - type: string - app-group: - default: '' - examples: - - '' - type: string + - MAIN_LANG_DEFAULT: auto + properties: + MAIN_LANG_DEFAULT: + default: auto + type: string + type: object modules: default: - societe @@ -256,6 +294,11 @@ options: items: type: string type: array + domain: + default: your-company + examples: + - your-company + type: string user-groups: default: - admin: true @@ -291,101 +334,58 @@ options: default: '14' type: string type: object - images: + storage: default: - dolibarr: - pullPolicy: IfNotPresent - registry: docker.io - repository: sebt3/dolibarr - tag: 18.0.2 - nginx: - pullPolicy: IfNotPresent - registry: docker.io - repository: nginx - tag: alpine + accessMode: ReadWriteOnce + size: 10Gi + type: Filesystem examples: - - dolibarr: - pullPolicy: IfNotPresent - registry: docker.io - repository: sebt3/dolibarr - tag: 18.0.2 - nginx: - pullPolicy: IfNotPresent - registry: docker.io - repository: nginx - tag: alpine + - accessMode: ReadWriteOnce + size: 10Gi + type: Filesystem properties: - dolibarr: - default: - pullPolicy: IfNotPresent - registry: docker.io - repository: sebt3/dolibarr - tag: 18.0.2 - properties: - pullPolicy: - default: IfNotPresent - type: string - registry: - default: docker.io - type: string - repository: - default: sebt3/dolibarr - type: string - tag: - default: 18.0.2 - type: string - type: object - nginx: - default: - pullPolicy: IfNotPresent - registry: docker.io - repository: nginx - tag: alpine - properties: - pullPolicy: - default: IfNotPresent - type: string - registry: - default: docker.io - type: string - repository: - default: nginx - type: string - tag: - default: alpine - type: string - type: object + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: + default: 10Gi + type: string + type: + default: Filesystem + enum: + - Filesystem + - block + 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 - parameters: - default: - MAIN_LANG_DEFAULT: auto - examples: - - MAIN_LANG_DEFAULT: auto - properties: - MAIN_LANG_DEFAULT: - default: auto - type: string - type: object - ingress-class: - default: traefik - examples: - - traefik - type: string - log-level: - default: 5 - examples: - - 5 - type: integer - sub-domain: - default: erp - examples: - - erp - type: string dependencies: - dist: null category: share diff --git a/apps/gitea/datas.tf b/apps/gitea/datas.tf index 19641f8..8ec7f24 100644 --- a/apps/gitea/datas.tf +++ b/apps/gitea/datas.tf @@ -47,6 +47,8 @@ data "kustomization_overlay" "data" { kind: Deployment metadata: name: gitea + annotations: + secret.reloader.stakater.com/reload: "gitea-ldap,gitea-admin-user" spec: replicas: ${var.replicas} template: diff --git a/apps/gitea/index.yaml b/apps/gitea/index.yaml index c53bdec..f037e87 100644 --- a/apps/gitea/index.yaml +++ b/apps/gitea/index.yaml @@ -9,6 +9,21 @@ metadata: A painless self-hosted Git service. Gitea is a community managed lightweight code hosting solution written in Go. It is published under the MIT license. options: + domain: + default: your-company + examples: + - your-company + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + sub-domain: + default: git + examples: + - git + type: string load-balancer: default: ip: '' @@ -19,76 +34,46 @@ options: default: '' type: string type: object - ingress-class: - default: traefik + release: + default: 8.3.0 examples: - - traefik + - 8.3.0 type: string - sub-domain: - default: git + timezone: + default: Europe/Paris examples: - - git + - Europe/Paris type: string disable-registration: default: true examples: - true type: boolean - default-branch: - default: main + push-create: + default: + org: 'true' + private: 'false' + user: 'true' examples: - - main - type: string - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - domain: - default: your-company - examples: - - your-company - type: string - app-group: - default: dev - examples: - - dev - type: string - release: - default: 8.3.0 - examples: - - 8.3.0 - type: string + - org: 'true' + private: 'false' + user: 'true' + properties: + org: + default: 'true' + type: string + private: + default: 'false' + type: string + user: + default: 'true' + type: string + type: object replicas: default: 1 examples: - 1 type: integer - ssh-port: - default: 2222 - examples: - - 2222 - type: integer - admin: - default: - email: git-admin@git.your_company.com - name: gitea_admin - examples: - - email: git-admin@git.your_company.com - name: gitea_admin - properties: - email: - default: git-admin@git.your_company.com - type: string - name: - default: gitea_admin - type: string - type: object - timezone: - default: Europe/Paris - examples: - - Europe/Paris - type: string backups: default: enable: false @@ -195,6 +180,21 @@ options: default: false type: boolean type: object + default-branch: + default: main + examples: + - main + type: string + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + app-group: + default: dev + examples: + - dev + type: string webhook: default: allowed-hosts: private @@ -210,6 +210,41 @@ options: default: false type: boolean type: object + postgres: + default: + replicas: 1 + storage: 10Gi + version: '14' + examples: + - replicas: 1 + storage: 10Gi + version: '14' + properties: + replicas: + default: 1 + type: integer + storage: + default: 10Gi + type: string + version: + default: '14' + type: string + type: object + admin: + default: + email: git-admin@git.your_company.com + name: gitea_admin + examples: + - email: git-admin@git.your_company.com + name: gitea_admin + properties: + email: + default: git-admin@git.your_company.com + type: string + name: + default: gitea_admin + type: string + type: object images: default: gitea: @@ -249,30 +284,6 @@ options: type: string type: object type: object - volume: - 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 - theme: - default: gitea-modern - examples: - - gitea-modern - type: string redis: default: exporter: @@ -306,51 +317,40 @@ options: default: 2Gi type: string type: object - push-create: - default: - org: 'true' - private: 'false' - user: 'true' + ingress-class: + default: traefik examples: - - org: 'true' - private: 'false' - user: 'true' - properties: - org: - default: 'true' - type: string - private: - default: 'false' - type: string - user: - default: 'true' - type: string - type: object - postgres: - default: - replicas: 1 - storage: 10Gi - version: '14' + - traefik + type: string + theme: + default: gitea-modern examples: - - replicas: 1 - storage: 10Gi - version: '14' + - gitea-modern + type: string + volume: + default: + accessMode: ReadWriteOnce + size: 10Gi + examples: + - accessMode: ReadWriteOnce + size: 10Gi properties: - replicas: - default: 1 - type: integer - storage: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: default: 10Gi type: string - version: - default: '14' - type: string type: object - issuer: - default: letsencrypt-prod + ssh-port: + default: 2222 examples: - - letsencrypt-prod - type: string + - 2222 + type: integer dependencies: - dist: null category: share diff --git a/apps/k8s-api/index.yaml b/apps/k8s-api/index.yaml index 66c5a8a..5775147 100644 --- a/apps/k8s-api/index.yaml +++ b/apps/k8s-api/index.yaml @@ -6,11 +6,6 @@ metadata: name: k8s-api description: Access to the kubernetes api options: - sub-domain: - default: api - examples: - - api - type: string domain-name: default: your_company.com examples: @@ -21,6 +16,11 @@ options: examples: - your-company type: string + sub-domain: + default: api + examples: + - api + type: string issuer: default: letsencrypt-prod examples: diff --git a/apps/nextcloud/apps_v1_Deployment_nextcloud-metrics.yaml b/apps/nextcloud/apps_v1_Deployment_nextcloud-metrics.yaml index 7e81ed2..3d34797 100644 --- a/apps/nextcloud/apps_v1_Deployment_nextcloud-metrics.yaml +++ b/apps/nextcloud/apps_v1_Deployment_nextcloud-metrics.yaml @@ -5,7 +5,7 @@ metadata: name: nextcloud-metrics labels: app.kubernetes.io/name: nextcloud - helm.sh/chart: nextcloud-4.3.5 + helm.sh/chart: nextcloud-4.3.6 app.kubernetes.io/instance: nextcloud app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics diff --git a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml index b268913..eb2b231 100644 --- a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml +++ b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml @@ -5,7 +5,7 @@ metadata: name: nextcloud labels: app.kubernetes.io/name: nextcloud - helm.sh/chart: nextcloud-4.3.5 + helm.sh/chart: nextcloud-4.3.6 app.kubernetes.io/instance: nextcloud app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: app @@ -31,7 +31,7 @@ spec: spec: containers: - name: nextcloud - image: nextcloud:27.1.2-apache + image: nextcloud:27.1.3-apache imagePullPolicy: IfNotPresent env: - name: POSTGRES_HOST diff --git a/apps/nextcloud/autoscaling_v1_HorizontalPodAutoscaler_nextcloud.yaml b/apps/nextcloud/autoscaling_v1_HorizontalPodAutoscaler_nextcloud.yaml index 08d6228..a9ec239 100644 --- a/apps/nextcloud/autoscaling_v1_HorizontalPodAutoscaler_nextcloud.yaml +++ b/apps/nextcloud/autoscaling_v1_HorizontalPodAutoscaler_nextcloud.yaml @@ -5,7 +5,7 @@ metadata: name: nextcloud labels: app.kubernetes.io/name: nextcloud - helm.sh/chart: nextcloud-4.3.5 + helm.sh/chart: nextcloud-4.3.6 app.kubernetes.io/instance: nextcloud app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: app diff --git a/apps/nextcloud/datas.tf b/apps/nextcloud/datas.tf index b1d1441..2726bc1 100644 --- a/apps/nextcloud/datas.tf +++ b/apps/nextcloud/datas.tf @@ -45,6 +45,8 @@ data "kustomization_overlay" "data" { kind: Deployment metadata: name: nextcloud + annotations: + secret.reloader.stakater.com/reload: "${var.instance}-${var.component}-pg-app,${var.component}-${var.instance}-id,${var.component}-${var.instance}-secret,${var.component}" spec: template: spec: @@ -148,6 +150,8 @@ data "kustomization_overlay" "data" { kind: Deployment metadata: name: nextcloud-metrics + annotations: + secret.reloader.stakater.com/reload: "nextcloud" spec: template: spec: diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml index 6df3f66..5dc7c67 100644 --- a/apps/nextcloud/index.yaml +++ b/apps/nextcloud/index.yaml @@ -6,16 +6,6 @@ metadata: name: nextcloud description: null options: - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string postgres: default: replicas: 1 @@ -36,10 +26,30 @@ options: default: '14' type: string type: object - sub-domain: - default: files + admin: + default: + name: nextcloud_admin examples: - - files + - name: nextcloud_admin + properties: + name: + default: nextcloud_admin + type: string + type: object + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + app-group: + default: '' + examples: + - '' type: string backups: default: @@ -147,96 +157,30 @@ options: default: false type: boolean type: object - apps: + storage: default: - audioplayer: false - bookmarks: false - bpm: false - calendar: false - collabora: false - contacts: false - deck: false - groupfolders: true - mindmap: false - music: false - notes: false - onlyoffice: false - passman: false - spreed: false - tables: false - tasks: false - texteditor: true + accessMode: ReadWriteOnce + size: 10Gi examples: - - audioplayer: false - bookmarks: false - bpm: false - calendar: false - collabora: false - contacts: false - deck: false - groupfolders: true - mindmap: false - music: false - notes: false - onlyoffice: false - passman: false - spreed: false - tables: false - tasks: false - texteditor: true + - accessMode: ReadWriteOnce + size: 10Gi properties: - audioplayer: - default: false - type: boolean - bookmarks: - default: false - type: boolean - bpm: - default: false - type: boolean - calendar: - default: false - type: boolean - collabora: - default: false - type: boolean - contacts: - default: false - type: boolean - deck: - default: false - type: boolean - groupfolders: - default: true - type: boolean - mindmap: - default: false - type: boolean - music: - default: false - type: boolean - notes: - default: false - type: boolean - onlyoffice: - default: false - type: boolean - passman: - default: false - type: boolean - spreed: - default: false - type: boolean - tables: - default: false - type: boolean - tasks: - default: false - type: boolean - texteditor: - default: true - type: boolean + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: + default: 10Gi + type: string type: object + sub-domain: + default: files + examples: + - files + type: string ingress-class: default: traefik examples: @@ -262,49 +206,11 @@ options: 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.12 - storage: 2Gi - examples: - - exporter: - enabled: true - image: quay.io/opstree/redis-exporter:v1.44.0 - image: quay.io/opstree/redis:v7.0.12 - 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.12 - type: string - storage: - default: 2Gi - type: string - type: object domain: default: your-company examples: - your-company type: string - openid-name: - default: vynil - examples: - - vynil - type: string images: default: collabora: @@ -468,40 +374,134 @@ options: type: string type: object type: object - admin: - default: - name: nextcloud_admin + openid-name: + default: vynil examples: - - name: nextcloud_admin - properties: - name: - default: nextcloud_admin - 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 - app-group: - default: '' - examples: - - '' + - vynil type: string + redis: + default: + exporter: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + image: quay.io/opstree/redis:v7.0.12 + storage: 2Gi + examples: + - exporter: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + image: quay.io/opstree/redis:v7.0.12 + 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.12 + type: string + storage: + default: 2Gi + type: string + type: object + apps: + default: + audioplayer: false + bookmarks: false + bpm: false + calendar: false + collabora: false + contacts: false + deck: false + groupfolders: true + mindmap: false + music: false + notes: false + onlyoffice: false + passman: false + spreed: false + tables: false + tasks: false + texteditor: true + examples: + - audioplayer: false + bookmarks: false + bpm: false + calendar: false + collabora: false + contacts: false + deck: false + groupfolders: true + mindmap: false + music: false + notes: false + onlyoffice: false + passman: false + spreed: false + tables: false + tasks: false + texteditor: true + properties: + audioplayer: + default: false + type: boolean + bookmarks: + default: false + type: boolean + bpm: + default: false + type: boolean + calendar: + default: false + type: boolean + collabora: + default: false + type: boolean + contacts: + default: false + type: boolean + deck: + default: false + type: boolean + groupfolders: + default: true + type: boolean + mindmap: + default: false + type: boolean + music: + default: false + type: boolean + notes: + default: false + type: boolean + onlyoffice: + default: false + type: boolean + passman: + default: false + type: boolean + spreed: + default: false + type: boolean + tables: + default: false + type: boolean + tasks: + default: false + type: boolean + texteditor: + default: true + type: boolean + type: object dependencies: - dist: null category: share diff --git a/apps/nextcloud/monitoring.coreos.com_v1_ServiceMonitor_nextcloud.yaml b/apps/nextcloud/monitoring.coreos.com_v1_ServiceMonitor_nextcloud.yaml index f0b51a4..42a8411 100644 --- a/apps/nextcloud/monitoring.coreos.com_v1_ServiceMonitor_nextcloud.yaml +++ b/apps/nextcloud/monitoring.coreos.com_v1_ServiceMonitor_nextcloud.yaml @@ -6,7 +6,7 @@ metadata: namespace: "vynil-cloud" labels: app.kubernetes.io/name: nextcloud - helm.sh/chart: nextcloud-4.3.5 + helm.sh/chart: nextcloud-4.3.6 app.kubernetes.io/instance: nextcloud app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics diff --git a/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml b/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml index ca0ea82..6a14f7a 100644 --- a/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml +++ b/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml @@ -5,7 +5,7 @@ metadata: name: nextcloud-config labels: app.kubernetes.io/name: nextcloud - helm.sh/chart: nextcloud-4.3.5 + helm.sh/chart: nextcloud-4.3.6 app.kubernetes.io/instance: nextcloud app.kubernetes.io/managed-by: Helm data: diff --git a/apps/nextcloud/v1_ConfigMap_nextcloud-nginxconfig.yaml b/apps/nextcloud/v1_ConfigMap_nextcloud-nginxconfig.yaml index df16dd4..6db28d3 100644 --- a/apps/nextcloud/v1_ConfigMap_nextcloud-nginxconfig.yaml +++ b/apps/nextcloud/v1_ConfigMap_nextcloud-nginxconfig.yaml @@ -5,7 +5,7 @@ metadata: name: nextcloud-nginxconfig labels: app.kubernetes.io/name: nextcloud - helm.sh/chart: nextcloud-4.3.5 + helm.sh/chart: nextcloud-4.3.6 app.kubernetes.io/instance: nextcloud app.kubernetes.io/managed-by: Helm data: diff --git a/apps/nextcloud/v1_PersistentVolumeClaim_nextcloud-nextcloud.yaml b/apps/nextcloud/v1_PersistentVolumeClaim_nextcloud-nextcloud.yaml index a68775b..f4e783a 100644 --- a/apps/nextcloud/v1_PersistentVolumeClaim_nextcloud-nextcloud.yaml +++ b/apps/nextcloud/v1_PersistentVolumeClaim_nextcloud-nextcloud.yaml @@ -5,7 +5,7 @@ metadata: name: nextcloud-nextcloud labels: app.kubernetes.io/name: nextcloud - helm.sh/chart: nextcloud-4.3.5 + helm.sh/chart: nextcloud-4.3.6 app.kubernetes.io/instance: nextcloud app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: app diff --git a/apps/nextcloud/v1_Service_nextcloud-metrics.yaml b/apps/nextcloud/v1_Service_nextcloud-metrics.yaml index cddff8b..d79f28f 100644 --- a/apps/nextcloud/v1_Service_nextcloud-metrics.yaml +++ b/apps/nextcloud/v1_Service_nextcloud-metrics.yaml @@ -5,7 +5,7 @@ metadata: name: nextcloud-metrics labels: app.kubernetes.io/name: nextcloud - helm.sh/chart: nextcloud-4.3.5 + helm.sh/chart: nextcloud-4.3.6 app.kubernetes.io/instance: nextcloud app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics diff --git a/apps/nextcloud/v1_Service_nextcloud.yaml b/apps/nextcloud/v1_Service_nextcloud.yaml index 4e78856..2eb339f 100644 --- a/apps/nextcloud/v1_Service_nextcloud.yaml +++ b/apps/nextcloud/v1_Service_nextcloud.yaml @@ -5,7 +5,7 @@ metadata: name: nextcloud labels: app.kubernetes.io/name: nextcloud - helm.sh/chart: nextcloud-4.3.5 + helm.sh/chart: nextcloud-4.3.6 app.kubernetes.io/instance: nextcloud app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: app diff --git a/apps/okd/index.yaml b/apps/okd/index.yaml index f62db1e..7c9ca26 100644 --- a/apps/okd/index.yaml +++ b/apps/okd/index.yaml @@ -11,30 +11,15 @@ options: examples: - okd type: string - domain: - default: your-company - examples: - - your-company - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string ingress-class: default: traefik examples: - traefik type: string - app-group: - default: infra + domain: + default: your-company examples: - - infra - type: string - domain-name: - default: your_company.com - examples: - - your_company.com + - your-company type: string namespaces: default: [] @@ -84,11 +69,26 @@ options: type: string type: object type: object + domain-name: + default: your_company.com + examples: + - your_company.com + type: string cluster-admin: default: false examples: - false type: boolean + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + app-group: + default: infra + examples: + - infra + type: string dependencies: - dist: null category: share diff --git a/apps/traefik-ui/index.yaml b/apps/traefik-ui/index.yaml index 2f8bfde..75fba7f 100644 --- a/apps/traefik-ui/index.yaml +++ b/apps/traefik-ui/index.yaml @@ -6,6 +6,16 @@ metadata: name: traefik-ui description: Access to the Traefik UI options: + ingress-class: + default: traefik + examples: + - traefik + type: string + app-group: + default: infra + examples: + - infra + type: string domain-name: default: your_company.com examples: @@ -16,21 +26,11 @@ options: examples: - traefik type: string - ingress-class: - default: traefik - examples: - - traefik - type: string domain: default: your-company examples: - your-company type: string - app-group: - default: infra - examples: - - infra - type: string issuer: default: letsencrypt-prod examples: diff --git a/apps/woodpecker/index.yaml b/apps/woodpecker/index.yaml index d339229..11e2c93 100644 --- a/apps/woodpecker/index.yaml +++ b/apps/woodpecker/index.yaml @@ -6,60 +6,34 @@ metadata: name: woodpecker description: null options: - domain: - default: your-company - examples: - - your-company - type: string - app-group: - default: dev - examples: - - dev - type: string sub-domain: default: ci examples: - ci type: string - storage-agent: + storage-server: default: + accessMode: ReadWriteOnce size: 10Gi - storageClass: '' - writeMany: 'false' examples: - - size: 10Gi - storageClass: '' - writeMany: 'false' + - accessMode: ReadWriteOnce + size: 10Gi properties: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string size: default: 10Gi type: string - storageClass: - default: '' - type: string - writeMany: - default: 'false' - type: string type: object - timeouts: - default: - default: '60' - max: '120' + admin-users: + default: woodpecker,admin examples: - - default: '60' - max: '120' - properties: - default: - default: '60' - type: string - max: - default: '120' - type: string - type: object - domain-name: - default: your_company.com - examples: - - your_company.com + - woodpecker,admin type: string images: default: @@ -158,40 +132,66 @@ options: type: string type: object type: object - storage-server: - 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 - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string ingress-class: default: traefik examples: - traefik type: string - admin-users: - default: woodpecker,admin + domain-name: + default: your_company.com examples: - - woodpecker,admin + - your_company.com type: string + domain: + default: your-company + examples: + - your-company + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + app-group: + default: dev + examples: + - dev + type: string + storage-agent: + default: + size: 10Gi + storageClass: '' + writeMany: 'false' + examples: + - size: 10Gi + storageClass: '' + writeMany: 'false' + properties: + size: + default: 10Gi + type: string + storageClass: + default: '' + type: string + writeMany: + default: 'false' + type: string + type: object + timeouts: + default: + default: '60' + max: '120' + examples: + - default: '60' + max: '120' + properties: + default: + default: '60' + type: string + max: + default: '120' + type: string + type: object dependencies: - dist: null category: apps diff --git a/share/division/index.yaml b/share/division/index.yaml index 4943e88..6c38be2 100644 --- a/share/division/index.yaml +++ b/share/division/index.yaml @@ -6,20 +6,6 @@ metadata: name: division description: null options: - apps: - default: [] - items: - type: string - type: array - parent: - default: employes - enum: - - employes - - clients - - fournisseurs - examples: - - employes - type: string domain: default: your-company examples: @@ -39,6 +25,20 @@ options: type: string type: object type: array + apps: + default: [] + items: + type: string + type: array + parent: + default: employes + enum: + - employes + - clients + - fournisseurs + examples: + - employes + type: string dependencies: - dist: null category: share diff --git a/share/organisation/gitea-user.tf b/share/organisation/gitea-user.tf index 481a22c..50d4fec 100644 --- a/share/organisation/gitea-user.tf +++ b/share/organisation/gitea-user.tf @@ -34,7 +34,7 @@ resource "null_resource" "get_known" { data "local_file" "known_host" { count = local.needUser?1:0 filename = "${path.module}/known_host.txt" - depends_on = ["null_resource.get_known"] + depends_on = [null_resource.get_known] } resource "kubectl_manifest" "ssh-creds" { @@ -48,7 +48,7 @@ resource "kubectl_manifest" "ssh-creds" { namespace: "${local.sorted-stages[count.index].namespace}" labels: ${jsonencode(local.common-labels)} spec: - length: "40" + length: "2048" forceRegenerate: false data: known_hosts: "${data.local_file.known_host[0].content}" diff --git a/share/organisation/index.yaml b/share/organisation/index.yaml index d201bc6..1ef47c2 100644 --- a/share/organisation/index.yaml +++ b/share/organisation/index.yaml @@ -6,36 +6,11 @@ metadata: name: organisation description: null options: - domain-name: - default: your_company.com + domain: + default: your-company examples: - - your_company.com + - your-company type: string - app-group: - default: dev - examples: - - dev - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - distributions: - default: - core: core - domain: domain - examples: - - core: core - domain: domain - properties: - core: - default: core - type: string - domain: - default: domain - type: string - type: object backups: default: enable: false @@ -71,16 +46,6 @@ options: examples: - traefik type: string - domain: - default: your-company - examples: - - your-company - type: string - haveGitea: - default: false - examples: - - false - type: boolean datasets: default: [] items: @@ -93,6 +58,26 @@ options: type: string type: object type: array + haveGitea: + default: false + examples: + - false + type: boolean + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + app-group: + default: dev + examples: + - dev + type: string stages: default: [] items: @@ -102,6 +87,21 @@ options: type: string type: object type: array + distributions: + default: + core: core + domain: domain + examples: + - core: core + domain: domain + properties: + core: + default: core + type: string + domain: + default: domain + type: string + type: object dependencies: [] providers: kubernetes: true