fix

meta/domain-infra/apps.tf

@@ -17,7 +17,7 @@ locals {
     traefik = { for k, v in var.traefik : k => v if k!="enable" }
     dns = { for k, v in var.dns : k => v if k!="enable" }
     api = { for k, v in var.api : k => v if k!="enable" }
-    okd = { for k, v in var.okd : k => v if k!="enable" }
+    okd = merge({"cluster-admin" = true}, { for k, v in var.okd : k => v if k!="enable" })
 }
 
 resource "kubernetes_namespace_v1" "infra-ns" {
@@ -65,7 +65,7 @@ resource "kubectl_manifest" "traefik" {
 }
 
 resource "kubectl_manifest" "k8s_api" {
-  count = var.traefik.enable ? 1 : 0
+  count = var.api.enable ? 1 : 0
   yaml_body  = <<-EOF
     apiVersion: "vynil.solidite.fr/v1"
     kind: "Install"
@@ -88,7 +88,7 @@ resource "kubectl_manifest" "okd" {
     apiVersion: "vynil.solidite.fr/v1"
     kind: "Install"
     metadata:
-      name: "okd"
+      name: "infra-okd"
       namespace: "${kubernetes_namespace_v1.infra-ns[0].metadata[0].name}"
       labels: ${jsonencode(local.common-labels)}
     spec:

meta/domain-infra/index.yaml

@@ -6,56 +6,6 @@ metadata:
   name: domain-infra
   description: null
 options:
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  app-group:
-    default: infra
-    examples:
-    - infra
-    type: string
-  okd:
-    default:
-      enable: false
-    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  traefik:
-    default:
-      enable: false
-      namespace: traefik
-    examples:
-    - enable: false
-      namespace: traefik
-    properties:
-      enable:
-        default: false
-        type: boolean
-      namespace:
-        default: traefik
-        type: string
-    type: object
-  api:
-    default:
-      enable: false
-    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
   storage-classes:
     default:
       BlockReadWriteMany: ''
@@ -81,17 +31,32 @@ options:
         default: ''
         type: string
     type: object
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
   issuer:
     default: letsencrypt-prod
     examples:
     - letsencrypt-prod
     type: string
-  dns:
+  traefik:
+    default:
+      enable: false
+      namespace: traefik
+    examples:
+    - enable: false
+      namespace: traefik
+    properties:
+      enable:
+        default: false
+        type: boolean
+      namespace:
+        default: traefik
+        type: string
+    type: object
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  api:
     default:
       enable: false
     examples:
@@ -116,6 +81,11 @@ options:
         default: domain
         type: string
     type: object
+  app-group:
+    default: infra
+    examples:
+    - infra
+    type: string
   backups:
     default:
       enable: false
@@ -146,6 +116,36 @@ options:
         default: backup-settings
         type: string
     type: object
+  okd:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+  dns:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
 dependencies: []
 providers:
   kubernetes: true