From 24f6e33d2196ec8bed80e2386493d46d065e8892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Fri, 26 Jan 2024 08:59:45 +0100 Subject: [PATCH] fix --- apps/dolibarr/redis.tf | 2 +- apps/gitea/redis.tf | 2 +- apps/nextcloud/redis.tf | 2 +- share/authentik/index.yaml | 202 +++++++++++++++++----------------- share/authentik/postgresql.tf | 2 +- share/authentik/redis.tf | 2 +- share/wildduck/redis.tf | 2 +- 7 files changed, 107 insertions(+), 107 deletions(-) diff --git a/apps/dolibarr/redis.tf b/apps/dolibarr/redis.tf index aed4e8f..eb4ce4b 100644 --- a/apps/dolibarr/redis.tf +++ b/apps/dolibarr/redis.tf @@ -21,7 +21,7 @@ resource "kubectl_manifest" "dolibarr_redis" { accessModes: ["ReadWriteOnce"] resources: requests: - storage: "${var.storage.redis}" + storage: "${var.storage.redis.size}" redisExporter: enabled: ${var.redis.exporter.enabled} image: "${var.images.redis_exporter.registry}/${var.images.redis_exporter.repository}:${var.images.redis_exporter.tag}" diff --git a/apps/gitea/redis.tf b/apps/gitea/redis.tf index df28165..b78a033 100644 --- a/apps/gitea/redis.tf +++ b/apps/gitea/redis.tf @@ -21,7 +21,7 @@ resource "kubectl_manifest" "prj_redis" { accessModes: ["ReadWriteOnce"] resources: requests: - storage: "${var.storage.redis}" + storage: "${var.storage.redis.size}" redisExporter: enabled: ${var.redis.exporter.enabled} image: "${var.images.redis_exporter.registry}/${var.images.redis_exporter.repository}:${var.images.redis_exporter.tag}" diff --git a/apps/nextcloud/redis.tf b/apps/nextcloud/redis.tf index df28165..b78a033 100644 --- a/apps/nextcloud/redis.tf +++ b/apps/nextcloud/redis.tf @@ -21,7 +21,7 @@ resource "kubectl_manifest" "prj_redis" { accessModes: ["ReadWriteOnce"] resources: requests: - storage: "${var.storage.redis}" + storage: "${var.storage.redis.size}" redisExporter: enabled: ${var.redis.exporter.enabled} image: "${var.images.redis_exporter.registry}/${var.images.redis_exporter.repository}:${var.images.redis_exporter.tag}" diff --git a/share/authentik/index.yaml b/share/authentik/index.yaml index f49e196..8466292 100644 --- a/share/authentik/index.yaml +++ b/share/authentik/index.yaml @@ -6,6 +6,62 @@ metadata: name: authentik description: authentik is an open-source Identity Provider focused on flexibility and versatility options: + redis: + default: + exporter: + enabled: true + examples: + - exporter: + enabled: true + properties: + exporter: + default: + enabled: true + properties: + enabled: + default: true + type: boolean + type: object + type: object + postgres: + default: + replicas: 1 + examples: + - replicas: 1 + properties: + replicas: + default: 1 + type: integer + type: object + storage: + default: + postgres: + size: 8Gi + redis: + size: 8Gi + examples: + - postgres: + size: 8Gi + redis: + size: 8Gi + properties: + postgres: + default: + size: 8Gi + properties: + size: + default: 8Gi + type: string + type: object + redis: + default: + size: 8Gi + properties: + size: + default: 8Gi + type: string + type: object + type: object images: default: app: @@ -143,90 +199,11 @@ options: type: string type: object type: object - sub_domain: - default: auth - examples: - - auth - type: string - domain: - default: your-company - examples: - - your-company - type: string - domain_name: - default: your_company.com - examples: - - your_company.com - type: string - email: - default: - port: 587 - timeout: 30 - use_ssl: false - use_tls: false - examples: - - port: 587 - timeout: 30 - use_ssl: false - use_tls: false - properties: - port: - default: 587 - type: integer - timeout: - default: 30 - type: integer - use_ssl: - default: false - type: boolean - use_tls: - default: false - type: boolean - type: object loglevel: default: info examples: - info type: string - postgres: - default: - replicas: 1 - examples: - - replicas: 1 - properties: - replicas: - default: 1 - type: integer - type: object - storage: - default: - postgres: - size: 8Gi - redis: - size: 8Gi - examples: - - postgres: - size: 8Gi - redis: - size: 8Gi - properties: - postgres: - default: - size: 8Gi - properties: - size: - default: 8Gi - type: string - type: object - redis: - default: - size: 8Gi - properties: - size: - default: 8Gi - type: string - type: object - type: object error_reporting: default: enabled: false @@ -247,23 +224,11 @@ options: default: false type: boolean type: object - redis: - default: - exporter: - enabled: true + geoip: + default: /geoip/GeoLite2-City.mmdb examples: - - exporter: - enabled: true - properties: - exporter: - default: - enabled: true - properties: - enabled: - default: true - type: boolean - type: object - type: object + - /geoip/GeoLite2-City.mmdb + type: string backups: default: enable: false @@ -323,6 +288,41 @@ options: default: false type: boolean type: object + domain_name: + default: your_company.com + examples: + - your_company.com + type: string + ingress_class: + default: traefik + examples: + - traefik + type: string + email: + default: + port: 587 + timeout: 30 + use_ssl: false + use_tls: false + examples: + - port: 587 + timeout: 30 + use_ssl: false + use_tls: false + properties: + port: + default: 587 + type: integer + timeout: + default: 30 + type: integer + use_ssl: + default: false + type: boolean + use_tls: + default: false + type: boolean + type: object issuer: default: letsencrypt-prod examples: @@ -338,15 +338,15 @@ options: default: auth-admin type: string type: object - ingress_class: - default: traefik + domain: + default: your-company examples: - - traefik + - your-company type: string - geoip: - default: /geoip/GeoLite2-City.mmdb + sub_domain: + default: auth examples: - - /geoip/GeoLite2-City.mmdb + - auth type: string dependencies: - dist: null diff --git a/share/authentik/postgresql.tf b/share/authentik/postgresql.tf index a9db962..153c1ec 100644 --- a/share/authentik/postgresql.tf +++ b/share/authentik/postgresql.tf @@ -22,7 +22,7 @@ resource "kubectl_manifest" "prj_pg" { instances: ${var.postgres.replicas} imageName: "${var.images.postgresql.registry}/${var.images.postgresql.repository}:${var.images.postgresql.tag}" storage: - size: "${var.storage.postgres}" + size: "${var.storage.postgres.size}" bootstrap: initdb: database: "${var.component}" diff --git a/share/authentik/redis.tf b/share/authentik/redis.tf index 5ee06ef..82cf75a 100644 --- a/share/authentik/redis.tf +++ b/share/authentik/redis.tf @@ -19,7 +19,7 @@ resource "kubectl_manifest" "authentik_redis" { accessModes: ["ReadWriteOnce"] resources: requests: - storage: "${var.storage.redis}" + storage: "${var.storage.redis.size}" redisExporter: enabled: ${var.redis.exporter.enabled} image: "${var.images.redis_exporter.registry}/${var.images.redis_exporter.repository}:${var.images.redis_exporter.tag}" diff --git a/share/wildduck/redis.tf b/share/wildduck/redis.tf index df28165..b78a033 100644 --- a/share/wildduck/redis.tf +++ b/share/wildduck/redis.tf @@ -21,7 +21,7 @@ resource "kubectl_manifest" "prj_redis" { accessModes: ["ReadWriteOnce"] resources: requests: - storage: "${var.storage.redis}" + storage: "${var.storage.redis.size}" redisExporter: enabled: ${var.redis.exporter.enabled} image: "${var.images.redis_exporter.registry}/${var.images.redis_exporter.repository}:${var.images.redis_exporter.tag}"