feat: helm logic

particuleio · Jan 16, 2019 · aeb9d09 · aeb9d09
1 parent ab4d92a
commit aeb9d09
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 27 deletions.
diff --git a/terraform/live/sample/eks-addons/terraform.tfvars b/terraform/live/sample/eks-addons/terraform.tfvars
@@ -10,7 +10,7 @@ terragrunt = {
   terraform {
     source = "../../../modules//eks-addons"
     before_hook "kubeconfig" {
-      commands = ["apply"]
+      commands = ["apply","plan"]
       execute = ["bash","-c","cp ${get_tfvars_dir()}/../eks/kubeconfig kubeconfig"]
     }
     after_hook "cert_manager_cluster_issuers" {
@@ -48,6 +48,7 @@ nginx_ingress = {
 // [cluster_autoscaler]
 //
 cluster_autoscaler = {
+  use_kiam = true
   version = "v1.3.5"
   chart_version = "0.11.0"
   enabled = true
@@ -60,6 +61,7 @@ cluster_autoscaler = {
 // [external_dns]
 //
 external_dns = {
+  use_kiam = true
   version = "v0.5.9"
   chart_version = "1.3.0"
   enabled = true
@@ -71,6 +73,7 @@ external_dns = {
 // [cert_manager]
 //
 cert_manager = {
+  use_kiam = true
   version = "v0.5.2"
   chart_version = "v0.5.2"
   enabled = true
@@ -84,7 +87,7 @@ cert_manager = {
 //
 kiam = {
   version = "v3.0"
-  chart_version = "2.0.1-rc3"
+  chart_version = "2.0.1-rc4"
   enabled = true
   namespace = "kiam"
   extra_values = ""
@@ -105,6 +108,7 @@ metrics_server = {
 // [virtual-kubelet]
 //
 virtual_kubelet = {
+  use_kiam = true
   version = "0.7.4"
   enabled = true
   namespace = "virtual-kubelet"
@@ -122,23 +126,7 @@ virtual_kubelet = {
 //
 prometheus_operator = {
   chart_version = "1.5.1"
-  enabled = true
+  enabled = false
   namespace = "monitoring"
-  extra_values = <<VALUES
-grafana:
-  ingress:
-    enabled: true
-    annotations:
-      certmanager.k8s.io/acme-challenge-type: dns01
-      certmanager.k8s.io/acme-dns01-provider: route53
-      certmanager.k8s.io/cluster-issuer: letsencrypt
-      kubernetes.io/ingress.class: nginx
-      kubernetes.io/tls-acme: "true"
-    hosts:
-      - grafana.archifleks.net
-    tls:
-      - secretName: grafana-archifleks-net
-        hosts:
-          - grafana.archifleks.net
-VALUES
+  extra_values = ""
 }
diff --git a/terraform/live/sample/eks/terraform.tfvars b/terraform/live/sample/eks/terraform.tfvars
@@ -12,6 +12,10 @@ terragrunt = {
       commands = ["apply"]
       execute = ["bash","-c","terraform output config_map_aws_auth 2>/dev/null | kubectl --kubeconfig ${get_tfvars_dir()}/kubeconfig apply -f -"]
     }
+    after_hook "helm" {
+      commands = ["apply"]
+      execute = ["bash","-c","terraform output helm_rbac 2>/dev/null | kubectl --kubeconfig ${get_tfvars_dir()}/kubeconfig apply -f -"]
+    }
   }
 }
 
@@ -36,7 +40,7 @@ vpc = {
 //
 // [dns]
 //
-use_route53 = true
+use_route53 = false
 domain_name = "archifleks.net"
 subdomain_name = "eks"
 
@@ -50,7 +54,8 @@ kubernetes_version = "1.11"
 // [cluster_autoscaler]
 //
 cluster_autoscaler = {
-  create_iam_resources = true
+  create_iam_resources = false
+  create_iam_resources_kiam = true
   attach_to_pool = 0
   iam_policy = <<POLICY
 {
@@ -77,7 +82,8 @@ POLICY
 // [external_dns]
 //
 external_dns = {
-  create_iam_resources = true
+  create_iam_resources = false
+  create_iam_resources_kiam = true
   attach_to_pool = 0
   iam_policy = <<POLICY
 {
@@ -111,7 +117,8 @@ POLICY
 // [cert_manager]
 //
 cert_manager = {
-  create_iam_resources = true
+  create_iam_resources = false
+  create_iam_resources_kiam = true
   attach_to_pool = 0
   iam_policy = <<POLICY
 {
@@ -146,7 +153,8 @@ kiam = {
 }
 
 virtual_kubelet = {
-  create_iam_resources = true
+  create_iam_resources_kiam = true
+  create_cloudwatch_log_group = true
   cloudwatch_log_group = "virtual-kubelet"
 }
 
@@ -161,7 +169,7 @@ node-pools = [
     volume_size = 30
     volume_type = "gp2"
     autoscaling = "disabled"
-    kubelet_extra_args = "--kubelet-extra-args '--node-labels node-role.kubernetes.io/controller=\"\" --register-with-taints node-role.kubernetes.io/controller=:NoSchedule'"
+    kubelet_extra_args = "--kubelet-extra-args '--node-labels node-role.kubernetes.io/controller=\"\" --register-with-taints node-role.kubernetes.io/controller=:NoSchedule --kube-reserved cpu=250m,memory=0.5Gi --system-reserved cpu=250m,memory=0.2Gi,ephemeral-storage=1Gi,ephemeral-storage=1Gi --eviction-hard memory.available<500Mi,nodefs.available<10%'"
   },
   {
     name = "default"
@@ -173,6 +181,6 @@ node-pools = [
     volume_size = 30
     volume_type = "gp2"
     autoscaling = "enabled"
-    kubelet_extra_args = "--kubelet-extra-args '--node-labels node-role.kubernetes.io/node=\"\"'"
+    kubelet_extra_args = "--kubelet-extra-args '--node-labels node-role.kubernetes.io/node=\"\" --kube-reserved cpu=250m,memory=0.5Gi --system-reserved cpu=250m,memory=0.2Gi,ephemeral-storage=1Gi,ephemeral-storage=1Gi --eviction-hard memory.available<500Mi,nodefs.available<10%'"
   },
 ]