feat: keycloak

NaturalSelectionLabs · Dec 31, 2023 · 677d1bc · 677d1bc
1 parent 80d775f
commit 677d1bc
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 35 deletions.
diff --git a/application.tf b/application.tf
@@ -29,37 +29,37 @@
 #  }
 #}
 
-#resource "argocd_application" "keycloak" {
-#  metadata {
-#    name      = "keycloak"
-#    namespace = "guardian"
-#  }
-#  spec {
-#    project = argocd_project.guardian.metadata[0].name
-#
-#    source {
-#      repo_url        = var.repo_url
-#      target_revision = "HEAD"
-#      path            = "keycloak/prod"
-#      plugin {
-#        name = "avp-kustomize"
-#        env {
-#          name = "APP_REPO"
-#          value = "NaturalSelectionLabs/Hephaestus"
-#        }
-#        env {
-#          name = "AVP_SECRET"
-#          value = "guardian:avp-prod"
-#        }
-#      }
-#    }
-#
-#    destination {
-#      server    = argocd_cluster.prod.server
-#      namespace = "guardian"
-#    }
-#  }
-#}
+resource "argocd_application" "keycloak" {
+  metadata {
+    name      = "keycloak"
+    namespace = "guardian"
+  }
+  spec {
+    project = argocd_project.guardian.metadata[0].name
+
+    source {
+      repo_url        = var.repo_url
+      target_revision = "HEAD"
+      path            = "keycloak/prod"
+      plugin {
+        name = "avp-kustomize"
+        env {
+          name = "APP_REPO"
+          value = "NaturalSelectionLabs/Hephaestus"
+        }
+        env {
+          name = "AVP_SECRET"
+          value = "guardian:avp-prod"
+        }
+      }
+    }
+
+    destination {
+      server    = argocd_cluster.prod.server
+      namespace = "guardian"
+    }
+  }
+}
 
 resource "argocd_application" "jaeger" {
   metadata {

diff --git a/cluster.tf b/cluster.tf
@@ -15,7 +15,7 @@ resource "argocd_cluster" "dev" {
   }
 
   lifecycle {
-    ignore_changes = ["config"]
+    ignore_changes = [config]
   }
 }
 
@@ -36,7 +36,7 @@ resource "argocd_cluster" "prod" {
   }
 
   lifecycle {
-    ignore_changes = ["config"]
+    ignore_changes = [config]
   }
 }
 

diff --git a/keycloak/prod/secret.yaml b/keycloak/prod/secret.yaml
@@ -4,7 +4,7 @@ metadata:
   name: keycloak-db-creds
   namespace: guardian
   annotations:
-    avp.kubernetes.io/path: "kv/data/guardian/keycloak-db-creds"
+    avp.kubernetes.io/path: "kv/data/guardian/keycloak"
 type: Opaque
 stringData:
   username: "<username>"

diff --git a/vault/prod/route.yaml b/vault/prod/route.yaml
@@ -5,7 +5,6 @@ metadata:
   namespace: guardian
 spec:
   entryPoints:
-    - web
     - websecure
   routes:
     - match: Host(`vault.prod.naturalselectionlabs.com`)