From 5b742e5b707d1654d1959ca2965b79da04d087a2 Mon Sep 17 00:00:00 2001
From: viktorbarzin <vbarzin@gmail.com>
Date: Thu, 25 Feb 2021 21:55:00 +0000
Subject: [PATCH] website www host, dns ipv6

---
 modules/kubernetes/blog/main.tf               | 12 +++++++++++
 modules/kubernetes/drone/main.tf              | 20 +++++++++----------
 modules/kubernetes/main.tf                    |  8 ++++----
 .../monitoring/grafana_chart_values.yaml      |  2 ++
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/modules/kubernetes/blog/main.tf b/modules/kubernetes/blog/main.tf
index 9bb65fd6..e870f194 100644
--- a/modules/kubernetes/blog/main.tf
+++ b/modules/kubernetes/blog/main.tf
@@ -129,5 +129,17 @@ resource "kubernetes_ingress" "blog" {
         }
       }
     }
+    rule {
+      host = "www.viktorbarzin.me"
+      http {
+        path {
+          path = "/"
+          backend {
+            service_name = "blog"
+            service_port = "80"
+          }
+        }
+      }
+    }
   }
 }
diff --git a/modules/kubernetes/drone/main.tf b/modules/kubernetes/drone/main.tf
index 35ae19a9..f7ab0958 100644
--- a/modules/kubernetes/drone/main.tf
+++ b/modules/kubernetes/drone/main.tf
@@ -63,16 +63,16 @@ resource "kubernetes_deployment" "drone_server" {
         container {
           image = "drone/drone:1"
           name  = "drone-server"
-          resources {
-            limits = {
-              cpu    = "1"
-              memory = "1Gi"
-            }
-            requests = {
-              cpu    = "500m"
-              memory = "1Gi"
-            }
-          }
+          # resources {
+          #   limits = {
+          #     cpu    = "1"
+          #     memory = "1Gi"
+          #   }
+          #   requests = {
+          #     cpu    = "500m"
+          #     memory = "1Gi"
+          #   }
+          # }
           port {
             container_port = 80
           }
diff --git a/modules/kubernetes/main.tf b/modules/kubernetes/main.tf
index 809d4e8d..b4062947 100644
--- a/modules/kubernetes/main.tf
+++ b/modules/kubernetes/main.tf
@@ -136,10 +136,10 @@ module "privatebin" {
   depends_on = [null_resource.core_services]
 }
 
-module "vault" {
-  source          = "./vault"
-  tls_secret_name = var.tls_secret_name
-}
+# module "vault" {
+#   source          = "./vault"
+#   tls_secret_name = var.tls_secret_name
+# }
 
 module "webhook_handler" {
   source          = "./webhook_handler"
diff --git a/modules/kubernetes/monitoring/grafana_chart_values.yaml b/modules/kubernetes/monitoring/grafana_chart_values.yaml
index 1502ee25..fc16dff3 100644
--- a/modules/kubernetes/monitoring/grafana_chart_values.yaml
+++ b/modules/kubernetes/monitoring/grafana_chart_values.yaml
@@ -48,6 +48,8 @@ grafana.ini:
     logs: "/var/log/grafana"
     plugins: "/var/lib/grafana/plugins"
     provisioning: "/etc/grafana/provisioning"
+  security:
+    allow_embedding: true  # Allow to be iframed
 dashboards:
   default:
     node_exporter: