fix

2024-01-26 16:44:44 +01:00
parent 4d8e42f0f6
commit 01ca8c2a13
59 changed files with 1018 additions and 1018 deletions
--- a/apps/gitea/backups.tf
+++ b/apps/gitea/backups.tf
@@ -10,16 +10,16 @@ resource "kubectl_manifest" "backup_schedule" {
    spec:
      backend:
        repoPasswordSecretRef:
-          key: "${var.backups.restic-key}"
-          name: "${var.backups.secret-name}"
+          key: "${var.backups.restic_key}"
+          name: "${var.backups.secret_name}"
        s3:
          accessKeyIDSecretRef:
-            key: "${var.backups.key-id-key}"
-            name: "${var.backups.secret-name}"
+            key: "${var.backups.key_id_key}"
+            name: "${var.backups.secret_name}"
          bucket: "${var.instance}-${var.namespace}"
          endpoint: "${var.backups.endpoint}/restic"
          secretAccessKeySecretRef:
-            key: "${var.backups.secret-key}"
+            key: "${var.backups.secret_key}"
            name: "${var.backups.secret-name}"
      backup:
        schedule: "${var.backups.schedule.backup}"
--- a/apps/gitea/index.yaml
+++ b/apps/gitea/index.yaml
@@ -9,26 +9,6 @@ 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:
-  sub-domain:
-    default: git
-    examples:
-    - git
-    type: string
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  load-balancer:
-    default:
-      ip: ''
-    examples:
-    - ip: ''
-    properties:
-      ip:
-        default: ''
-        type: string
-    type: object
  disable-registration:
    default: true
    examples:
@@ -51,6 +31,253 @@ options:
            type: boolean
        type: object
    type: object
+  theme:
+    default: gitea-modern
+    examples:
+    - gitea-modern
+    type: string
+  storage:
+    default:
+      postgres:
+        size: 10Gi
+      redis:
+        size: 2Gi
+      volume:
+        accessMode: ReadWriteOnce
+        size: 10Gi
+        type: Filesystem
+    description: Configure this app storage
+    examples:
+    - postgres:
+        size: 10Gi
+      redis:
+        size: 2Gi
+      volume:
+        accessMode: ReadWriteOnce
+        size: 10Gi
+        type: Filesystem
+    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
+          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
+    type: object
+  app_group:
+    default: dev
+    examples:
+    - dev
+    type: string
+  postgres:
+    default:
+      replicas: 1
+    examples:
+    - replicas: 1
+    properties:
+      replicas:
+        default: 1
+        type: integer
+    type: object
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  ssh-sub_domain:
+    default: git
+    examples:
+    - git
+    type: string
+  backups:
+    default:
+      enable: false
+      endpoint: ''
+      key_id_key: s3-id
+      restic_key: bck-password
+      retention:
+        db: 30d
+        keepDaily: 14
+        keepMonthly: 12
+        keepWeekly: 6
+        keepYearly: 12
+      schedule:
+        backup: 10 3 * * *
+        check: 10 5 * * 1
+        db: 10 3 * * *
+        prune: 10 1 * * 0
+      secret_key: s3-secret
+      secret_name: backup-settings
+      use-barman: false
+    examples:
+    - enable: false
+      endpoint: ''
+      key_id_key: s3-id
+      restic_key: bck-password
+      retention:
+        db: 30d
+        keepDaily: 14
+        keepMonthly: 12
+        keepWeekly: 6
+        keepYearly: 12
+      schedule:
+        backup: 10 3 * * *
+        check: 10 5 * * 1
+        db: 10 3 * * *
+        prune: 10 1 * * 0
+      secret_key: s3-secret
+      secret_name: backup-settings
+      use-barman: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+      endpoint:
+        default: ''
+        type: string
+      key_id_key:
+        default: s3-id
+        type: string
+      restic_key:
+        default: bck-password
+        type: string
+      retention:
+        default:
+          db: 30d
+          keepDaily: 14
+          keepMonthly: 12
+          keepWeekly: 6
+          keepYearly: 12
+        properties:
+          db:
+            default: 30d
+            type: string
+          keepDaily:
+            default: 14
+            type: integer
+          keepMonthly:
+            default: 12
+            type: integer
+          keepWeekly:
+            default: 6
+            type: integer
+          keepYearly:
+            default: 12
+            type: integer
+        type: object
+      schedule:
+        default:
+          backup: 10 3 * * *
+          check: 10 5 * * 1
+          db: 10 3 * * *
+          prune: 10 1 * * 0
+        properties:
+          backup:
+            default: 10 3 * * *
+            type: string
+          check:
+            default: 10 5 * * 1
+            type: string
+          db:
+            default: 10 3 * * *
+            type: string
+          prune:
+            default: 10 1 * * 0
+            type: string
+        type: object
+      secret_key:
+        default: s3-secret
+        type: string
+      secret_name:
+        default: backup-settings
+        type: string
+      use-barman:
+        default: false
+        type: boolean
+    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
+  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
+  release:
+    default: 8.3.0
+    examples:
+    - 8.3.0
+    type: string
+  ssh-port:
+    default: 2222
+    examples:
+    - 2222
+    type: integer
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
+  default-branch:
+    default: main
+    examples:
+    - main
+    type: string
  images:
    default:
      gitea:
@@ -182,112 +409,36 @@ options:
            type: string
        type: object
    type: object
-  backups:
-    default:
-      enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      restic-key: bck-password
-      retention:
-        db: 30d
-        keepDaily: 14
-        keepMonthly: 12
-        keepWeekly: 6
-        keepYearly: 12
-      schedule:
-        backup: 10 3 * * *
-        check: 10 5 * * 1
-        db: 10 3 * * *
-        prune: 10 1 * * 0
-      secret-key: s3-secret
-      secret-name: backup-settings
-      use-barman: false
+  domain_name:
+    default: your_company.com
    examples:
-    - enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      restic-key: bck-password
-      retention:
-        db: 30d
-        keepDaily: 14
-        keepMonthly: 12
-        keepWeekly: 6
-        keepYearly: 12
-      schedule:
-        backup: 10 3 * * *
-        check: 10 5 * * 1
-        db: 10 3 * * *
-        prune: 10 1 * * 0
-      secret-key: s3-secret
-      secret-name: backup-settings
-      use-barman: false
+    - your_company.com
+    type: string
+  load-balancer:
+    default:
+      ip: ''
+    examples:
+    - ip: ''
    properties:
-      enable:
-        default: false
-        type: boolean
-      endpoint:
+      ip:
        default: ''
        type: string
-      key-id-key:
-        default: s3-id
-        type: string
-      restic-key:
-        default: bck-password
-        type: string
-      retention:
-        default:
-          db: 30d
-          keepDaily: 14
-          keepMonthly: 12
-          keepWeekly: 6
-          keepYearly: 12
-        properties:
-          db:
-            default: 30d
-            type: string
-          keepDaily:
-            default: 14
-            type: integer
-          keepMonthly:
-            default: 12
-            type: integer
-          keepWeekly:
-            default: 6
-            type: integer
-          keepYearly:
-            default: 12
-            type: integer
-        type: object
-      schedule:
-        default:
-          backup: 10 3 * * *
-          check: 10 5 * * 1
-          db: 10 3 * * *
-          prune: 10 1 * * 0
-        properties:
-          backup:
-            default: 10 3 * * *
-            type: string
-          check:
-            default: 10 5 * * 1
-            type: string
-          db:
-            default: 10 3 * * *
-            type: string
-          prune:
-            default: 10 1 * * 0
-            type: string
-        type: object
-      secret-key:
-        default: s3-secret
-        type: string
-      secret-name:
-        default: backup-settings
-        type: string
-      use-barman:
-        default: false
-        type: boolean
    type: object
+  sub_domain:
+    default: git
+    examples:
+    - git
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
  push-create:
    default:
      org: 'true'
@@ -308,162 +459,11 @@ options:
        default: 'true'
        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
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
  timezone:
    default: Europe/Paris
    examples:
    - Europe/Paris
    type: string
-  theme:
-    default: gitea-modern
-    examples:
-    - gitea-modern
-    type: string
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
-  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
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  ssh-port:
-    default: 2222
-    examples:
-    - 2222
-    type: integer
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  release:
-    default: 8.3.0
-    examples:
-    - 8.3.0
-    type: string
-  storage:
-    default:
-      postgres:
-        size: 10Gi
-      redis:
-        size: 2Gi
-      volume:
-        accessMode: ReadWriteOnce
-        size: 10Gi
-        type: Filesystem
-    description: Configure this app storage
-    examples:
-    - postgres:
-        size: 10Gi
-      redis:
-        size: 2Gi
-      volume:
-        accessMode: ReadWriteOnce
-        size: 10Gi
-        type: Filesystem
-    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
-          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
-    type: object
-  ssh-sub-domain:
-    default: git
-    examples:
-    - git
-    type: string
-  app_group:
-    default: dev
-    examples:
-    - dev
-    type: string
-  postgres:
-    default:
-      replicas: 1
-    examples:
-    - replicas: 1
-    properties:
-      replicas:
-        default: 1
-        type: integer
-    type: object
 dependencies:
 - dist: null
  category: share
--- a/apps/gitea/inline-config.tf
+++ b/apps/gitea/inline-config.tf
@@ -43,15 +43,15 @@ ROOT=/data/git/gitea-repositories
    EOF
    server = <<-EOF
 APP_DATA_PATH=/data
-DOMAIN=${var.sub-domain}.${var.domain_name}
+DOMAIN=${var.sub_domain}.${var.domain_name}
 ENABLE_PPROF=false
 HTTP_PORT=3000
 PROTOCOL=http
-ROOT_URL=https://${var.sub-domain}.${var.domain_name}
-SSH_DOMAIN=${var.sub-domain}.${var.domain_name}
+ROOT_URL=https://${var.sub_domain}.${var.domain_name}
+SSH_DOMAIN=${var.sub_domain}.${var.domain_name}
 SSH_LISTEN_PORT=2222
 SSH_PORT=${var.ssh-port}
-SSH_DOMAIN=${var.ssh-sub-domain}.${var.domain_name}
+SSH_DOMAIN=${var.ssh-sub_domain}.${var.domain_name}
 START_SSH_SERVER=true
    EOF
    ui = <<-EOF
--- a/apps/gitea/postgresql.tf
+++ b/apps/gitea/postgresql.tf
@@ -27,18 +27,18 @@ resource "kubectl_manifest" "prj_pg" {
      monitoring:
        enablePodMonitor: true
  EOF
-  ], var.backups.enable&&var.backups.use-barman?[<<-EOF
+  ], var.backups.enable&&var.backups.use_barman?[<<-EOF
      backup:
        barmanObjectStore:
          destinationPath: "s3://${var.instance}-${var.namespace}/"
          endpointURL: "${var.backups.endpoint}/barman"
          s3Credentials:
            accessKeyId:
-              name: "${var.backups.secret-name}"
-              key: "${var.backups.key-id-key}"
+              name: "${var.backups.secret_name}"
+              key: "${var.backups.key_id_key}"
            secretAccessKey:
-              name: "${var.backups.secret-name}"
-              key: "${var.backups.secret-key}"
+              name: "${var.backups.secret_name}"
+              key: "${var.backups.secret_key}"
  EOF
  ]:[""]))
 }
--- a/apps/gitea/presentation.tf
+++ b/apps/gitea/presentation.tf
@@ -1,5 +1,5 @@
 locals {
-  dns_name = "${var.sub-domain}.${var.domain_name}"
+  dns_name = "${var.sub_domain}.${var.domain_name}"
  dns_names = [local.dns_name]
  app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
  icon              = "assets/img/logo.svg"