upd(tf): #42 - add makefile + fix namespace

gogolcorp · May 4, 2022 · e8c7832 · e8c7832
1 parent 11abdaf
commit e8c7832
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 5 deletions.
diff --git a/deploy/terraform/.gitignore b/deploy/terraform/.gitignore
@@ -32,3 +32,5 @@ override.tf.json
 # Ignore CLI configuration files
 .terraformrc
 terraform.rc
+
+out.tf
diff --git a/deploy/terraform/Makefile b/deploy/terraform/Makefile
@@ -0,0 +1,13 @@
+help:
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(firstword $(MAKEFILE_LIST)) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+setup: ## Copy sample files 
+	cp terraform.tfvars.sample terraform.tfvars
+	terraform init
+
+apply: ## Up the docker-compose without cache or orphans
+	terraform plan -out out.tfplan
+	terraform apply "out.tfplan"
+
+.PHONY: help
+
diff --git a/deploy/terraform/main.tf b/deploy/terraform/main.tf
@@ -19,8 +19,8 @@ resource "scaleway_rdb_instance" "rdb_instance" {
 }
 
 module "rdb" {
-  source     = "./modules/rdb"
-  
+  source = "./modules/rdb"
+
   depends_on = [scaleway_rdb_instance.rdb_instance]
   for_each   = var.environments
 

diff --git a/deploy/terraform/modules/k8s/outputs.tf b/deploy/terraform/modules/k8s/outputs.tf
@@ -1,4 +1,4 @@
-output "cluster_cluster_id" {
+output "cluster_id" {
   value = scaleway_k8s_cluster.k8s_cluster.id
 }
 
@@ -16,4 +16,8 @@ output "cluster_ca_certificate" {
 
 output "cluster_pool_id" {
   value = scaleway_k8s_pool.k8s_pool.id
-}
+}
+
+output "cluster_kubeconfig" {
+  value = scaleway_k8s_cluster.k8s_cluster.kubeconfig[0].config_file
+}
diff --git a/deploy/terraform/modules/k8s/packages.tf b/deploy/terraform/modules/k8s/packages.tf
@@ -1,4 +1,7 @@
+# Ingress controller ------------------------------------------------
+
 resource "kubernetes_namespace" "ingress" {
+  depends_on = [scaleway_k8s_pool.k8s_pool]
   count = var.install_ingress ? 1 : 0
   metadata {
     name = "ingress"
@@ -15,14 +18,16 @@ resource "helm_release" "ingress" {
   repository = "https://kubernetes.github.io/ingress-nginx"
   chart      = "ingress-nginx"
 
-  // enable to avoid node forwarding
   set {
     name  = "controller.service.externalTrafficPolicy"
     value = "Local"
   }
 }
 
+# Certificate manager -----------------------------------------------
+
 resource "kubernetes_namespace" "cert_manager" {
+  depends_on = [scaleway_k8s_pool.k8s_pool]
   count = var.install_cert_manager ? 1 : 0
   metadata {
     name = "cert-manager"