add tls and node_port variable

StayWell · Jun 24, 2020 · 870f16b · 870f16b
1 parent 93cf646
commit 870f16b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/main.tf b/main.tf
@@ -39,7 +39,7 @@ resource "kubernetes_cluster_role_binding" "this" {
 
 resource "kubernetes_service_account" "this" {
   automount_service_account_token = true
-  
+
   metadata {
     name      = "this"
     namespace = kubernetes_namespace.this.metadata[0].name
@@ -151,8 +151,9 @@ resource "kubernetes_service" "this" {
     }
 
     port {
-      name = "http"
-      port = var.web_port
+      name      = "http"
+      port      = var.web_port
+      node_port = var.node_port
     }
 
     port {
@@ -175,7 +176,8 @@ resource "kubernetes_ingress" "this" {
     namespace = kubernetes_namespace.this.metadata[0].name
 
     annotations = {
-      "kubernetes.io/ingress.class" = "nginx"
+      "kubernetes.io/ingress.class"                    = "nginx"
+      "nginx.ingress.kubernetes.io/force-ssl-redirect" = true
     }
   }
 
@@ -185,7 +187,7 @@ resource "kubernetes_ingress" "this" {
 
       http {
         path {
-          path = "/*"
+          path = "/"
 
           backend {
             service_name = kubernetes_service.this.metadata[0].name
@@ -194,6 +196,10 @@ resource "kubernetes_ingress" "this" {
         }
       }
     }
+
+    tls {
+      hosts = [var.host]
+    }
   }
 
   lifecycle {

diff --git a/variables.tf b/variables.tf
@@ -42,6 +42,11 @@ variable "web_port" {
   default     = "8080"
 }
 
+variable "node_port" {
+  description = "https://www.terraform.io/docs/providers/kubernetes/r/service.html#node_port"
+  default     = ""
+}
+
 variable "jnlp_port" {
   description = "JNLP port exposed for Jenkins agents"
   default     = "50000"