fix

apps/okd/deploy.tf

@@ -3,7 +3,7 @@ resource "kubectl_manifest" "deploy" {
     apiVersion: apps/v1
     kind: Deployment
     metadata:
-      name: "${var.component}-${var.instance}"
+      name: "${var.instance}-${var.component}"
       namespace: "${var.namespace}"
       labels: ${jsonencode(local.common-labels)}
     spec:
@@ -53,7 +53,7 @@ resource "kubectl_manifest" "deploy" {
               successThreshold: 1
               timeoutSeconds: 1
           restartPolicy: Always
-          serviceAccount: "${var.component}-${var.instance}"
-          serviceAccountName: "${var.component}-${var.instance}"
+          serviceAccount: "${var.instance}-${var.component}"
+          serviceAccountName: "${var.instance}-${var.component}"
  EOF
 }

apps/okd/index.yaml

@@ -6,36 +6,26 @@ metadata:
   name: okd
   description: The console is a more friendly kubectl in the form of a single page webapp. It also integrates with other services like monitoring, chargeback, and OLM.
 options:
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
   app_group:
     default: infra
     examples:
     - infra
     type: string
-  issuer:
-    default: letsencrypt-prod
+  cluster-admin:
+    default: false
     examples:
-    - letsencrypt-prod
-    type: string
-  sub_domain:
-    default: okd
-    examples:
-    - okd
-    type: string
+    - false
+    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:
       okd:
@@ -75,12 +65,17 @@ options:
             type: string
         type: object
     type: object
-  managed:
-    default: false
+  ingress_class:
+    default: traefik
     examples:
-    - false
-    type: boolean
-  cluster-admin:
+    - traefik
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  managed:
     default: false
     examples:
     - false
@@ -90,10 +85,12 @@ options:
     items:
       type: string
     type: array
+  sub_domain:
+    default: okd
+    examples:
+    - okd
+    type: string
 dependencies:
-- dist: null
-  category: share
-  component: authentik-forward
 - dist: null
   category: core
   component: secret-generator

apps/okd/rbac.tf

@@ -6,7 +6,7 @@ resource "kubectl_manifest" "okd_sa" {
     apiVersion: v1
     kind: ServiceAccount
     metadata:
-      name: "${var.component}-${var.instance}"
+      name: "${var.instance}-${var.component}"
       namespace: "${var.namespace}"
       labels: ${jsonencode(local.common-labels)}
   EOF
@@ -18,7 +18,7 @@ resource "kubectl_manifest" "okd_crb_admin" {
     apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRoleBinding
     metadata:
-      name: "${var.namespace}-${var.component}-${var.instance}"
+      name: "${var.namespace}-${var.instance}-${var.component}"
       labels: ${jsonencode(local.common-labels)}
     roleRef:
       apiGroup: rbac.authorization.k8s.io
@@ -26,7 +26,7 @@ resource "kubectl_manifest" "okd_crb_admin" {
       name: cluster-admin
     subjects:
     - kind: ServiceAccount
-      name: "${var.component}-${var.instance}"
+      name: "${var.instance}-${var.component}"
       namespace: "${var.namespace}"
   EOF
 }
@@ -37,7 +37,7 @@ resource "kubectl_manifest" "okd_roles" {
     apiVersion: rbac.authorization.k8s.io/v1
     kind: Role
     metadata:
-      name: "${var.namespace}-${var.component}-${var.instance}"
+      name: "${var.namespace}-${var.instance}-${var.component}"
       namespace: "${local.sorted-namespaces[count.index]}"
       labels: ${jsonencode(local.common-labels)}
     rules:
@@ -53,16 +53,16 @@ resource "kubectl_manifest" "okd_role_bindings" {
     apiVersion: rbac.authorization.k8s.io/v1
     kind: RoleBinding
     metadata:
-      name: "${var.namespace}-${var.component}-${var.instance}"
+      name: "${var.namespace}-${var.instance}-${var.component}"
       namespace: "${local.sorted-namespaces[count.index]}"
       labels: ${jsonencode(local.common-labels)}
     subjects:
     - kind: ServiceAccount
-      name: "${var.component}-${var.instance}"
+      name: "${var.instance}-${var.component}"
       namespace: "${var.namespace}"
     roleRef:
       kind: Role
-      name: "${var.namespace}-${var.component}-${var.instance}"
+      name: "${var.namespace}-${var.instance}-${var.component}"
       apiGroup: rbac.authorization.k8s.io
   EOF
 }
@@ -73,7 +73,7 @@ resource "kubectl_manifest" "okd_clusterrole" {
     apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRole
     metadata:
-      name: "${var.namespace}-${var.component}-${var.instance}-list"
+      name: "${var.namespace}-${var.instance}-${var.component}-list"
       labels: ${jsonencode(local.common-labels)}
     rules:
     - apiGroups: [""]
@@ -92,16 +92,16 @@ resource "kubectl_manifest" "okd_clusterrole_bindings" {
     apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRoleBinding
     metadata:
-      name: "${var.namespace}-${var.component}-${var.instance}-list"
+      name: "${var.namespace}-${var.instance}-${var.component}-list"
       namespace: "${local.sorted-namespaces[count.index]}"
       labels: ${jsonencode(local.common-labels)}
     subjects:
     - kind: ServiceAccount
-      name: "${var.component}-${var.instance}"
+      name: "${var.instance}-${var.component}"
       namespace: "${var.namespace}"
     roleRef:
       kind: ClusterRole
-      name: "${var.namespace}-${var.component}-${var.instance}-list"
+      name: "${var.namespace}-${var.instance}-${var.component}-list"
       apiGroup: rbac.authorization.k8s.io
   EOF
 }