fix

2024-04-11 11:23:56 +02:00
parent c25e5e7718
commit bf57839d9f
4 changed files with 167 additions and 166 deletions
--- a/apps/gitea/backups.tf
+++ b/apps/gitea/backups.tf
@@ -17,10 +17,10 @@ resource "kubectl_manifest" "backup_schedule" {
            key: "${var.backups.key_id_key}"
            name: "${var.backups.secret_name}"
          bucket: "${var.instance}-${var.namespace}"
-          endpoint: "${var.backups.endpoint}/gitea"
+          endpoint: "${var.backups.endpoint}/restic"
          secretAccessKeySecretRef:
            key: "${var.backups.secret_key}"
-            name: "${var.backups.secret-name}"
+            name: "${var.backups.secret_name}"
      backup:
        schedule: "${var.backups.schedule.backup}"
        failedJobsHistoryLimit: 2
--- a/apps/gitea/index.yaml
+++ b/apps/gitea/index.yaml
@@ -9,6 +9,26 @@ 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:
+  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
+  app_group:
+    default: dev
+    examples:
+    - dev
+    type: string
  backups:
    default:
      enable: false
@@ -115,43 +135,26 @@ options:
        default: false
        type: boolean
    type: object
-  redis:
-    default:
-      exporter:
-        enabled: true
+  default-branch:
+    default: main
    examples:
-    - exporter:
-        enabled: true
-    properties:
-      exporter:
-        default:
-          enabled: true
-        properties:
-          enabled:
-            default: true
-            type: boolean
-        type: object
-    type: object
-  webhook:
-    default:
-      allowed-hosts: private
-      skip-tls-verify: false
-    documentation: https://docs.gitea.com/next/administration/config-cheat-sheet#webhook-webhook
+    - main
+    type: string
+  disable-registration:
+    default: true
    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
+    - true
+    type: boolean
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
  images:
    default:
      gitea:
@@ -283,6 +286,26 @@ options:
            type: string
        type: object
    type: object
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  load-balancer:
+    default:
+      ip: ''
+    examples:
+    - ip: ''
+    properties:
+      ip:
+        default: ''
+        type: string
+    type: object
  postgres:
    default:
      replicas: 1
@@ -293,56 +316,6 @@ options:
        default: 1
        type: integer
    type: object
-  sub_domain:
-    default: git
-    examples:
-    - git
-    type: string
-  theme:
-    default: gitea-modern
-    examples:
-    - gitea-modern
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    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
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  app_group:
-    default: dev
-    examples:
-    - dev
-    type: string
-  ssh-port:
-    default: 2222
-    examples:
-    - 2222
-    type: integer
  push-create:
    default:
      org: 'true'
@@ -363,6 +336,43 @@ options:
        default: 'true'
        type: string
    type: object
+  redis:
+    default:
+      exporter:
+        enabled: true
+    examples:
+    - exporter:
+        enabled: true
+    properties:
+      exporter:
+        default:
+          enabled: true
+        properties:
+          enabled:
+            default: true
+            type: boolean
+        type: object
+    type: object
+  release:
+    default: 8.3.0
+    examples:
+    - 8.3.0
+    type: string
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
+  ssh-port:
+    default: 2222
+    examples:
+    - 2222
+    type: integer
+  ssh-sub_domain:
+    default: git
+    examples:
+    - git
+    type: string
  storage:
    default:
      postgres:
@@ -430,51 +440,41 @@ options:
            type: string
        type: object
    type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  ssh-sub_domain:
+  sub_domain:
    default: git
    examples:
    - git
    type: string
-  release:
-    default: 8.3.0
+  theme:
+    default: gitea-modern
    examples:
-    - 8.3.0
+    - gitea-modern
    type: string
-  disable-registration:
-    default: true
-    examples:
-    - true
-    type: boolean
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
  timezone:
    default: Europe/Paris
    examples:
    - Europe/Paris
    type: string
-  load-balancer:
+  webhook:
    default:
-      ip: ''
+      allowed-hosts: private
+      skip-tls-verify: false
+    documentation: https://docs.gitea.com/next/administration/config-cheat-sheet#webhook-webhook
    examples:
-    - ip: ''
+    - allowed-hosts: private
+      skip-tls-verify: false
    properties:
-      ip:
-        default: ''
+      allowed-hosts:
+        default: private
+        examples:
+        - external
+        - loopback
+        - '*.yourdomain.com'
        type: string
+      skip-tls-verify:
+        default: false
+        type: boolean
    type: object
-  default-branch:
-    default: main
-    examples:
-    - main
-    type: string
 dependencies:
 - dist: null
  category: share
--- a/apps/gitea/redis.tf
+++ b/apps/gitea/redis.tf
@@ -5,7 +5,7 @@ locals {
 }
 resource "kubectl_manifest" "prj_redis" {
  yaml_body  = <<-EOF
-    apiVersion: "redis.redis.opstreelabs.in/v1beta2"
+    apiVersion: "redis.redis.opstreelabs.in/v1beta1"
    kind: "Redis"
    metadata:
      name: "${var.instance}-${var.component}-redis"
@@ -25,7 +25,7 @@ resource "kubectl_manifest" "prj_redis" {
      redisExporter:
        enabled: ${var.redis.exporter.enabled}
        image: "${var.images.redis_exporter.registry}/${var.images.redis_exporter.repository}:${var.images.redis_exporter.tag}"
-      podSecurityContext:
+      securityContext:
        runAsUser: 1000
        fsGroup: 1000
  EOF
--- a/share/organisation/index.yaml
+++ b/share/organisation/index.yaml
@@ -11,48 +11,19 @@ options:
    examples:
    - dev
    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  gitea-ssh-domain:
-    default: ''
-    examples:
-    - ''
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  stages:
-    default: []
-    items:
-      properties:
-        name:
-          default: prod
-          type: string
-      type: object
-    type: array
  backups:
    default:
      enable: false
      endpoint: ''
-      key-id-key: s3-id
-      secret-key: s3-secret
-      secret-name: backup-settings
+      key_id_key: s3-id
+      secret_key: s3-secret
+      secret_name: backup-settings
    examples:
    - enable: false
      endpoint: ''
-      key-id-key: s3-id
-      secret-key: s3-secret
-      secret-name: backup-settings
+      key_id_key: s3-id
+      secret_key: s3-secret
+      secret_name: backup-settings
    properties:
      enable:
        default: false
@@ -60,21 +31,16 @@ options:
      endpoint:
        default: ''
        type: string
-      key-id-key:
+      key_id_key:
        default: s3-id
        type: string
-      secret-key:
+      secret_key:
        default: s3-secret
        type: string
-      secret-name:
+      secret_name:
        default: backup-settings
        type: string
    type: object
-  haveGitea:
-    default: false
-    examples:
-    - false
-    type: boolean
  datasets:
    default: []
    items:
@@ -87,11 +53,6 @@ options:
          type: string
      type: object
    type: array
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
  distributions:
    default:
      core: core
@@ -107,12 +68,52 @@ options:
        default: domain
        type: string
    type: object
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  gitea-ssh-domain:
+    default: ''
+    examples:
+    - ''
+    type: string
+  haveGitea:
+    default: false
+    examples:
+    - false
+    type: boolean
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  stages:
+    default: []
+    items:
+      properties:
+        name:
+          default: prod
+          type: string
+      type: object
+    type: array
 dependencies: []
 providers:
  kubernetes: true
  authentik: null
  kubectl: true
  postgresql: null
+  mysql: null
  restapi: null
  http: null
  gitea: true