From 63af07f07407f1ec23789ffde6e2f01e81eb4b1c Mon Sep 17 00:00:00 2001
From: viktorbarzin <vbarzin@gmail.com>
Date: Mon, 3 May 2021 14:59:17 +0100
Subject: [PATCH] add mysql cluster [ci skip]

---
 main.tf                                          | 3 +++
 modules/kubernetes/dbaas/mysql_chart_values.yaml | 4 ++--
 modules/kubernetes/main.tf                       | 8 ++++----
 modules/kubernetes/versions.tf                   | 4 ++++
 versions.tf                                      | 2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/main.tf b/main.tf
index 0d340c45..87fb6519 100644
--- a/main.tf
+++ b/main.tf
@@ -69,6 +69,9 @@ provider "helm" {
   }
 }
 # provider "kubectl" {
+#   config_path = var.prod ? "" : "~/.kube/config"
+# }
+# provider "kubectl" {
 # host                   = "kubernetes.viktorbarzin.lan"
 # cluster_ca_certificate = base64decode(var.eks_cluster_ca)
 # token                  = data.aws_eks_cluster_auth.main.token
diff --git a/modules/kubernetes/dbaas/mysql_chart_values.yaml b/modules/kubernetes/dbaas/mysql_chart_values.yaml
index e5494455..e0a7934d 100644
--- a/modules/kubernetes/dbaas/mysql_chart_values.yaml
+++ b/modules/kubernetes/dbaas/mysql_chart_values.yaml
@@ -3,11 +3,11 @@ orchestrator:
   persistence:
     enabled: false
   ingress:
-    enabled: true
+    enable: false
     hosts:
     - host: db.viktorbarzin.me
       paths:
-      # - path: /
+      - path: /
     tls:
     - secretName: ${secretName}
       hosts:
diff --git a/modules/kubernetes/main.tf b/modules/kubernetes/main.tf
index 9d058a8e..22566880 100644
--- a/modules/kubernetes/main.tf
+++ b/modules/kubernetes/main.tf
@@ -49,10 +49,10 @@ module "bind" {
   named_conf_options  = var.bind_named_conf_options
 }
 
-# module "dbaas" {
-#   source          = "./dbaas"
-#   tls_secret_name = var.tls_secret_name
-# }
+module "dbaas" {
+  source          = "./dbaas"
+  tls_secret_name = var.tls_secret_name
+}
 
 module "descheduler" {
   source = "./descheduler"
diff --git a/modules/kubernetes/versions.tf b/modules/kubernetes/versions.tf
index 5d7c4592..d0e41025 100644
--- a/modules/kubernetes/versions.tf
+++ b/modules/kubernetes/versions.tf
@@ -3,6 +3,10 @@ terraform {
     kubernetes = {
       source = "hashicorp/kubernetes"
     }
+    # kubectl = {
+    #   source  = "gavinbunney/kubectl"
+    #   version = ">= 1.10.0"
+    # }
   }
   required_version = ">= 0.13"
 }
diff --git a/versions.tf b/versions.tf
index 08edb954..d0e41025 100644
--- a/versions.tf
+++ b/versions.tf
@@ -5,7 +5,7 @@ terraform {
     }
     # kubectl = {
     #   source  = "gavinbunney/kubectl"
-    #   version = ">= 1.7.0"
+    #   version = ">= 1.10.0"
     # }
   }
   required_version = ">= 0.13"