From 2dcfe651af3e6d41bf977eb5438e28607d6008a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Sun, 21 Jan 2024 10:10:23 +0100 Subject: [PATCH] fix --- apps/gitea/index.yaml | 360 ++++++++++++++++++------------------- apps/gitea/presentation.tf | 2 +- apps/okd/index.yaml | 70 ++++---- apps/okd/presentation.tf | 2 +- 4 files changed, 217 insertions(+), 217 deletions(-) diff --git a/apps/gitea/index.yaml b/apps/gitea/index.yaml index bf11bbb..c1e0430 100644 --- a/apps/gitea/index.yaml +++ b/apps/gitea/index.yaml @@ -9,16 +9,49 @@ 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: - ssh-sub-domain: - default: git + default-branch: + default: main examples: - - git + - main type: string - theme: - default: gitea-modern + replicas: + default: 1 examples: - - gitea-modern - type: string + - 1 + type: integer + redis: + default: + exporter: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + image: quay.io/opstree/redis:v7.0.12 + storage: 2Gi + examples: + - exporter: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + image: quay.io/opstree/redis:v7.0.12 + storage: 2Gi + properties: + exporter: + default: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + properties: + enabled: + default: true + type: boolean + image: + default: quay.io/opstree/redis-exporter:v1.44.0 + type: string + type: object + image: + default: quay.io/opstree/redis:v7.0.12 + type: string + storage: + default: 2Gi + type: string + type: object webhook: default: allowed-hosts: private @@ -34,6 +67,11 @@ options: default: false type: boolean type: object + release: + default: 8.3.0 + examples: + - 8.3.0 + type: string volume: default: accessMode: ReadWriteOnce @@ -53,11 +91,71 @@ options: default: 10Gi type: string type: object - app-group: - default: dev + sub-domain: + default: git examples: - - dev + - git type: string + domain: + default: your-company + examples: + - your-company + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + ingress-class: + default: traefik + examples: + - traefik + type: string + 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 + postgres: + default: + replicas: 1 + storage: 10Gi + version: '14' + examples: + - replicas: 1 + storage: 10Gi + version: '14' + properties: + replicas: + default: 1 + type: integer + storage: + default: 10Gi + type: string + version: + default: '14' + type: string + type: object + disable-registration: + default: true + examples: + - true + type: boolean + ssh-port: + default: 2222 + examples: + - 2222 + type: integer load-balancer: default: ip: '' @@ -68,30 +166,84 @@ options: default: '' type: string type: object - disable-registration: - default: true + push-create: + default: + org: 'true' + private: 'false' + user: 'true' examples: - - true - type: boolean - default-branch: - default: main + - org: 'true' + private: 'false' + user: 'true' + properties: + org: + default: 'true' + type: string + private: + default: 'false' + type: string + user: + default: 'true' + type: string + type: object + images: + default: + gitea: + pullPolicy: IfNotPresent + registry: docker.io + repository: gitea/gitea + tag: 1.20.5-rootless examples: - - main + - gitea: + pullPolicy: IfNotPresent + registry: docker.io + repository: gitea/gitea + tag: 1.20.5-rootless + properties: + gitea: + default: + pullPolicy: IfNotPresent + registry: docker.io + repository: gitea/gitea + tag: 1.20.5-rootless + properties: + pullPolicy: + default: IfNotPresent + enum: + - Always + - Never + - IfNotPresent + type: string + registry: + default: docker.io + type: string + repository: + default: gitea/gitea + type: string + tag: + default: 1.20.5-rootless + type: string + type: object + type: object + app-group: + default: dev + examples: + - dev type: string - replicas: - default: 1 + theme: + default: gitea-modern examples: - - 1 - type: integer - domain: - default: your-company - examples: - - your-company + - gitea-modern type: string - release: - default: 8.3.0 + ssh-sub-domain: + default: git examples: - - 8.3.0 + - git + type: string + domain-name: + default: your_company.com + examples: + - your_company.com type: string backups: default: @@ -199,163 +351,11 @@ options: default: false type: boolean type: object - ssh-port: - default: 2222 - examples: - - 2222 - type: integer - postgres: - default: - replicas: 1 - storage: 10Gi - version: '14' - examples: - - replicas: 1 - storage: 10Gi - version: '14' - properties: - replicas: - default: 1 - type: integer - storage: - default: 10Gi - type: string - version: - default: '14' - type: string - type: object - redis: - default: - exporter: - enabled: true - image: quay.io/opstree/redis-exporter:v1.44.0 - image: quay.io/opstree/redis:v7.0.12 - storage: 2Gi - examples: - - exporter: - enabled: true - image: quay.io/opstree/redis-exporter:v1.44.0 - image: quay.io/opstree/redis:v7.0.12 - storage: 2Gi - properties: - exporter: - default: - enabled: true - image: quay.io/opstree/redis-exporter:v1.44.0 - properties: - enabled: - default: true - type: boolean - image: - default: quay.io/opstree/redis-exporter:v1.44.0 - type: string - type: object - image: - default: quay.io/opstree/redis:v7.0.12 - type: string - storage: - default: 2Gi - type: string - type: object - sub-domain: - default: git - examples: - - git - 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 - images: - default: - gitea: - pullPolicy: IfNotPresent - registry: docker.io - repository: gitea/gitea - tag: 1.20.5-rootless - examples: - - gitea: - pullPolicy: IfNotPresent - registry: docker.io - repository: gitea/gitea - tag: 1.20.5-rootless - properties: - gitea: - default: - pullPolicy: IfNotPresent - registry: docker.io - repository: gitea/gitea - tag: 1.20.5-rootless - properties: - pullPolicy: - default: IfNotPresent - enum: - - Always - - Never - - IfNotPresent - type: string - registry: - default: docker.io - type: string - repository: - default: gitea/gitea - type: string - tag: - default: 1.20.5-rootless - type: string - type: object - type: object - ingress-class: - default: traefik - examples: - - traefik - type: string - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - push-create: - default: - org: 'true' - private: 'false' - user: 'true' - examples: - - org: 'true' - private: 'false' - user: 'true' - properties: - org: - default: 'true' - type: string - private: - default: 'false' - type: string - user: - default: 'true' - type: string - type: object timezone: default: Europe/Paris examples: - Europe/Paris type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string dependencies: - dist: null category: share diff --git a/apps/gitea/presentation.tf b/apps/gitea/presentation.tf index 70b0357..f78aec6 100644 --- a/apps/gitea/presentation.tf +++ b/apps/gitea/presentation.tf @@ -2,7 +2,7 @@ locals { 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 = "logo192.png" + icon = "assets/img/logo.svg" request_headers = { "Content-Type" = "application/json" Authorization = "Bearer ${data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]}" diff --git a/apps/okd/index.yaml b/apps/okd/index.yaml index 4b5d135..b4bd73a 100644 --- a/apps/okd/index.yaml +++ b/apps/okd/index.yaml @@ -6,41 +6,6 @@ metadata: name: okd description: null options: - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - cluster-admin: - default: false - examples: - - false - type: boolean - domain: - default: your-company - examples: - - your-company - type: string - namespaces: - default: [] - items: - type: string - type: array - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - ingress-class: - default: traefik - examples: - - traefik - type: string - app-group: - default: infra - examples: - - infra - type: string images: default: okd: @@ -80,16 +45,51 @@ options: type: string type: object type: object + namespaces: + default: [] + items: + type: string + type: array sub-domain: default: okd examples: - okd type: string + domain: + default: your-company + examples: + - your-company + type: string managed: default: false examples: - false type: boolean + app-group: + default: infra + examples: + - infra + type: string + ingress-class: + default: traefik + examples: + - traefik + type: string + cluster-admin: + default: false + examples: + - false + type: boolean + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string dependencies: - dist: null category: share diff --git a/apps/okd/presentation.tf b/apps/okd/presentation.tf index 62f7174..328abae 100644 --- a/apps/okd/presentation.tf +++ b/apps/okd/presentation.tf @@ -2,7 +2,7 @@ locals { 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 = "static/assets/okd-logo.svg" + icon = "static/assets/public/imgs/okd-favicon.png" request_headers = { "Content-Type" = "application/json" Authorization = "Bearer ${data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]}"