From e07baec28da1b45fe43cc6261f8e6a85b93334a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Fri, 26 Jan 2024 16:20:37 +0100 Subject: [PATCH] fix --- apps/code-server/index.yaml | 90 ++++++++++++++++---------------- apps/code-server/presentation.tf | 2 +- apps/okd/index.yaml | 52 +++++++++--------- apps/okd/presentation.tf | 2 +- apps/traefik-ui/index.yaml | 10 ++-- apps/traefik-ui/presentation.tf | 2 +- 6 files changed, 79 insertions(+), 79 deletions(-) diff --git a/apps/code-server/index.yaml b/apps/code-server/index.yaml index 1eec2f9..046b41f 100644 --- a/apps/code-server/index.yaml +++ b/apps/code-server/index.yaml @@ -6,40 +6,10 @@ metadata: name: code-server description: null options: - timezone: - default: Europe/Paris + domain: + default: your-company examples: - - Europe/Paris - type: string - app_group: - default: dev - examples: - - dev - type: string - no-editor: - default: false - examples: - - false - type: boolean - admin: - default: - cluster: false - namespace: false - examples: - - cluster: false - namespace: false - properties: - cluster: - default: false - type: boolean - namespace: - default: false - type: boolean - type: object - sub-domain: - default: code - examples: - - code + - your-company type: string images: default: @@ -80,15 +50,45 @@ options: type: number type: object type: object - domain: - default: your-company + no-editor: + default: false examples: - - your-company + - false + type: boolean + app_group: + default: dev + examples: + - dev type: string - ingress_class: - default: traefik + sub-domain: + default: code examples: - - traefik + - code + type: string + domain_name: + default: your-company.com + examples: + - your-company.com + type: string + admin: + default: + cluster: false + namespace: false + examples: + - cluster: false + namespace: false + properties: + cluster: + default: false + type: boolean + namespace: + default: false + type: boolean + type: object + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod type: string storage: default: @@ -127,15 +127,15 @@ options: type: string type: object type: object - issuer: - default: letsencrypt-prod + timezone: + default: Europe/Paris examples: - - letsencrypt-prod + - Europe/Paris type: string - domain_name: - default: your-company.com + ingress_class: + default: traefik examples: - - your-company.com + - traefik type: string dependencies: - dist: null diff --git a/apps/code-server/presentation.tf b/apps/code-server/presentation.tf index 8becb2a..361ae6d 100644 --- a/apps/code-server/presentation.tf +++ b/apps/code-server/presentation.tf @@ -8,7 +8,7 @@ locals { Authorization = "Bearer ${data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]}" } service = { - "name" = "${var.component}-${var.instance}" + "name" = "${var.instance}${var.component==""?"":"-"}${var.component}" "port" = { "number" = 80 } diff --git a/apps/okd/index.yaml b/apps/okd/index.yaml index b50a289..0d740c0 100644 --- a/apps/okd/index.yaml +++ b/apps/okd/index.yaml @@ -6,26 +6,41 @@ metadata: name: okd description: null options: + domain: + default: your-company + examples: + - your-company + type: string issuer: default: letsencrypt-prod examples: - letsencrypt-prod type: string - managed: - default: false - examples: - - false - type: boolean - sub-domain: - default: okd - examples: - - okd - type: string domain_name: default: your_company.com examples: - your_company.com type: string + app_group: + default: infra + examples: + - infra + type: string + sub-domain: + default: okd + examples: + - okd + type: string + cluster-admin: + default: false + examples: + - false + type: boolean + namespaces: + default: [] + items: + type: string + type: array images: default: okd: @@ -65,31 +80,16 @@ options: type: string type: object type: object - domain: - default: your-company - examples: - - your-company - type: string - app_group: - default: infra - examples: - - infra - type: string ingress_class: default: traefik examples: - traefik type: string - cluster-admin: + managed: default: false examples: - false type: boolean - namespaces: - default: [] - items: - type: string - type: array dependencies: - dist: null category: share diff --git a/apps/okd/presentation.tf b/apps/okd/presentation.tf index 199b770..59ac7f9 100644 --- a/apps/okd/presentation.tf +++ b/apps/okd/presentation.tf @@ -8,7 +8,7 @@ locals { Authorization = "Bearer ${data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]}" } service = { - "name" = "${var.component}-${var.instance}" + "name" = "${var.instance}${var.component==""?"":"-"}${var.component}" "port" = { "number" = 80 } diff --git a/apps/traefik-ui/index.yaml b/apps/traefik-ui/index.yaml index 8eacdc0..2a433f9 100644 --- a/apps/traefik-ui/index.yaml +++ b/apps/traefik-ui/index.yaml @@ -11,6 +11,11 @@ options: examples: - traefik type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string domain: default: your-company examples: @@ -21,11 +26,6 @@ options: examples: - traefik type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string app_group: default: infra examples: diff --git a/apps/traefik-ui/presentation.tf b/apps/traefik-ui/presentation.tf index 68eda6f..eea0a4b 100644 --- a/apps/traefik-ui/presentation.tf +++ b/apps/traefik-ui/presentation.tf @@ -8,7 +8,7 @@ locals { Authorization = "Bearer ${data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]}" } service = { - "name" = "${var.component}-${var.instance}" + "name" = "${var.instance}${var.component==""?"":"-"}${var.component}" "port" = { "number" = 80 }