feat: sync live with features

Signed-off-by: ArchiFleKs <[email protected]>
particuleio · Sep 9, 2019 · 8aed741 · 8aed741
1 parent 96fd935
commit 8aed741
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 12 deletions.
diff --git a/terraform/live/sample/eks-addons/terragrunt.hcl b/terraform/live/sample/eks-addons/terragrunt.hcl
@@ -23,14 +23,15 @@ terraform {
 locals {
   cluster-name = "sample"
   env          = "sample"
+  aws_region   = "eu-west-1"
 }
 
 inputs = {
 
   cluster-name = local.cluster-name
 
   aws = {
-    "region" = "eu-west-1"
+    "region" = local.aws_region
   }
 
   eks = {
@@ -60,7 +61,7 @@ EXTRA_VALUES
   }
 
   cluster_autoscaler = {
-    create_iam_resources_kiam = true
+    create_iam_resources_kiam = false
 
     iam_policy = <<POLICY
 {
@@ -98,7 +99,7 @@ EXTRA_VALUES
   }
 
   external_dns = {
-    create_iam_resources_kiam = true
+    create_iam_resources_kiam = false
 
     iam_policy = <<POLICY
 {
@@ -272,7 +273,7 @@ EXTRA_VALUES
     cloudwatch_log_group        = "eks-virtual-kubelet"
     version                     = "0.7.4"
     enabled                     = false
-    default_network_policy      = true
+    default_network_policy      = false
     namespace                   = "virtual-kubelet"
     cpu                         = "20"
     memory                      = "40Gi"
@@ -313,7 +314,7 @@ EXTRA_VALUES
   }
 
   fluentd_cloudwatch = {
-    create_iam_resources_kiam = true
+    create_iam_resources_kiam = false
     iam_policy = <<POLICY
 {
     "Version": "2012-10-17",
@@ -334,8 +335,8 @@ EXTRA_VALUES
 POLICY
     chart_version          = "0.10.2"
     version                = "v1.4.2-debian-cloudwatch-1.1"
-    enabled                = true
-    default_network_policy = true
+    enabled                = false
+    default_network_policy = false
     namespace              = "fluentd-cloudwatch"
     log_group_name         = "/aws/eks/sample/containers"
     timeout                = 3600
@@ -350,8 +351,8 @@ VALUES
   npd = {
     chart_version = "1.5.2"
     version = "v0.7.0"
-    enabled = true
-    default_network_policy = true
+    enabled = false
+    default_network_policy = false
     namespace = "node-problem-detector"
     timeout = 3600
     force_update = false
@@ -411,8 +412,8 @@ EXTRA_VALUES
   }
 
   cni_metrics_helper = {
-    create_iam_resources_kiam = true
-    enabled = true
+    create_iam_resources_kiam = false
+    enabled = false
     version = "v1.5.0"
     iam_policy = <<POLICY
 {
@@ -433,4 +434,50 @@ EXTRA_VALUES
 POLICY
   }
 
+  kong = {
+    version                = "1.3"
+    chart_version          = "0.17.0"
+    enabled                = false
+    default_network_policy = false
+    ingress_cidr           = "0.0.0.0/0"
+    namespace              = "kong"
+    timeout                = 3600
+    force_update           = false
+    recreate_pods          = false
+    wait                   = true
+
+    extra_values           = <<EXTRA_VALUES
+EXTRA_VALUES
+  }
+
+  rancher = {
+    chart_version = "2.2.8"
+    version = "v2.2.8"
+    enabled = false
+    channel = "stable"
+    default_network_policy = false
+    namespace = "rancher"
+    timeout = 3600
+    force_update = false
+    recreate_pods = false
+    wait = true
+
+    extra_values = <<EXTRA_VALUES
+EXTRA_VALUES
+  }
+
+  keycloak = {
+    chart_version = "5.1.7"
+    version = "6.0.1"
+    enabled = false
+    default_network_policy = false
+    namespace = "keycloak"
+    timeout = 3600
+    force_update = false
+    recreate_pods = false
+    wait = true
+
+    extra_values = <<EXTRA_VALUES
+EXTRA_VALUES
+  }
 }
diff --git a/terraform/live/sample/eks/terragrunt.hcl b/terraform/live/sample/eks/terragrunt.hcl
@@ -44,6 +44,7 @@ terraform {
 locals {
   cluster-name = "sample"
   env          = "sample"
+  key_name     = "sample"
 }
 
 inputs = {
@@ -130,6 +131,28 @@ spec:
   - Ingress
 EXTRA_NETWORK_POLICIES
 
+custom_tags = {
+  Env = local.env
+}
+
+custom_tags_list = []
+
+bastion = {
+  create = true
+  image_id = "ami-08c1db9058a6ce304"
+  instance_type = "t3.small"
+  key_name = local.key_name
+  volume_size = 10
+  volume_type = "gp2"
+  vpc_zone_identifier = []
+  cidr_blocks = [
+    "0.0.0.0/0"
+  ]
+
+  user_data = <<USER_DATA
+USER_DATA
+}
+
 node-pools = [
   {
     name = "default"
@@ -143,7 +166,7 @@ EXTRA_USER_DATA
     vpc_zone_identifier = []
     gpu_ami = false
     instance_type = "t3.medium"
-    key_name = "keypair"
+    key_name = local.key_name
     volume_size = 50
     volume_type = "gp2"
     autoscaling = "enabled"