fix

2023-12-02 20:51:41 +01:00
parent e85aa80323
commit e1cd2ea8f3
16 changed files with 199 additions and 180 deletions
--- a/apps/code-server/datas.tf
+++ b/apps/code-server/datas.tf
@@ -19,5 +19,6 @@ data "kubernetes_secret_v1" "authentik" {

 data "kustomization_overlay" "data" {
  namespace = var.namespace
+  common_labels = local.common-labels
  resources = []
 }
--- a/apps/code-server/index.yaml
+++ b/apps/code-server/index.yaml
@@ -6,6 +6,21 @@ metadata:
  name: code-server
  description: null
 options:
+  admin:
+    default:
+      cluster: false
+      namespace: false
+    examples:
+    - cluster: false
+      namespace: false
+    properties:
+      cluster:
+        default: false
+        type: boolean
+      namespace:
+        default: false
+        type: boolean
+    type: object
  images:
    default:
      codeserver:
@@ -45,11 +60,46 @@ options:
            type: number
        type: object
    type: object
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  sub-domain:
+    default: code
+    examples:
+    - code
+    type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
  timezone:
    default: Europe/Paris
    examples:
    - Europe/Paris
    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  no-editor:
+    default: false
+    examples:
+    - false
+    type: boolean
+  app-group:
+    default: dev
+    examples:
+    - dev
+    type: string
  storage:
    default:
      accessMode: ReadWriteOnce
@@ -77,56 +127,6 @@ options:
        - Block
        type: string
    type: object
-  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
-  no-editor:
-    default: false
-    examples:
-    - false
-    type: boolean
-  sub-domain:
-    default: code
-    examples:
-    - code
-    type: string
-  app-group:
-    default: dev
-    examples:
-    - dev
-    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
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
 dependencies:
 - dist: null
  category: share
--- a/apps/dbgate/datas.tf
+++ b/apps/dbgate/datas.tf
@@ -25,5 +25,7 @@ data "kubernetes_ingress_v1" "authentik" {
 }

 data "kustomization_overlay" "data" {
+  namespace = var.namespace
+  common_labels = local.common-labels
  resources = []
 }
--- a/apps/dbgate/index.yaml
+++ b/apps/dbgate/index.yaml
@@ -6,35 +6,16 @@ metadata:
  name: dbgate
  description: null
 options:
-  sub-domain:
-    default: dbgate
+  domain:
+    default: your-company
    examples:
-    - dbgate
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
+    - your-company
    type: string
  app-group:
    default: dev
    examples:
    - dev
    type: string
-  redis:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        name:
-          default: ''
-          type: string
-        namespace:
-          default: ''
-          type: string
-      type: object
-    type: array
  maria:
    default: []
    examples:
@@ -64,6 +45,45 @@ options:
          type: string
      type: object
    type: array
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  mongo:
+    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
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
  images:
    default:
      dbgate:
@@ -103,35 +123,16 @@ options:
            type: string
        type: object
    type: object
-  mongo:
-    default: []
+  sub-domain:
+    default: dbgate
    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
+    - dbgate
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
  storage:
    default:
      accessMode: ReadWriteOnce
@@ -159,6 +160,20 @@ options:
        - Block
        type: string
    type: object
+  redis:
+    default: []
+    examples:
+    - []
+    items:
+      properties:
+        name:
+          default: ''
+          type: string
+        namespace:
+          default: ''
+          type: string
+      type: object
+    type: array
  pg:
    default: []
    examples:
@@ -188,21 +203,6 @@ options:
          type: string
      type: object
    type: array
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
 dependencies:
 - dist: null
  category: share
--- a/apps/okd/datas.tf
+++ b/apps/okd/datas.tf
@@ -18,5 +18,7 @@ data "kubernetes_secret_v1" "authentik" {
 }

 data "kustomization_overlay" "data" {
+  namespace = var.namespace
+  common_labels = local.common-labels
  resources = []
 }
--- a/apps/okd/index.yaml
+++ b/apps/okd/index.yaml
@@ -6,6 +6,16 @@ metadata:
  name: okd
  description: null
 options:
+  namespaces:
+    default: []
+    items:
+      type: string
+    type: array
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
  sub-domain:
    default: okd
    examples:
@@ -16,16 +26,11 @@ options:
    examples:
    - traefik
    type: string
-  domain:
-    default: your-company
+  issuer:
+    default: letsencrypt-prod
    examples:
-    - your-company
+    - letsencrypt-prod
    type: string
-  namespaces:
-    default: []
-    items:
-      type: string
-    type: array
  images:
    default:
      okd:
@@ -69,25 +74,20 @@ options:
            type: string
        type: object
    type: object
-  domain-name:
-    default: your_company.com
+  app-group:
+    default: infra
    examples:
-    - your_company.com
+    - infra
    type: string
  cluster-admin:
    default: false
    examples:
    - false
    type: boolean
-  issuer:
-    default: letsencrypt-prod
+  domain:
+    default: your-company
    examples:
-    - letsencrypt-prod
-    type: string
-  app-group:
-    default: infra
-    examples:
-    - infra
+    - your-company
    type: string
 dependencies:
 - dist: null
--- a/apps/traefik-ui/datas.tf
+++ b/apps/traefik-ui/datas.tf
@@ -18,5 +18,7 @@ data "kubernetes_secret_v1" "authentik" {
 }

 data "kustomization_overlay" "data" {
+  namespace = var.namespace
+  common_labels = local.common-labels
  resources = []
 }
--- a/apps/traefik-ui/index.yaml
+++ b/apps/traefik-ui/index.yaml
@@ -6,36 +6,36 @@ metadata:
  name: traefik-ui
  description: Access to the Traefik UI
 options:
-  ingress-class:
-    default: traefik
+  domain:
+    default: your-company
    examples:
-    - traefik
-    type: string
-  app-group:
-    default: infra
-    examples:
-    - infra
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
+    - your-company
    type: string
  sub-domain:
    default: traefik
    examples:
    - traefik
    type: string
-  domain:
-    default: your-company
+  ingress-class:
+    default: traefik
    examples:
-    - your-company
+    - traefik
+    type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
    type: string
  issuer:
    default: letsencrypt-prod
    examples:
    - letsencrypt-prod
    type: string
+  app-group:
+    default: infra
+    examples:
+    - infra
+    type: string
 dependencies:
 - dist: null
  category: share