Restructure

infra/Makefile

@@ -3,13 +3,10 @@
 default: init apply
 
 init:
-	cd platform \
+	terraform init
-	&& terraform init
 
 plan:
-	platform \
+	terraform plan
-	&& terraform plan
 
 apply:
-	cd platform \
+	terraform apply
-	&& terraform apply

infra/bootstrap.tf

@@ -1,4 +1,4 @@
 module "rke_cluster_bootstrap" {
-  source      = "../modules/kubernetes-cluster-bootstrap"
+  source      = "./modules/kubernetes-cluster-bootstrap"
   kube_config = rke_cluster.cluster.kube_config_yaml
 }

infra/modules/kubernetes-cluster-bootstrap/main.tf

@@ -70,7 +70,7 @@ resource "helm_release" "longhorn" {
 resource "helm_release" "argocd" {
   name       = "argocd"
   repository = "https://argoproj.github.io/argo-helm"
-  chart      = "argocd"
+  chart      = "argo-cd"
   version    = "3.1.2"
 
   namespace        = "argocd"
@@ -78,18 +78,18 @@ resource "helm_release" "argocd" {
 }
 
 # TODO move Vault out of bootstrap
-resource "helm_release" "vault" {
+# resource "helm_release" "vault" {
-  name       = "vault"
+#   name       = "vault"
-  repository = "https://helm.releases.hashicorp.com"
+#   repository = "https://helm.releases.hashicorp.com"
-  chart      = "vault"
+#   chart      = "vault"
-  # TODO upgrade vault helm version
+#   # TODO upgrade vault helm version
-  version    = "0.8.0"
+#   version    = "0.8.0"
 
-  namespace        = "vault"
+#   namespace        = "vault"
-  create_namespace = true
+#   create_namespace = true
 
-  # TODO HA Vault
+#   # TODO HA Vault
-  # TODO Auto unseal Vault
+#   # TODO Auto unseal Vault
-}
+# }
 
 # TODO automatic ingress and tunnel for all services