From 21dc36946f8c698a4ec197792297f2ec2857653c Mon Sep 17 00:00:00 2001
From: viktorbarzin <vbarzin@gmail.com>
Date: Sun, 19 Sep 2021 00:03:30 +0000
Subject: [PATCH] Drone CI Update TLS Certificates Commit

---
 main.tf                                |  8 ++---
 modules/kubernetes/main.tf             | 24 ++++++++------
 modules/kubernetes/oauth-proxy/main.tf | 44 +++++++++++++-------------
 3 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/main.tf b/main.tf
index d5b1e3ce..df3298ab 100644
--- a/main.tf
+++ b/main.tf
@@ -31,8 +31,8 @@ variable "drone_github_client_id" {}
 variable "drone_github_client_secret" {}
 variable "drone_rpc_secret" {}
 # variable "dockerhub_password" {}
-variable "oauth_client_id" {}
-variable "oauth_client_secret" {}
+# variable "oauth_client_id" {}
+# variable "oauth_client_secret" {}
 variable "url_shortener_mysql_password" {}
 variable "url_shortener_geolite_license_key" {}
 variable "url_shortener_api_key" {}
@@ -218,8 +218,8 @@ module "kubernetes_cluster" {
   drone_rpc_secret           = var.drone_rpc_secret
 
   # Oauth proxy
-  oauth_client_id     = var.oauth_client_id
-  oauth_client_secret = var.oauth_client_secret
+  # oauth_client_id     = var.oauth_client_id
+  # oauth_client_secret = var.oauth_client_secret
   # depends_on = [module.k8s_master, module.k8s_node1, module.k8s_node2] # wait until master and at least 2 nodes are up
 
   idrac_username = var.monitoring_idrac_username
diff --git a/modules/kubernetes/main.tf b/modules/kubernetes/main.tf
index 1c583373..a8cd555b 100644
--- a/modules/kubernetes/main.tf
+++ b/modules/kubernetes/main.tf
@@ -19,8 +19,8 @@ variable "drone_github_client_id" {}
 variable "drone_github_client_secret" {}
 variable "drone_rpc_secret" {}
 # variable "dockerhub_password" {}
-variable "oauth_client_id" {}
-variable "oauth_client_secret" {}
+# variable "oauth_client_id" {}
+# variable "oauth_client_secret" {}
 variable "url_shortener_geolite_license_key" {}
 variable "url_shortener_api_key" {}
 variable "url_shortener_mysql_password" {}
@@ -147,14 +147,14 @@ module "monitoring" {
   depends_on = [null_resource.core_services]
 }
 
-module "oauth" {
-  source          = "./oauth-proxy"
-  tls_secret_name = var.tls_secret_name
-  client_id       = var.oauth_client_id
-  client_secret   = var.oauth_client_secret
+# module "oauth" {
+#   source          = "./oauth-proxy"
+#   tls_secret_name = var.tls_secret_name
+#   client_id       = var.oauth_client_id
+#   client_secret   = var.oauth_client_secret
 
-  depends_on = [null_resource.core_services]
-}
+#   depends_on = [null_resource.core_services]
+# }
 
 module "openid_help_page" {
   source          = "./openid_help_page"
@@ -188,6 +188,12 @@ module "reloader" {
   source = "./reloader"
 }
 
+module "city-guesser" {
+  source          = "./city-guesser"
+  tls_secret_name = var.tls_secret_name
+  depends_on      = [null_resource.core_services]
+}
+
 module "url" {
   source              = "./url-shortener"
   tls_secret_name     = var.tls_secret_name
diff --git a/modules/kubernetes/oauth-proxy/main.tf b/modules/kubernetes/oauth-proxy/main.tf
index fc3145f6..25d25363 100644
--- a/modules/kubernetes/oauth-proxy/main.tf
+++ b/modules/kubernetes/oauth-proxy/main.tf
@@ -1,19 +1,18 @@
-variable "tls_secret_name" {}
+variable "namespace" {
+  type = string
+}
+variable "host" {
+  type = string
+}
+variable "tls_secret_name" {
+  type = string
+}
+variable "svc_name" {
+  type = string
+}
 variable "client_id" {}
 variable "client_secret" {}
 
-resource "kubernetes_namespace" "oauth" {
-  metadata {
-    name = "oauth"
-  }
-}
-
-module "tls_secret" {
-  source          = "../setup_tls_secret"
-  namespace       = "oauth"
-  tls_secret_name = var.tls_secret_name
-}
-
 resource "random_password" "cookie" {
   length           = 16
   special          = true
@@ -23,7 +22,7 @@ resource "random_password" "cookie" {
 resource "kubernetes_deployment" "oauth_proxy" {
   metadata {
     name      = "oauth-proxy"
-    namespace = "oauth"
+    namespace = var.namespace
     labels = {
       run = "oauth-proxy"
     }
@@ -80,8 +79,8 @@ resource "kubernetes_deployment" "oauth_proxy" {
 
 resource "kubernetes_service" "oauth_proxy" {
   metadata {
-    name      = "oauth-proxy"
-    namespace = "oauth"
+    name      = var.svc_name
+    namespace = var.namespace
     labels = {
       run = "oauth-proxy"
     }
@@ -102,24 +101,25 @@ resource "kubernetes_service" "oauth_proxy" {
 resource "kubernetes_ingress" "oauth" {
   metadata {
     name      = "oauth-ingress"
-    namespace = "oauth"
+    namespace = var.namespace
     annotations = {
-      "kubernetes.io/ingress.class" = "nginx"
+      "kubernetes.io/ingress.class"           = "nginx"
+      "nginx.ingress.kubernetes.io/use-regex" = "true"
     }
   }
 
   spec {
     tls {
-      hosts       = ["oauth.viktorbarzin.me"]
+      hosts       = [var.host]
       secret_name = var.tls_secret_name
     }
     rule {
-      host = "oauth.viktorbarzin.me"
+      host = var.host
       http {
         path {
-          path = "/"
+          path = "/oauth2/.*"
           backend {
-            service_name = "oauth-proxy"
+            service_name = var.svc_name
             service_port = "80"
           }
         }