From f6115c1a02857607a7339aa9e3d08b8f9aee36a4 Mon Sep 17 00:00:00 2001
From: Victor Barba Martin <victor.barba@navigaglobal.com>
Date: Mon, 15 Nov 2021 17:10:29 +0100
Subject: [PATCH] refactor pipeline

---
 docker/coturn-dns/Dockerfile  |  6 ++--
 terraform/.terraform.lock.hcl | 58 ++++++++++++++++++-----------------
 terraform/kubernetes.tf       | 36 ----------------------
 terraform/lke.tf              | 18 +++--------
 terraform/terraform.tf        |  3 +-
 5 files changed, 39 insertions(+), 82 deletions(-)

diff --git a/docker/coturn-dns/Dockerfile b/docker/coturn-dns/Dockerfile
index e97067e..c728b50 100644
--- a/docker/coturn-dns/Dockerfile
+++ b/docker/coturn-dns/Dockerfile
@@ -2,9 +2,7 @@ FROM python:3
 
 WORKDIR /app
 
-COPY requirements.txt requirements.txt
+COPY docker/coturn-dns/requirements.txt requirements.txt
 RUN pip3 install -r requirements.txt
-
-COPY pod-node-register.py .
-
+COPY docker/coturn-dns/. .
 CMD [ "python3", "pod-node-register.py"]
\ No newline at end of file
diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl
index 1bb0caf..09fcdee 100644
--- a/terraform/.terraform.lock.hcl
+++ b/terraform/.terraform.lock.hcl
@@ -19,20 +19,20 @@ provider "registry.terraform.io/gavinbunney/kubectl" {
 }
 
 provider "registry.terraform.io/hashicorp/aws" {
-  version = "3.63.0"
+  version = "3.65.0"
   hashes = [
-    "h1:Z+2GvXLgqQ/uPMH8dv+dXJ/t+jd6sriYjhCJS6kSO6g=",
-    "zh:42c6c98b294953a4e1434a331251e539f5372bf6779bd61ab5df84cac0545287",
-    "zh:5493773762a470889c9a23db97582d3a82035847c8d3bd13323b4c3012abf325",
-    "zh:550d22ff9fed4d817a922e7b84bd9d1f2ef8d3afa00832cf66b8cd5f0e6dc748",
-    "zh:632cb5e2d9d5041875f57174236eafe5b05dbf26750c1041ab57eb08c5369fe2",
-    "zh:7cfeaf5bde1b28bd010415af1f3dc494680a8374f1a26ec19db494d99938cc4e",
-    "zh:99d871606b67c8aefce49007315de15736b949c09a9f8f29ad8af1e9ce383ed3",
-    "zh:c4fc8539ffe90df5c7ae587fde495fac6bc0186fec2f2713a8988a619cef265f",
-    "zh:d0a26493206575c99ca221d78fe64f96a8fbcebe933af92eea6b39168c1f1c1d",
-    "zh:e156fdc964fdd4a7586ec15629e20d2b06295b46b4962428006e088145db07d6",
-    "zh:eb04fc80f652b5c92f76822f0fec1697581543806244068506aed69e1bb9b2af",
-    "zh:f5638a533cf9444f7d02b5527446cdbc3b2eab8bcc4ec4b0ca32035fe6f479d3",
+    "h1:GCDkcISN83t+JK2U+ie3vaECnyxK0Sr6GjO7IrBOVeo=",
+    "zh:108aeaf5e18087d9ac852737a5be1347a28e40825817cc1a29ec523d40268294",
+    "zh:1a719c0c9754f906b2220d3bbf90d483ec0a74cf87768a464d2d657b7901ec6b",
+    "zh:21acdc35ae70a626cbc81eff06181a78843f1ddc2d9200f80fabf2e0466ecbda",
+    "zh:28846628e1a4227a1f2db256d6b22ed36922f37632999af7404aa74703cd9bfb",
+    "zh:32455550dbf86ae07d9782650e86d23c4fa13d7872e48680044692894e8da6ea",
+    "zh:4241246274627c752f9aef2806e810053306001e80fc5b51d27cbe997f75f95e",
+    "zh:5ca0fab3ceb3f41a97c1ebd29561a034cb83fda04da35fd5f8c3c5cb97bb3ea8",
+    "zh:5fed3b79d4ed6424055e8bbfb7a4393e8db5102cdba04b4590f8e0f4194637fb",
+    "zh:99a0bc325b0a59ded1152546c004953a2bb0e110978bf0cc55e1804384941bdb",
+    "zh:e74f9190a417c891992210f9af937ef55749d86a04762d982260fbbc989342a7",
+    "zh:fb6984405ca63d0373bd992ce157e933b8ae9dd94d74b1c5691632f062fe60b2",
   ]
 }
 
@@ -113,21 +113,23 @@ provider "registry.terraform.io/kbst/kustomization" {
 }
 
 provider "registry.terraform.io/linode/linode" {
-  version = "1.18.0"
+  version     = "1.24.0"
+  constraints = "1.24.0"
   hashes = [
-    "h1:vzGqhhDzEN8pJ6KIr8cXdzvyNb133PLkL9pQGpNgdo4=",
-    "zh:0ead391cba4eccff9d46c91e9260ce5e2ccfd69e2aebef253768ce29e2de3a7d",
-    "zh:27708a55d1ba1594086c2015441243a38a608f68ea2f82f1d759c6baf2a0df14",
-    "zh:3d355a270e7eaeafd5044a326c527c23742b312376368e1019e3caa779cdbc91",
-    "zh:41dde82124e6c2e2640ef2963fe4f6faf16f8e8b82e7dbaebfdec7b781f5455a",
-    "zh:51e9139cdc1386053c6834585139dc74d6fb7653a00b495377bc445b5e532218",
-    "zh:6ba6560bf23736a2a6e4c0899afd2c25cac6697d90cf2573449fe9b655f87920",
-    "zh:79c1fa8e3a8705eee73f171229ff47688deaff8468cdf28fddaafe5aef7e2d8d",
-    "zh:80b008ded1c71313c4f76e5569142e3a56b866f7693e57270d15f13fc7af1e14",
-    "zh:b0ebb1e83e8d999dc1d8feecf9c1e293cd61fe72271610284fdcce46d4a8a7ed",
-    "zh:bdaa786f0381ccd61404ea1835733e852e9747f1daf9a63bd4149073dbce85b6",
-    "zh:c67cd9e8d4880dfa6cbbd25aa7fcd9c07a76f4801180ac3988ff3f84ede6181f",
-    "zh:c8ee62dfd07d83dd362b8ba5f13a957e1ec8107b22ac168da4fa8470c4537a33",
-    "zh:cf7bdc5eac5df6cfc6ab5c7cafaba72b6bf5a155017e25edc6d9dc192bb6d2ed",
+    "h1:k1aiT3JCgzUvNxpT5EznQSRigqEdAwaSkQ4PoJVhXDM=",
+    "zh:06d87467ec78e7dc9c57bcdd1874a648c8e463ea067b158c00583e71aa26dfa1",
+    "zh:1ed95f626255e53dfa9df3b2a2c67a1445ae5224bbc9244c1bc4961e635aabfa",
+    "zh:3e6b338004f9cf82e7a6aaeffae7d0e064489b12ed1898400cf9c13703f0e5d0",
+    "zh:40e18d4fdeac61a06cf1e5208ad46bcf5d989083ad535c9450c46c425098dd4a",
+    "zh:4c35b67a148d0cac7a42c919c3cfd2198bc113ae3c12167b3ad8dc6aa785ec84",
+    "zh:5240744778bc865a8c2f14a71649b7a0097cdb681e48359ba3718f8b516fc577",
+    "zh:54af2b3cb45d17fc5563e7d1b86aafc38d3f4ac11b0aaf42ca9c74d53fdff7dc",
+    "zh:79c675e7251090761a4010aafaf144c4cea6940b49c4341f72d6a04126214543",
+    "zh:8538680134057d39fed6a010327faed12d26c8d33a369662766e2818777a7a8b",
+    "zh:8c8423769e0aae0f291fa381ab78e13c51d6c8f49336cbb7fd8a1a990a9f941f",
+    "zh:bcda0537da1ddccd2f05e9e123086a6b84aaeb11a22082d6734c777a95162ff0",
+    "zh:bfa7fc09a14c764b90280ab7414d376238515d80e940cdd0bc84fa1943e3b55c",
+    "zh:d44c1ba3514d19356c5654821ae43ede198bff1c1e5b5d496292f66fb750ca9f",
+    "zh:fae47b8424f7a38a844f78508f8b05cc69c2110b04fa9df666173d50761e855b",
   ]
 }
diff --git a/terraform/kubernetes.tf b/terraform/kubernetes.tf
index b377568..cfbed0d 100644
--- a/terraform/kubernetes.tf
+++ b/terraform/kubernetes.tf
@@ -56,39 +56,3 @@ resource "kubernetes_secret" "bitbucket_ssh_argocd_key" {
   }
 
 }
-
-resource "kubernetes_namespace" "coturn" {
-  depends_on = [local_file.kubeconfig]
-
-  metadata {
-    name = "coturn"
-  }
-}
-resource "kubernetes_config_map" "coturn_pool" {
-  metadata {
-    name      = "linode-pool"
-    namespace = "coturn"
-  }
-
-  data = {
-    pool = linode_lke_cluster.stg-video-cluster.pool[2].id
-  }
-}
-
-resource "kubernetes_namespace" "webrtc" {
-  depends_on = [local_file.kubeconfig]
-
-  metadata {
-    name = "webrtc"
-  }
-}
-resource "kubernetes_config_map" "webrtc_pool" {
-  metadata {
-    name      = "linode-pool"
-    namespace = "webrtc"
-  }
-
-  data = {
-    pool = linode_lke_cluster.stg-video-cluster.pool[1].id
-  }
-}
diff --git a/terraform/lke.tf b/terraform/lke.tf
index b21a458..643892d 100644
--- a/terraform/lke.tf
+++ b/terraform/lke.tf
@@ -6,21 +6,13 @@ resource "linode_lke_cluster" "stg-video-cluster" {
   region      = "us-central"
   tags        = ["staging"]
 
-  # Services
   pool {
     type  = "g6-standard-2"
-    count = 1
-  }
-
-  # WebRTC-BE pool
-  pool {
-    type  = "g6-standard-2"
-    count = 1
-  }
-  # Coturn pool
-  pool {
-    type  = "g6-standard-2"
-    count = 1
+    count = 3
+    autoscaler {
+      min = 3
+      max = 10
+    }
   }
 
 }
diff --git a/terraform/terraform.tf b/terraform/terraform.tf
index 9e74ec9..a1e07da 100644
--- a/terraform/terraform.tf
+++ b/terraform/terraform.tf
@@ -9,7 +9,8 @@ terraform {
   }
   required_providers {
     linode = {
-      source = "linode/linode"
+      source  = "linode/linode"
+      version = "1.24.0"
     }
     kustomization = {
       source  = "kbst/kustomization"