From 61514824a111ccc53cf81f684e40d4febc5ebea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Sun, 4 Feb 2024 11:24:31 +0100 Subject: [PATCH] fix --- apps/code-server/deploy.tf | 2 +- apps/code-server/index.yaml | 8 +- apps/dbgate/deploy.tf | 2 +- apps/dbgate/index.yaml | 305 +++++++++++----------- apps/dbgate/presentation.tf | 19 +- apps/dolibarr/deploy.tf | 8 +- apps/dolibarr/index.yaml | 32 +-- apps/dolibarr/redis.tf | 2 +- apps/gitea/datas.tf | 2 +- apps/gitea/index.yaml | 362 +++++++++++++------------- apps/gitea/redis.tf | 2 +- apps/gramo/deploy.tf | 2 +- apps/gramo/index.yaml | 8 +- apps/infisical/configs.tf | 1 + apps/infisical/deploy.tf | 12 +- apps/infisical/index.yaml | 89 ++++--- apps/infisical/presentation.tf | 2 +- apps/infisical/secret.tf | 2 + apps/infisical/storage.tf | 1 + apps/nextcloud/collabora.tf | 2 +- apps/nextcloud/datas.tf | 6 +- apps/nextcloud/index.yaml | 56 ++-- apps/nextcloud/onlyoffice.tf | 2 +- apps/nextcloud/redis.tf | 2 +- apps/okd/deploy.tf | 2 +- apps/okd/index.yaml | 8 +- apps/sonar/index.yaml | 8 +- apps/woodpecker/datas.tf | 4 +- apps/woodpecker/index.yaml | 16 +- meta/domain-devspaces/index.yaml | 8 +- monitor/alertmanager/index.yaml | 8 +- monitor/grafana/index.yaml | 16 +- monitor/kube-state-metrics/index.yaml | 8 +- monitor/loki-dashboard/index.yaml | 8 +- monitor/loki/datas.tf | 2 +- monitor/loki/index.yaml | 8 +- monitor/node-exporter/index.yaml | 8 +- monitor/prometheus/index.yaml | 8 +- monitor/promtail/index.yaml | 8 +- share/authentik/datas.tf | 4 +- share/authentik/index.yaml | 24 +- share/authentik/redis.tf | 2 +- share/dataset-maria/index.yaml | 8 +- share/dataset-maria/mariadb.tf | 2 +- share/dataset-mongo/index.yaml | 6 +- share/dataset-mongo/mongo.tf | 2 +- share/dataset-pg/directus.tf | 2 +- share/dataset-pg/index.yaml | 30 +-- share/dataset-pg/postgrest.tf | 4 +- share/dataset-rabbit/index.yaml | 8 +- share/dataset-redis/index.yaml | 8 +- share/dataset-redis/redis.tf | 2 +- share/dns/datas.tf | 2 +- share/dns/index.yaml | 6 +- share/wildduck/haraka.tf | 2 +- share/wildduck/index.yaml | 64 ++--- share/wildduck/mongo.tf | 2 +- share/wildduck/redis.tf | 2 +- share/wildduck/rspamd.tf | 2 +- share/wildduck/scimgateway.tf | 2 +- share/wildduck/webmail.tf | 2 +- share/wildduck/wildduck.tf | 2 +- share/wildduck/zonemta.tf | 2 +- 63 files changed, 630 insertions(+), 609 deletions(-) diff --git a/apps/code-server/deploy.tf b/apps/code-server/deploy.tf index c95f6f9..6895fda 100644 --- a/apps/code-server/deploy.tf +++ b/apps/code-server/deploy.tf @@ -56,7 +56,7 @@ resource "kubectl_manifest" "deploy" { - name: CODE_SERVER_CONFIG value: /etc/code-server/config.yml image: "${var.images.codeserver.registry}/${var.images.codeserver.repository}:${var.images.codeserver.tag}" - imagePullPolicy: "${var.images.codeserver.pullPolicy}" + imagePullPolicy: "${var.images.codeserver.pull_policy}" ports: - containerPort: 8080 name: http diff --git a/apps/code-server/index.yaml b/apps/code-server/index.yaml index da70368..8265b79 100644 --- a/apps/code-server/index.yaml +++ b/apps/code-server/index.yaml @@ -87,25 +87,25 @@ options: images: default: codeserver: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/code-server tag: 4.18 examples: - codeserver: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/code-server tag: 4.18 properties: codeserver: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/code-server tag: 4.18 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/apps/dbgate/deploy.tf b/apps/dbgate/deploy.tf index 6c8944b..c835efe 100644 --- a/apps/dbgate/deploy.tf +++ b/apps/dbgate/deploy.tf @@ -58,7 +58,7 @@ resource "kubectl_manifest" "deploy" { name: "${var.component}-${var.instance}" env: ${jsonencode(local.deploy-envs)} image: "${var.images.dbgate.registry}/${var.images.dbgate.repository}:${var.images.dbgate.tag}" - imagePullPolicy: "${var.images.dbgate.pullPolicy}" + imagePullPolicy: "${var.images.dbgate.pull_policy}" ports: - containerPort: 3000 name: http diff --git a/apps/dbgate/index.yaml b/apps/dbgate/index.yaml index 9a745ea..34e9921 100644 --- a/apps/dbgate/index.yaml +++ b/apps/dbgate/index.yaml @@ -6,6 +6,156 @@ metadata: name: dbgate description: null options: + app_group: + default: dev + examples: + - dev + type: string + ingress_class: + default: traefik + examples: + - traefik + type: string + images: + default: + dbgate: + pull_policy: IfNotPresent + registry: docker.io + repository: dbgate/dbgate + tag: 5.2.7-alpine + examples: + - dbgate: + pull_policy: IfNotPresent + registry: docker.io + repository: dbgate/dbgate + tag: 5.2.7-alpine + properties: + dbgate: + default: + pull_policy: IfNotPresent + registry: docker.io + repository: dbgate/dbgate + tag: 5.2.7-alpine + properties: + pull_policy: + default: IfNotPresent + enum: + - Always + - Never + - IfNotPresent + type: string + registry: + default: docker.io + type: string + repository: + default: dbgate/dbgate + type: string + tag: + default: 5.2.7-alpine + type: string + type: object + type: object + domain: + default: your-company + examples: + - your-company + type: string + pg: + 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 + storage: + default: + volume: + accessMode: ReadWriteOnce + class: '' + size: 1Gi + type: Filesystem + description: Configure this app storage + examples: + - volume: + accessMode: ReadWriteOnce + class: '' + size: 1Gi + type: Filesystem + properties: + volume: + default: + accessMode: ReadWriteOnce + class: '' + size: 1Gi + type: Filesystem + properties: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + class: + default: '' + type: string + size: + default: 1Gi + type: string + type: + default: Filesystem + enum: + - Filesystem + - Block + type: string + type: object + type: object + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + sub_domain: + default: dbgate + examples: + - dbgate + type: string + redis: + default: [] + examples: + - [] + items: + properties: + name: + default: '' + type: string + namespace: + default: '' + type: string + type: object + type: array maria: default: [] examples: @@ -64,156 +214,6 @@ options: type: string type: object type: array - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - ingress_class: - default: traefik - examples: - - traefik - type: string - 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 - pg: - 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 - sub_domain: - default: dbgate - examples: - - dbgate - type: string - images: - default: - dbgate: - pullPolicy: IfNotPresent - registry: docker.io - repository: dbgate/dbgate - tag: 5.2.7-alpine - examples: - - dbgate: - pullPolicy: IfNotPresent - registry: docker.io - repository: dbgate/dbgate - tag: 5.2.7-alpine - properties: - dbgate: - default: - pullPolicy: IfNotPresent - registry: docker.io - repository: dbgate/dbgate - tag: 5.2.7-alpine - properties: - pullPolicy: - default: IfNotPresent - enum: - - Always - - Never - - IfNotPresent - type: string - registry: - default: docker.io - type: string - repository: - default: dbgate/dbgate - type: string - tag: - default: 5.2.7-alpine - type: string - type: object - type: object - storage: - default: - volume: - accessMode: ReadWriteOnce - class: '' - size: 1Gi - type: Filesystem - description: Configure this app storage - examples: - - volume: - accessMode: ReadWriteOnce - class: '' - size: 1Gi - type: Filesystem - properties: - volume: - default: - accessMode: ReadWriteOnce - class: '' - size: 1Gi - type: Filesystem - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - class: - default: '' - type: string - size: - default: 1Gi - type: string - type: - default: Filesystem - enum: - - Filesystem - - Block - type: string - type: object - type: object - app_group: - default: dev - examples: - - dev - type: string domain_name: default: your_company.com examples: @@ -228,7 +228,8 @@ providers: authentik: true kubectl: true postgresql: null - restapi: true - http: true + mysql: null + restapi: null + http: null gitea: null tfaddtype: null diff --git a/apps/dbgate/presentation.tf b/apps/dbgate/presentation.tf index 6fea6bd..6bd0714 100644 --- a/apps/dbgate/presentation.tf +++ b/apps/dbgate/presentation.tf @@ -7,12 +7,6 @@ locals { "Content-Type" = "application/json" Authorization = "Bearer ${data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]}" } - service = { - "name" = "${var.component}-${var.instance}" - "port" = { - "number" = 80 - } - } } module "service" { @@ -22,7 +16,6 @@ module "service" { namespace = var.namespace labels = local.common-labels targets = ["http"] - ports = [local.service.port.number] providers = { kubectl = kubectl } @@ -38,7 +31,7 @@ module "ingress" { labels = local.common-labels dns_names = local.dns_names middlewares = [] - services = [local.service] + services = [module.service.default_definition] providers = { kubectl = kubectl } @@ -72,13 +65,3 @@ module "oauth2" { authentik = authentik } } - -provider "restapi" { - uri = "http://authentik.${var.domain}-auth.svc/api/v3/" - headers = local.request_headers - create_method = "PATCH" - update_method = "PATCH" - destroy_method = "PATCH" - write_returns_object = true - id_attribute = "name" -} diff --git a/apps/dolibarr/deploy.tf b/apps/dolibarr/deploy.tf index c5f9082..ae705c3 100644 --- a/apps/dolibarr/deploy.tf +++ b/apps/dolibarr/deploy.tf @@ -77,7 +77,7 @@ spec: - echo - SUCCESS image: "${var.images.dolibarr.registry}/${var.images.dolibarr.repository}:${var.images.dolibarr.tag}" - imagePullPolicy: "${var.images.dolibarr.pullPolicy}" + imagePullPolicy: "${var.images.dolibarr.pull_policy}" volumeMounts: - name: shared-files mountPath: /var/www/ @@ -109,7 +109,7 @@ spec: command: - "/usr/local/sbin/php-fpm" image: "${var.images.dolibarr.registry}/${var.images.dolibarr.repository}:${var.images.dolibarr.tag}" - imagePullPolicy: "${var.images.dolibarr.pullPolicy}" + imagePullPolicy: "${var.images.dolibarr.pull_policy}" resources: ${jsonencode(var.resources)} readinessProbe: httpGet: @@ -160,13 +160,13 @@ spec: - "-f" - "/var/logs/dolibarr.log" image: "${var.images.dolibarr.registry}/${var.images.dolibarr.repository}:${var.images.dolibarr.tag}" - imagePullPolicy: "${var.images.dolibarr.pullPolicy}" + imagePullPolicy: "${var.images.dolibarr.pull_policy}" volumeMounts: - name: shared-logs mountPath: /var/logs/ - name: nginx image: "${var.images.nginx.registry}/${var.images.nginx.repository}:${var.images.nginx.tag}" - imagePullPolicy: "${var.images.nginx.pullPolicy}" + imagePullPolicy: "${var.images.nginx.pull_policy}" securityContext: runAsNonRoot: true readOnlyRootFilesystem: true diff --git a/apps/dolibarr/index.yaml b/apps/dolibarr/index.yaml index 48cc445..1e6fcd9 100644 --- a/apps/dolibarr/index.yaml +++ b/apps/dolibarr/index.yaml @@ -9,12 +9,12 @@ options: images: default: dolibarr: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/dolibarr tag: 18.0.2 nginx: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: nginx tag: alpine @@ -23,23 +23,23 @@ options: repository: cloudnative-pg/postgresql tag: 15.3 redis: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 redis_exporter: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 examples: - dolibarr: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/dolibarr tag: 18.0.2 nginx: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: nginx tag: alpine @@ -48,24 +48,24 @@ options: repository: cloudnative-pg/postgresql tag: 15.3 redis: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 redis_exporter: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 properties: dolibarr: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/dolibarr tag: 18.0.2 properties: - pullPolicy: + pull_policy: default: IfNotPresent type: string registry: @@ -80,12 +80,12 @@ options: type: object nginx: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: nginx tag: alpine properties: - pullPolicy: + pull_policy: default: IfNotPresent type: string registry: @@ -116,12 +116,12 @@ options: type: object redis: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 properties: - pullPolicy: + pull_policy: default: IfNotPresent type: string registry: @@ -136,12 +136,12 @@ options: type: object redis_exporter: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 properties: - pullPolicy: + pull_policy: default: IfNotPresent type: string registry: diff --git a/apps/dolibarr/redis.tf b/apps/dolibarr/redis.tf index e0959b7..22a400e 100644 --- a/apps/dolibarr/redis.tf +++ b/apps/dolibarr/redis.tf @@ -14,7 +14,7 @@ resource "kubectl_manifest" "dolibarr_redis" { spec: kubernetesConfig: image: "${var.images.redis.registry}/${var.images.redis.repository}:${var.images.redis.tag}" - imagePullPolicy: "${var.images.redis.pullPolicy}" + imagePullPolicy: "${var.images.redis.pull_policy}" storage: volumeClaimTemplate: spec: diff --git a/apps/gitea/datas.tf b/apps/gitea/datas.tf index 23db30d..c2a687e 100644 --- a/apps/gitea/datas.tf +++ b/apps/gitea/datas.tf @@ -101,7 +101,7 @@ data "kustomization_overlay" "data" { initContainers: - name: init-directories image: "${var.images.gitea.registry}/${var.images.gitea.repository}:${var.images.gitea.tag}" - imagePullPolicy: "${var.images.gitea.pullPolicy}" + imagePullPolicy: "${var.images.gitea.pull_policy}" - name: init-app-ini image: "${var.images.gitea.registry}/${var.images.gitea.repository}:${var.images.gitea.tag}" imagePullPolicy: IfNotPresent diff --git a/apps/gitea/index.yaml b/apps/gitea/index.yaml index 8f3de2b..118c7a2 100644 --- a/apps/gitea/index.yaml +++ b/apps/gitea/index.yaml @@ -9,101 +9,29 @@ 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: - theme: - default: gitea-modern + ingress_class: + default: traefik examples: - - gitea-modern + - traefik type: string - storage: + push-create: default: - postgres: - size: 10Gi - redis: - size: 2Gi - volume: - accessMode: ReadWriteOnce - class: '' - size: 10Gi - type: Filesystem - description: Configure this app storage + org: 'true' + private: 'false' + user: 'true' examples: - - postgres: - size: 10Gi - redis: - size: 2Gi - volume: - accessMode: ReadWriteOnce - class: '' - size: 10Gi - type: Filesystem + - org: 'true' + private: 'false' + user: 'true' properties: - postgres: - default: - size: 10Gi - properties: - size: - default: 10Gi - type: string - type: object - redis: - default: - size: 2Gi - properties: - size: - default: 2Gi - type: string - type: object - volume: - default: - accessMode: ReadWriteOnce - class: '' - size: 10Gi - type: Filesystem - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - class: - default: '' - type: string - size: - default: 10Gi - type: string - type: - default: Filesystem - enum: - - Filesystem - - Block - type: string - type: object - type: object - domain_name: - default: your_company.com - examples: - - your_company.com - type: string - domain: - default: your-company - examples: - - your-company - type: string - 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 + org: + default: 'true' type: string - name: - default: gitea_admin + private: + default: 'false' + type: string + user: + default: 'true' type: string type: object disable-registration: @@ -111,11 +39,6 @@ options: examples: - true type: boolean - replicas: - default: 1 - examples: - - 1 - type: integer redis: default: exporter: @@ -133,46 +56,46 @@ options: type: boolean type: object type: object - sub_domain: - default: git + default-branch: + default: main examples: - - git + - main type: string - timezone: - default: Europe/Paris - examples: - - Europe/Paris - type: string - postgres: - default: - replicas: 1 - examples: - - replicas: 1 - properties: - replicas: - default: 1 - type: integer - type: object - ssh-sub_domain: - default: git - examples: - - git - type: string - ingress_class: - default: traefik - examples: - - traefik - type: string - ssh-port: - default: 2222 - examples: - - 2222 - type: integer issuer: default: letsencrypt-prod examples: - letsencrypt-prod type: string + 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 + release: + default: 8.3.0 + examples: + - 8.3.0 + type: string + sub_domain: + default: git + examples: + - git + type: string + replicas: + default: 1 + examples: + - 1 + type: integer backups: default: enable: false @@ -279,55 +202,92 @@ options: default: false type: boolean type: object - push-create: + storage: default: - org: 'true' - private: 'false' - user: 'true' + postgres: + size: 10Gi + redis: + size: 2Gi + volume: + accessMode: ReadWriteOnce + class: '' + size: 20Gi + type: Filesystem + description: Configure this app storage examples: - - org: 'true' - private: 'false' - user: 'true' + - postgres: + size: 10Gi + redis: + size: 2Gi + volume: + accessMode: ReadWriteOnce + class: '' + size: 20Gi + type: Filesystem properties: - org: - default: 'true' - type: string - private: - default: 'false' - type: string - user: - default: 'true' - type: string + postgres: + default: + size: 10Gi + properties: + size: + default: 10Gi + type: string + type: object + redis: + default: + size: 2Gi + properties: + size: + default: 2Gi + type: string + type: object + volume: + default: + accessMode: ReadWriteOnce + class: '' + size: 20Gi + type: Filesystem + properties: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + class: + default: '' + type: string + size: + default: 20Gi + type: string + type: + default: Filesystem + enum: + - Filesystem + - Block + type: string + type: object type: object - webhook: - default: - allowed-hosts: private - skip-tls-verify: false - examples: - - allowed-hosts: private - skip-tls-verify: false - properties: - allowed-hosts: - default: private - type: string - skip-tls-verify: - default: false - type: boolean - type: object - default-branch: - default: main - examples: - - main - type: string app_group: default: dev examples: - dev type: string - release: - default: 8.3.0 + postgres: + default: + replicas: 1 examples: - - 8.3.0 + - replicas: 1 + properties: + replicas: + default: 1 + type: integer + type: object + theme: + default: gitea-modern + examples: + - gitea-modern type: string load-balancer: default: @@ -339,10 +299,40 @@ options: default: '' type: string type: object + domain: + default: your-company + examples: + - your-company + type: string + webhook: + default: + allowed-hosts: private + skip-tls-verify: false + documentation: https://docs.gitea.com/next/administration/config-cheat-sheet#webhook-webhook + examples: + - allowed-hosts: private + skip-tls-verify: false + properties: + allowed-hosts: + default: private + examples: + - external + - loopback + - '*.yourdomain.com' + type: string + skip-tls-verify: + default: false + type: boolean + type: object + domain_name: + default: your_company.com + examples: + - your_company.com + type: string images: default: gitea: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: gitea/gitea tag: 1.20.5-rootless @@ -351,18 +341,18 @@ options: repository: cloudnative-pg/postgresql tag: 15.3 redis: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 redis_exporter: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 examples: - gitea: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: gitea/gitea tag: 1.20.5-rootless @@ -371,24 +361,24 @@ options: repository: cloudnative-pg/postgresql tag: 15.3 redis: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 redis_exporter: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 properties: gitea: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: gitea/gitea tag: 1.20.5-rootless properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -423,12 +413,12 @@ options: type: object redis: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -447,12 +437,12 @@ options: type: object redis_exporter: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -470,6 +460,21 @@ options: type: string type: object type: object + ssh-sub_domain: + default: git + examples: + - git + type: string + timezone: + default: Europe/Paris + examples: + - Europe/Paris + type: string + ssh-port: + default: 2222 + examples: + - 2222 + type: integer dependencies: - dist: null category: share @@ -485,6 +490,7 @@ providers: authentik: true kubectl: true postgresql: null + mysql: null restapi: true http: true gitea: null diff --git a/apps/gitea/redis.tf b/apps/gitea/redis.tf index 88a59fa..6316802 100644 --- a/apps/gitea/redis.tf +++ b/apps/gitea/redis.tf @@ -14,7 +14,7 @@ resource "kubectl_manifest" "prj_redis" { spec: kubernetesConfig: image: "${var.images.redis.registry}/${var.images.redis.repository}:${var.images.redis.tag}" - imagePullPolicy: "${var.images.redis.pullPolicy}" + imagePullPolicy: "${var.images.redis.pull_policy}" storage: volumeClaimTemplate: spec: diff --git a/apps/gramo/deploy.tf b/apps/gramo/deploy.tf index 8832e83..84e3b36 100644 --- a/apps/gramo/deploy.tf +++ b/apps/gramo/deploy.tf @@ -29,7 +29,7 @@ resource "kubectl_manifest" "deploy" { - name: BRIDGE_USER_AUTH value: disabled image: "${var.images.gramo.registry}/${var.images.gramo.repository}:${var.images.gramo.tag}" - imagePullPolicy: "${var.images.gramo.pullPolicy}" + imagePullPolicy: "${var.images.gramo.pull_policy}" ports: - containerPort: 3000 name: http diff --git a/apps/gramo/index.yaml b/apps/gramo/index.yaml index 7bfe922..73fbc24 100644 --- a/apps/gramo/index.yaml +++ b/apps/gramo/index.yaml @@ -54,25 +54,25 @@ options: images: default: gramo: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/gramo tag: 0.0.2 examples: - gramo: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/gramo tag: 0.0.2 properties: gramo: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/gramo tag: 0.0.2 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/apps/infisical/configs.tf b/apps/infisical/configs.tf index dc51679..be10621 100644 --- a/apps/infisical/configs.tf +++ b/apps/infisical/configs.tf @@ -7,6 +7,7 @@ resource "kubectl_manifest" "config" { namespace: "${var.namespace}" labels: ${jsonencode(local.common-labels)} data: + NODE_EXTRA_CA_CERTS: /etc/local-ca/ca.crt INVITE_ONLY_SIGNUP: "true" TELEMETRY_ENABLED: "false" REDIS_URL: "${module.redis.url}" diff --git a/apps/infisical/deploy.tf b/apps/infisical/deploy.tf index d0b1ed2..15d4174 100644 --- a/apps/infisical/deploy.tf +++ b/apps/infisical/deploy.tf @@ -20,7 +20,7 @@ resource "kubectl_manifest" "deploy" { containers: - name: infisical-backend image: "${var.images.infisical.registry}/${var.images.infisical.repository}:${var.images.infisical.tag}" - imagePullPolicy: "${var.images.infisical.pullPolicy}" + imagePullPolicy: "${var.images.infisical.pull_policy}" readinessProbe: httpGet: path: /api/status @@ -36,5 +36,15 @@ resource "kubectl_manifest" "deploy" { name: "${kubectl_manifest.config.name}" - secretRef: name: "${kubectl_manifest.secret.name}" + volumeMounts: + - name: certs + mountPath: /etc/local-ca + readOnly: true + restartPolicy: Always + volumes: + - name: certs + secret: + secretName: "${module.ingress.sercret_name}" + defaultMode: 0444 EOF } diff --git a/apps/infisical/index.yaml b/apps/infisical/index.yaml index 9a9e72d..0dc9636 100644 --- a/apps/infisical/index.yaml +++ b/apps/infisical/index.yaml @@ -6,63 +6,90 @@ metadata: name: infisical description: null options: + sub_domain: + default: infisical + examples: + - infisical + type: string replicas: default: 1 examples: - 1 type: integer - domain: - default: your-company + app_group: + default: apps examples: - - your-company + - apps type: string - domain_name: - default: your-company.com + redis: + default: + exporter: + enabled: true examples: - - your-company.com + - exporter: + enabled: true + properties: + exporter: + default: + enabled: true + properties: + enabled: + default: true + type: boolean + type: object + type: object + sso_vynil: + default: true + examples: + - true + type: boolean + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod type: string images: default: infisical: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: infisical/infisical tag: latest redis: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 redis_exporter: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 examples: - infisical: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: infisical/infisical tag: latest redis: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 redis_exporter: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 properties: infisical: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: infisical/infisical tag: latest properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -81,12 +108,12 @@ options: type: object redis: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -105,12 +132,12 @@ options: type: object redis_exporter: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -128,31 +155,21 @@ options: type: string type: object type: object + domain_name: + default: your-company.com + examples: + - your-company.com + type: string ingress_class: default: traefik examples: - traefik type: string - app_group: - default: apps + domain: + default: your-company examples: - - apps + - your-company type: string - sub_domain: - default: infisical - examples: - - infisical - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - sso_vynil: - default: true - examples: - - true - type: boolean dependencies: - dist: null category: core diff --git a/apps/infisical/presentation.tf b/apps/infisical/presentation.tf index f617770..b4c7407 100644 --- a/apps/infisical/presentation.tf +++ b/apps/infisical/presentation.tf @@ -1,7 +1,7 @@ locals { dns_name = "${var.sub_domain}.${var.domain_name}" dns_names = [local.dns_name] - icon = "icon.svg" + icon = "infisical.ico" request_headers = { "Content-Type" = "application/json" Authorization = "Bearer ${data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]}" diff --git a/apps/infisical/secret.tf b/apps/infisical/secret.tf index c3cb033..2dfd50d 100644 --- a/apps/infisical/secret.tf +++ b/apps/infisical/secret.tf @@ -27,5 +27,7 @@ resource "kubectl_manifest" "secret" { length: "32" - fieldName: "ENCRYPTION_KEY" length: "32" + - fieldName: "AUTH_SECRET" + length: "32" EOF } diff --git a/apps/infisical/storage.tf b/apps/infisical/storage.tf index 0306942..5f36544 100644 --- a/apps/infisical/storage.tf +++ b/apps/infisical/storage.tf @@ -5,6 +5,7 @@ module "redis" { namespace = var.namespace labels = local.common-labels images = var.images + exporter = var.redis.exporter providers = { kubectl = kubectl } diff --git a/apps/nextcloud/collabora.tf b/apps/nextcloud/collabora.tf index 0e15b4a..a38aea1 100644 --- a/apps/nextcloud/collabora.tf +++ b/apps/nextcloud/collabora.tf @@ -33,7 +33,7 @@ resource "kubectl_manifest" "collabora_deploy" { containers: - name: collabora image: "${var.images.collabora.registry}/${var.images.collabora.repository}:${var.images.collabora.tag}" - imagePullPolicy: "${var.images.collabora.pullPolicy}" + imagePullPolicy: "${var.images.collabora.pull_policy}" env: - name: aliasgroup1 value: "https://${local.dns_name}" diff --git a/apps/nextcloud/datas.tf b/apps/nextcloud/datas.tf index abe3e6c..5318f76 100644 --- a/apps/nextcloud/datas.tf +++ b/apps/nextcloud/datas.tf @@ -75,7 +75,7 @@ data "kustomization_overlay" "data" { containers: - name: nextcloud image: "${var.images.nextcloud.registry}/${var.images.nextcloud.repository}:${var.images.nextcloud.tag}" - imagePullPolicy: "${var.images.nextcloud.pullPolicy}" + imagePullPolicy: "${var.images.nextcloud.pull_policy}" command: ["/usr/local/bin/wrapper"] args: ["php-fpm"] env: @@ -138,7 +138,7 @@ data "kustomization_overlay" "data" { subPath: "wrapper" - name: nextcloud-nginx image: "${var.images.nginx.registry}/${var.images.nginx.repository}:${var.images.nginx.tag}" - imagePullPolicy: "${var.images.nginx.pullPolicy}" + imagePullPolicy: "${var.images.nginx.pull_policy}" resources: {} readinessProbe: @@ -171,7 +171,7 @@ data "kustomization_overlay" "data" { containers: - name: metrics-exporter image: "${var.images.exporter.registry}/${var.images.exporter.repository}:${var.images.exporter.tag}" - imagePullPolicy: "${var.images.exporter.pullPolicy}" + imagePullPolicy: "${var.images.exporter.pull_policy}" env: - name: NEXTCLOUD_SERVER value: "https://${local.dns_name}" diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml index 57c23f2..b15c37b 100644 --- a/apps/nextcloud/index.yaml +++ b/apps/nextcloud/index.yaml @@ -284,27 +284,27 @@ options: images: default: collabora: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: collabora/code tag: 23.05.5.2.1 exporter: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: xperimental/nextcloud-exporter tag: 0.6.2 nextcloud: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: nextcloud tag: 27.1.2-fpm nginx: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: nginx tag: alpine onlyoffice: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: onlyoffice/documentserver tag: 7.5.0.1 @@ -313,38 +313,38 @@ options: repository: cloudnative-pg/postgresql tag: 15.3 redis: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 redis_exporter: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 examples: - collabora: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: collabora/code tag: 23.05.5.2.1 exporter: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: xperimental/nextcloud-exporter tag: 0.6.2 nextcloud: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: nextcloud tag: 27.1.2-fpm nginx: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: nginx tag: alpine onlyoffice: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: onlyoffice/documentserver tag: 7.5.0.1 @@ -353,24 +353,24 @@ options: repository: cloudnative-pg/postgresql tag: 15.3 redis: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 redis_exporter: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 properties: collabora: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: collabora/code tag: 23.05.5.2.1 properties: - pullPolicy: + pull_policy: default: IfNotPresent type: string registry: @@ -385,12 +385,12 @@ options: type: object exporter: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: xperimental/nextcloud-exporter tag: 0.6.2 properties: - pullPolicy: + pull_policy: default: IfNotPresent type: string registry: @@ -405,12 +405,12 @@ options: type: object nextcloud: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: nextcloud tag: 27.1.2-fpm properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -429,12 +429,12 @@ options: type: object nginx: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: nginx tag: alpine properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -453,12 +453,12 @@ options: type: object onlyoffice: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: onlyoffice/documentserver tag: 7.5.0.1 properties: - pullPolicy: + pull_policy: default: IfNotPresent type: string registry: @@ -489,12 +489,12 @@ options: type: object redis: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -513,12 +513,12 @@ options: type: object redis_exporter: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/apps/nextcloud/onlyoffice.tf b/apps/nextcloud/onlyoffice.tf index ccfc92a..c177ee0 100644 --- a/apps/nextcloud/onlyoffice.tf +++ b/apps/nextcloud/onlyoffice.tf @@ -26,7 +26,7 @@ resource "kubectl_manifest" "onlyoffice_deploy" { containers: - name: "onlyoffice" image: "${var.images.onlyoffice.registry}/${var.images.onlyoffice.repository}:${var.images.onlyoffice.tag}" - imagePullPolicy: "${var.images.onlyoffice.pullPolicy}" + imagePullPolicy: "${var.images.onlyoffice.pull_policy}" env: - name: JWT_ENABLED value: "true" diff --git a/apps/nextcloud/redis.tf b/apps/nextcloud/redis.tf index 88a59fa..6316802 100644 --- a/apps/nextcloud/redis.tf +++ b/apps/nextcloud/redis.tf @@ -14,7 +14,7 @@ resource "kubectl_manifest" "prj_redis" { spec: kubernetesConfig: image: "${var.images.redis.registry}/${var.images.redis.repository}:${var.images.redis.tag}" - imagePullPolicy: "${var.images.redis.pullPolicy}" + imagePullPolicy: "${var.images.redis.pull_policy}" storage: volumeClaimTemplate: spec: diff --git a/apps/okd/deploy.tf b/apps/okd/deploy.tf index ce84408..a28d9bb 100644 --- a/apps/okd/deploy.tf +++ b/apps/okd/deploy.tf @@ -29,7 +29,7 @@ resource "kubectl_manifest" "deploy" { - name: BRIDGE_USER_AUTH value: disabled image: "${var.images.okd.registry}/${var.images.okd.repository}:${var.images.okd.tag}" - imagePullPolicy: "${var.images.okd.pullPolicy}" + imagePullPolicy: "${var.images.okd.pull_policy}" ports: - containerPort: 9000 name: http diff --git a/apps/okd/index.yaml b/apps/okd/index.yaml index 6c76ccd..01a004b 100644 --- a/apps/okd/index.yaml +++ b/apps/okd/index.yaml @@ -9,25 +9,25 @@ options: images: default: okd: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: openshift/origin-console tag: 4.15.0 examples: - okd: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: openshift/origin-console tag: 4.15.0 properties: okd: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: openshift/origin-console tag: 4.15.0 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/apps/sonar/index.yaml b/apps/sonar/index.yaml index b0a4ade..07c549e 100644 --- a/apps/sonar/index.yaml +++ b/apps/sonar/index.yaml @@ -19,25 +19,25 @@ options: images: default: sonar: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: to-be/defined tag: v1.0.0 examples: - sonar: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: to-be/defined tag: v1.0.0 properties: sonar: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: to-be/defined tag: v1.0.0 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/apps/woodpecker/datas.tf b/apps/woodpecker/datas.tf index e1483ce..a2b49eb 100644 --- a/apps/woodpecker/datas.tf +++ b/apps/woodpecker/datas.tf @@ -60,7 +60,7 @@ data "kustomization_overlay" "data" { containers: - name: agent image: "${var.images.agent.registry}/${var.images.agent.repository}:${var.images.agent.tag}" - imagePullPolicy: "${var.images.agent.pullPolicy}" + imagePullPolicy: "${var.images.agent.pull_policy}" env: - name: WOODPECKER_BACKEND_K8S_NAMESPACE value: "${var.namespace}" @@ -156,7 +156,7 @@ data "kustomization_overlay" "data" { containers: - name: server image: "${var.images.server.registry}/${var.images.server.repository}:${var.images.server.tag}" - imagePullPolicy: "${var.images.server.pullPolicy}" + imagePullPolicy: "${var.images.server.pull_policy}" env: - name: WOODPECKER_ADMIN value: "${var.admin-users}" diff --git a/apps/woodpecker/index.yaml b/apps/woodpecker/index.yaml index 302a05e..de7c04b 100644 --- a/apps/woodpecker/index.yaml +++ b/apps/woodpecker/index.yaml @@ -34,7 +34,7 @@ options: images: default: agent: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: woodpeckerci/woodpecker-agent tag: v1.0.3-alpine @@ -43,13 +43,13 @@ options: repository: woodpeckerci/plugin-git tag: 2.2.0 server: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: woodpeckerci/woodpecker-server tag: v1.0.3-alpine examples: - agent: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: woodpeckerci/woodpecker-agent tag: v1.0.3-alpine @@ -58,19 +58,19 @@ options: repository: woodpeckerci/plugin-git tag: 2.2.0 server: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: woodpeckerci/woodpecker-server tag: v1.0.3-alpine properties: agent: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: woodpeckerci/woodpecker-agent tag: v1.0.3-alpine properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -105,12 +105,12 @@ options: type: object server: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: woodpeckerci/woodpecker-server tag: v1.0.3-alpine properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/meta/domain-devspaces/index.yaml b/meta/domain-devspaces/index.yaml index 386f8f5..98238a2 100644 --- a/meta/domain-devspaces/index.yaml +++ b/meta/domain-devspaces/index.yaml @@ -37,25 +37,25 @@ options: images: default: codeserver: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/code-server tag: 4.18 examples: - codeserver: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/code-server tag: 4.18 properties: codeserver: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/code-server tag: 4.18 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/monitor/alertmanager/index.yaml b/monitor/alertmanager/index.yaml index 9da8129..832f968 100644 --- a/monitor/alertmanager/index.yaml +++ b/monitor/alertmanager/index.yaml @@ -29,25 +29,25 @@ options: images: default: alertmanager: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: prometheus/alertmanager tag: v0.26.0 examples: - alertmanager: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: prometheus/alertmanager tag: v0.26.0 properties: alertmanager: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: prometheus/alertmanager tag: v0.26.0 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/monitor/grafana/index.yaml b/monitor/grafana/index.yaml index daab533..08e64e0 100644 --- a/monitor/grafana/index.yaml +++ b/monitor/grafana/index.yaml @@ -91,12 +91,12 @@ options: repository: library/busybox tag: 1.31.1 grafana: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: grafana/grafana tag: 10.2.3 sidecar: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: kiwigrid/k8s-sidecar tag: 1.25.2 @@ -106,12 +106,12 @@ options: repository: library/busybox tag: 1.31.1 grafana: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: grafana/grafana tag: 10.2.3 sidecar: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: kiwigrid/k8s-sidecar tag: 1.25.2 @@ -134,12 +134,12 @@ options: type: object grafana: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: grafana/grafana tag: 10.2.3 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -158,12 +158,12 @@ options: type: object sidecar: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: kiwigrid/k8s-sidecar tag: 1.25.2 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/monitor/kube-state-metrics/index.yaml b/monitor/kube-state-metrics/index.yaml index 08b74c3..a551439 100644 --- a/monitor/kube-state-metrics/index.yaml +++ b/monitor/kube-state-metrics/index.yaml @@ -9,25 +9,25 @@ options: images: default: kube-state-metrics: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: registry.k8s.io repository: kube-state-metrics/kube-state-metrics tag: v2.10.1 examples: - kube-state-metrics: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: registry.k8s.io repository: kube-state-metrics/kube-state-metrics tag: v2.10.1 properties: kube-state-metrics: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: registry.k8s.io repository: kube-state-metrics/kube-state-metrics tag: v2.10.1 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/monitor/loki-dashboard/index.yaml b/monitor/loki-dashboard/index.yaml index 6c689a8..08a49c8 100644 --- a/monitor/loki-dashboard/index.yaml +++ b/monitor/loki-dashboard/index.yaml @@ -19,25 +19,25 @@ options: images: default: operator: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: to-be/defined tag: v1.0.0 examples: - operator: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: to-be/defined tag: v1.0.0 properties: operator: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: to-be/defined tag: v1.0.0 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/monitor/loki/datas.tf b/monitor/loki/datas.tf index 32c9304..54e28bb 100644 --- a/monitor/loki/datas.tf +++ b/monitor/loki/datas.tf @@ -61,7 +61,7 @@ data "kustomization_overlay" "data" { spec: containers: - name: loki - imagePullPolicy: ${var.images.loki.pullPolicy} + imagePullPolicy: ${var.images.loki.pull_policy} volumeClaimTemplates: - apiVersion: v1 kind: PersistentVolumeClaim diff --git a/monitor/loki/index.yaml b/monitor/loki/index.yaml index 74021bf..36478a0 100644 --- a/monitor/loki/index.yaml +++ b/monitor/loki/index.yaml @@ -57,25 +57,25 @@ options: images: default: loki: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: grafana/loki tag: 2.9.3 examples: - loki: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: grafana/loki tag: 2.9.3 properties: loki: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: grafana/loki tag: 2.9.3 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/monitor/node-exporter/index.yaml b/monitor/node-exporter/index.yaml index fa0b2ef..f9f640f 100644 --- a/monitor/node-exporter/index.yaml +++ b/monitor/node-exporter/index.yaml @@ -9,25 +9,25 @@ options: images: default: node-exporter: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: prometheus/node-exporter tag: v1.7.0 examples: - node-exporter: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: prometheus/node-exporter tag: v1.7.0 properties: node-exporter: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: prometheus/node-exporter tag: v1.7.0 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/monitor/prometheus/index.yaml b/monitor/prometheus/index.yaml index d3024c9..3dfc142 100644 --- a/monitor/prometheus/index.yaml +++ b/monitor/prometheus/index.yaml @@ -69,25 +69,25 @@ options: images: default: prometheus: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: prometheus/prometheus tag: v2.49.1 examples: - prometheus: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: prometheus/prometheus tag: v2.49.1 properties: prometheus: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: prometheus/prometheus tag: v2.49.1 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/monitor/promtail/index.yaml b/monitor/promtail/index.yaml index 691bdec..1bd48f5 100644 --- a/monitor/promtail/index.yaml +++ b/monitor/promtail/index.yaml @@ -9,25 +9,25 @@ options: images: default: promtail: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: grafana/promtail tag: 2.9.2 examples: - promtail: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: grafana/promtail tag: 2.9.2 properties: promtail: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: grafana/promtail tag: 2.9.2 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/share/authentik/datas.tf b/share/authentik/datas.tf index 8baedf2..ea86bf7 100644 --- a/share/authentik/datas.tf +++ b/share/authentik/datas.tf @@ -65,7 +65,7 @@ data "kustomization_overlay" "data" { containers: - name: authentik image: "${var.images.app.registry}/${var.images.app.repository}:${var.images.app.tag}" - imagePullPolicy: "${var.images.app.pullPolicy}" + imagePullPolicy: "${var.images.app.pull_policy}" env: - name: "AUTHENTIK_POSTGRESQL__HOST" value: "${var.instance}-${var.component}-pool.${var.namespace}.svc" @@ -97,7 +97,7 @@ data "kustomization_overlay" "data" { containers: - name: authentik image: "${var.images.app.registry}/${var.images.app.repository}:${var.images.app.tag}" - imagePullPolicy: "${var.images.app.pullPolicy}" + imagePullPolicy: "${var.images.app.pull_policy}" env: - name: "AUTHENTIK_POSTGRESQL__HOST" value: "${var.instance}-${var.component}-pool.${var.namespace}.svc" diff --git a/share/authentik/index.yaml b/share/authentik/index.yaml index 4e75ae4..0d0bce7 100644 --- a/share/authentik/index.yaml +++ b/share/authentik/index.yaml @@ -35,7 +35,7 @@ options: default: app: project: goauthentik - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: ghcr.io repository: goauthentik/server tag: 2023.8.3 @@ -44,19 +44,19 @@ options: repository: cloudnative-pg/postgresql tag: 15.3 redis: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 redis_exporter: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 examples: - app: project: goauthentik - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: ghcr.io repository: goauthentik/server tag: 2023.8.3 @@ -65,12 +65,12 @@ options: repository: cloudnative-pg/postgresql tag: 15.3 redis: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 redis_exporter: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 @@ -78,7 +78,7 @@ options: app: default: project: goauthentik - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: ghcr.io repository: goauthentik/server tag: 2023.8.3 @@ -86,7 +86,7 @@ options: project: default: goauthentik type: string - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -121,12 +121,12 @@ options: type: object redis: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -145,12 +145,12 @@ options: type: object redis_exporter: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/share/authentik/redis.tf b/share/authentik/redis.tf index 82cf75a..5f9e19a 100644 --- a/share/authentik/redis.tf +++ b/share/authentik/redis.tf @@ -9,7 +9,7 @@ resource "kubectl_manifest" "authentik_redis" { spec: kubernetesConfig: image: "${var.images.redis.registry}/${var.images.redis.repository}:${var.images.redis.tag}" - imagePullPolicy: "${var.images.redis.pullPolicy}" + imagePullPolicy: "${var.images.redis.pull_policy}" redisSecret: name: "${var.component}" key: "AUTHENTIK_REDIS__PASSWORD" diff --git a/share/dataset-maria/index.yaml b/share/dataset-maria/index.yaml index d0b07c1..769f6e5 100644 --- a/share/dataset-maria/index.yaml +++ b/share/dataset-maria/index.yaml @@ -14,25 +14,25 @@ options: images: default: mariadb: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: mariadb tag: 10.7.4 examples: - mariadb: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: mariadb tag: 10.7.4 properties: mariadb: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: mariadb tag: 10.7.4 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/share/dataset-maria/mariadb.tf b/share/dataset-maria/mariadb.tf index a1bab35..923dab0 100644 --- a/share/dataset-maria/mariadb.tf +++ b/share/dataset-maria/mariadb.tf @@ -41,7 +41,7 @@ resource "kubectl_manifest" "prj_mariadb" { labels: ${jsonencode(local.maria-labels)} spec: image: "${var.images.mariadb.registry}/${var.images.mariadb.repository}:${var.images.mariadb.tag}" - imagePullPolicy: "${var.images.mariadb.pullPolicy}" + imagePullPolicy: "${var.images.mariadb.pull_policy}" rootPasswordSecretKeyRef: key: root-password name: "${var.instance}-${var.component}" diff --git a/share/dataset-mongo/index.yaml b/share/dataset-mongo/index.yaml index 48cc088..b51f39b 100644 --- a/share/dataset-mongo/index.yaml +++ b/share/dataset-mongo/index.yaml @@ -49,11 +49,11 @@ options: type: object image: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent examples: - - pullPolicy: IfNotPresent + - pull_policy: IfNotPresent properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/share/dataset-mongo/mongo.tf b/share/dataset-mongo/mongo.tf index b034e6b..738b5f6 100644 --- a/share/dataset-mongo/mongo.tf +++ b/share/dataset-mongo/mongo.tf @@ -51,7 +51,7 @@ resource "kubectl_manifest" "prj_mongo" { spec: containers: - name: mongod - imagePullPolicy: "${var.image.pullPolicy}" + imagePullPolicy: "${var.image.pull_policy}" resources: limits: cpu: "${var.ressources.limits.cpu}" diff --git a/share/dataset-pg/directus.tf b/share/dataset-pg/directus.tf index 5b9cd94..d4a6c37 100644 --- a/share/dataset-pg/directus.tf +++ b/share/dataset-pg/directus.tf @@ -155,7 +155,7 @@ resource "kubectl_manifest" "directus_deploy" { - configMapRef: name: "${var.component}-${var.instance}-directus" image: "${var.extentions.directus.image.registry}/${var.extentions.directus.image.repository}:${var.extentions.directus.image.tag}" - imagePullPolicy: "${var.extentions.directus.image.pullPolicy}" + imagePullPolicy: "${var.extentions.directus.image.pull_policy}" ports: - containerPort: 8055 name: http diff --git a/share/dataset-pg/index.yaml b/share/dataset-pg/index.yaml index 50e0a1e..cd03ad3 100644 --- a/share/dataset-pg/index.yaml +++ b/share/dataset-pg/index.yaml @@ -140,7 +140,7 @@ options: directus: enable: false image: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: directus/directus tag: 10.7.0 @@ -153,13 +153,13 @@ options: postgrest: enable: false image: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: postgrest/postgrest tag: v11.2.1 swagger: enable: true - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: swaggerapi/swagger-ui tag: v5.9.0 @@ -167,7 +167,7 @@ options: - directus: enable: false image: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: directus/directus tag: 10.7.0 @@ -180,13 +180,13 @@ options: postgrest: enable: false image: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: postgrest/postgrest tag: v11.2.1 swagger: enable: true - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: swaggerapi/swagger-ui tag: v5.9.0 @@ -195,7 +195,7 @@ options: default: enable: false image: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: directus/directus tag: 10.7.0 @@ -209,12 +209,12 @@ options: type: boolean image: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: directus/directus tag: 10.7.0 properties: - pullPolicy: + pull_policy: default: IfNotPresent type: string registry: @@ -256,13 +256,13 @@ options: default: enable: false image: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: postgrest/postgrest tag: v11.2.1 swagger: enable: true - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: swaggerapi/swagger-ui tag: v5.9.0 @@ -272,12 +272,12 @@ options: type: boolean image: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: postgrest/postgrest tag: v11.2.1 properties: - pullPolicy: + pull_policy: default: IfNotPresent type: string registry: @@ -293,7 +293,7 @@ options: swagger: default: enable: true - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: swaggerapi/swagger-ui tag: v5.9.0 @@ -301,7 +301,7 @@ options: enable: default: true type: boolean - pullPolicy: + pull_policy: default: IfNotPresent type: string registry: diff --git a/share/dataset-pg/postgrest.tf b/share/dataset-pg/postgrest.tf index 245c9be..195c8a1 100644 --- a/share/dataset-pg/postgrest.tf +++ b/share/dataset-pg/postgrest.tf @@ -84,7 +84,7 @@ resource "kubectl_manifest" "postgrest_deploy" { - configMapRef: name: "${var.component}-${var.instance}-postgrest" image: "${var.extentions.postgrest.image.registry}/${var.extentions.postgrest.image.repository}:${var.extentions.postgrest.image.tag}" - imagePullPolicy: "${var.extentions.postgrest.image.pullPolicy}" + imagePullPolicy: "${var.extentions.postgrest.image.pull_policy}" ports: - containerPort: 3000 name: http @@ -119,7 +119,7 @@ EOF runAsNonRoot: true runAsUser: 1000 image: "${var.extentions.postgrest.swagger.registry}/${var.extentions.postgrest.swagger.repository}:${var.extentions.postgrest.swagger.tag}" - imagePullPolicy: "${var.extentions.postgrest.swagger.pullPolicy}" + imagePullPolicy: "${var.extentions.postgrest.swagger.pull_policy}" ports: - containerPort: 8080 name: swagger diff --git a/share/dataset-rabbit/index.yaml b/share/dataset-rabbit/index.yaml index 43bb178..b526bad 100644 --- a/share/dataset-rabbit/index.yaml +++ b/share/dataset-rabbit/index.yaml @@ -60,25 +60,25 @@ options: images: default: rabbit: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: rabbitmq tag: 3.10.2-management examples: - rabbit: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: rabbitmq tag: 3.10.2-management properties: rabbit: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: rabbitmq tag: 3.10.2-management properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/share/dataset-redis/index.yaml b/share/dataset-redis/index.yaml index f968004..94b16fd 100644 --- a/share/dataset-redis/index.yaml +++ b/share/dataset-redis/index.yaml @@ -19,7 +19,7 @@ options: images: default: redis: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 @@ -29,7 +29,7 @@ options: tag: v1.44.0 examples: - redis: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 @@ -40,12 +40,12 @@ options: properties: redis: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/share/dataset-redis/redis.tf b/share/dataset-redis/redis.tf index f996438..68aa396 100644 --- a/share/dataset-redis/redis.tf +++ b/share/dataset-redis/redis.tf @@ -14,7 +14,7 @@ resource "kubectl_manifest" "prj_redis" { spec: kubernetesConfig: image: "${var.images.redis.registry}/${var.images.redis.repository}:${var.images.redis.tag}" - imagePullPolicy: "${var.images.redis.pullPolicy}" + imagePullPolicy: "${var.images.redis.pull_policy}" storage: volumeClaimTemplate: spec: diff --git a/share/dns/datas.tf b/share/dns/datas.tf index 1ea2225..f2fc96f 100644 --- a/share/dns/datas.tf +++ b/share/dns/datas.tf @@ -42,7 +42,7 @@ data "kustomization_overlay" "data" { containers: - name: coredns image: "${var.image.registry}/${var.image.repository}:${var.image.tag}" - imagePullPolicy: "${var.image.pullPolicy}" + imagePullPolicy: "${var.image.pull_policy}" volumes: - name: config-volume configMap: diff --git a/share/dns/index.yaml b/share/dns/index.yaml index 4879775..1334510 100644 --- a/share/dns/index.yaml +++ b/share/dns/index.yaml @@ -76,17 +76,17 @@ options: type: string image: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: coredns/coredns tag: 1.11.1 examples: - - pullPolicy: IfNotPresent + - pull_policy: IfNotPresent registry: docker.io repository: coredns/coredns tag: 1.11.1 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/share/wildduck/haraka.tf b/share/wildduck/haraka.tf index 6748e2e..3ac92b4 100644 --- a/share/wildduck/haraka.tf +++ b/share/wildduck/haraka.tf @@ -32,7 +32,7 @@ resource "kubectl_manifest" "haraka_deploy" { runAsNonRoot: true runAsUser: 1000 image: "${var.images.haraka.registry}/${var.images.haraka.repository}:${var.images.haraka.tag}" - imagePullPolicy: "${var.images.haraka.pullPolicy}" + imagePullPolicy: "${var.images.haraka.pull_policy}" ports: - name: smtp containerPort: 2500 diff --git a/share/wildduck/index.yaml b/share/wildduck/index.yaml index 36ed8df..9e29046 100644 --- a/share/wildduck/index.yaml +++ b/share/wildduck/index.yaml @@ -86,95 +86,95 @@ options: images: default: haraka: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/wildduck-haraka tag: 3.0.2 redis: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 redis_exporter: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 rspamd: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/wildduck-rspamd tag: 3.18.3 scimgateway: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/wildduck-scim tag: 1.0.0 webmail: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/wildduck-webmail tag: 1.0.1 wildduck: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: nodemailer/wildduck tag: 1.39.10 zonemta: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/wildduck-zonemta tag: 3.4.0 examples: - haraka: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/wildduck-haraka tag: 3.0.2 redis: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 redis_exporter: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 rspamd: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/wildduck-rspamd tag: 3.18.3 scimgateway: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/wildduck-scim tag: 1.0.0 webmail: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/wildduck-webmail tag: 1.0.1 wildduck: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: nodemailer/wildduck tag: 1.39.10 zonemta: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/wildduck-zonemta tag: 3.4.0 properties: haraka: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/wildduck-haraka tag: 3.0.2 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -193,12 +193,12 @@ options: type: object redis: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis tag: v7.0.12 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -217,12 +217,12 @@ options: type: object redis_exporter: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: quay.io repository: opstree/redis-exporter tag: v1.44.0 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -241,12 +241,12 @@ options: type: object rspamd: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/wildduck-rspamd tag: 3.18.3 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -265,12 +265,12 @@ options: type: object scimgateway: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/wildduck-scim tag: 1.0.0 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -289,12 +289,12 @@ options: type: object webmail: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/wildduck-webmail tag: 1.0.1 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -313,12 +313,12 @@ options: type: object wildduck: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: nodemailer/wildduck tag: 1.39.10 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always @@ -337,12 +337,12 @@ options: type: object zonemta: default: - pullPolicy: IfNotPresent + pull_policy: IfNotPresent registry: docker.io repository: sebt3/wildduck-zonemta tag: 3.4.0 properties: - pullPolicy: + pull_policy: default: IfNotPresent enum: - Always diff --git a/share/wildduck/mongo.tf b/share/wildduck/mongo.tf index 7986174..84aedcb 100644 --- a/share/wildduck/mongo.tf +++ b/share/wildduck/mongo.tf @@ -51,7 +51,7 @@ resource "kubectl_manifest" "prj_mongo" { spec: containers: - name: mongod - imagePullPolicy: "${var.images.webmail.pullPolicy}" + imagePullPolicy: "${var.images.webmail.pull_policy}" resources: limits: cpu: "1" diff --git a/share/wildduck/redis.tf b/share/wildduck/redis.tf index 88a59fa..6316802 100644 --- a/share/wildduck/redis.tf +++ b/share/wildduck/redis.tf @@ -14,7 +14,7 @@ resource "kubectl_manifest" "prj_redis" { spec: kubernetesConfig: image: "${var.images.redis.registry}/${var.images.redis.repository}:${var.images.redis.tag}" - imagePullPolicy: "${var.images.redis.pullPolicy}" + imagePullPolicy: "${var.images.redis.pull_policy}" storage: volumeClaimTemplate: spec: diff --git a/share/wildduck/rspamd.tf b/share/wildduck/rspamd.tf index 2affd9d..2b82fdf 100644 --- a/share/wildduck/rspamd.tf +++ b/share/wildduck/rspamd.tf @@ -32,7 +32,7 @@ resource "kubectl_manifest" "rspamd_deploy" { runAsNonRoot: true runAsUser: 100 image: "${var.images.rspamd.registry}/${var.images.rspamd.repository}:${var.images.rspamd.tag}" - imagePullPolicy: "${var.images.rspamd.pullPolicy}" + imagePullPolicy: "${var.images.rspamd.pull_policy}" ports: - name: rspamd containerPort: 11333 diff --git a/share/wildduck/scimgateway.tf b/share/wildduck/scimgateway.tf index b061409..13f892c 100644 --- a/share/wildduck/scimgateway.tf +++ b/share/wildduck/scimgateway.tf @@ -32,7 +32,7 @@ resource "kubectl_manifest" "scimgateway_deploy" { runAsNonRoot: true runAsUser: 1000 image: "${var.images.scimgateway.registry}/${var.images.scimgateway.repository}:${var.images.scimgateway.tag}" - imagePullPolicy: "${var.images.scimgateway.pullPolicy}" + imagePullPolicy: "${var.images.scimgateway.pull_policy}" ports: - name: http containerPort: 8880 diff --git a/share/wildduck/webmail.tf b/share/wildduck/webmail.tf index 82d52d2..2ab27bd 100644 --- a/share/wildduck/webmail.tf +++ b/share/wildduck/webmail.tf @@ -32,7 +32,7 @@ resource "kubectl_manifest" "webmail_deploy" { runAsNonRoot: true runAsUser: 1000 image: "${var.images.webmail.registry}/${var.images.webmail.repository}:${var.images.webmail.tag}" - imagePullPolicy: "${var.images.webmail.pullPolicy}" + imagePullPolicy: "${var.images.webmail.pull_policy}" args: - "--config=./config/webmail.toml" ports: diff --git a/share/wildduck/wildduck.tf b/share/wildduck/wildduck.tf index 3d1b612..a93aa69 100644 --- a/share/wildduck/wildduck.tf +++ b/share/wildduck/wildduck.tf @@ -32,7 +32,7 @@ resource "kubectl_manifest" "wildduck_deploy" { runAsNonRoot: true runAsUser: 1000 image: "${var.images.wildduck.registry}/${var.images.wildduck.repository}:${var.images.wildduck.tag}" - imagePullPolicy: "${var.images.wildduck.pullPolicy}" + imagePullPolicy: "${var.images.wildduck.pull_policy}" ports: - name: http containerPort: 8000 diff --git a/share/wildduck/zonemta.tf b/share/wildduck/zonemta.tf index 2acf8ea..09618c4 100644 --- a/share/wildduck/zonemta.tf +++ b/share/wildduck/zonemta.tf @@ -32,7 +32,7 @@ resource "kubectl_manifest" "zonemta_deploy" { runAsNonRoot: true runAsUser: 1000 image: "${var.images.zonemta.registry}/${var.images.zonemta.repository}:${var.images.zonemta.tag}" - imagePullPolicy: "${var.images.zonemta.pullPolicy}" + imagePullPolicy: "${var.images.zonemta.pull_policy}" ports: - name: smtp containerPort: 5870