diff --git a/terraform/live/sample/eks-addons/terraform.tfvars b/terraform/live/sample/eks-addons/terraform.tfvars index ec5e45e5..354c0358 100644 --- a/terraform/live/sample/eks-addons/terraform.tfvars +++ b/terraform/live/sample/eks-addons/terraform.tfvars @@ -9,17 +9,20 @@ terragrunt = { terraform { source = "../../../modules//eks-addons" + before_hook "kubeconfig" { - commands = ["apply","plan"] - execute = ["bash","-c","cp ${get_tfvars_dir()}/../eks/kubeconfig kubeconfig"] + commands = ["apply", "plan"] + execute = ["bash", "-c", "cp ${get_tfvars_dir()}/../eks/kubeconfig kubeconfig"] } + before_hook "helm_repo_update" { - commands = ["apply","plan"] - execute = ["bash","-c","helm repo update"] + commands = ["apply", "plan"] + execute = ["bash", "-c", "helm repo update"] } + after_hook "cert_manager_cluster_issuers" { commands = ["apply"] - execute = ["bash","-c","terraform output cert_manager_cluster_issuers 2>/dev/null | kubectl --kubeconfig kubeconfig apply -f - | true"] + execute = ["bash", "-c", "terraform output cert_manager_cluster_issuers 2>/dev/null | kubectl --kubeconfig kubeconfig apply -f - | true"] } } } @@ -32,108 +35,153 @@ aws = { } eks = { - "kubeconfig_path" = "./kubeconfig" + "kubeconfig_path" = "./kubeconfig" "remote_state_bucket" = "sample-terraform-remote-state" - "remote_state_key" = "sample/eks" + "remote_state_key" = "sample/eks" } // // [nginx_ingress] // nginx_ingress = { - version = "0.21.0" - chart_version = "1.1.2" - enabled = false - namespace = "ingress-nginx" - extra_values = "" - use_nlb = false + version = "0.24.1" + chart_version = "1.6.16" + enabled = true + default_network_policy = false + ingress_cidr = "0.0.0.0/0" + namespace = "ingress-nginx" + extra_values = </dev/null > ${get_tfvars_dir()}/kubeconfig"] + execute = ["bash", "-c", "terraform output kubeconfig 2>/dev/null > ${get_tfvars_dir()}/kubeconfig"] } + after_hook "configmap" { commands = ["apply"] - execute = ["bash","-c","terraform output config_map_aws_auth 2>/dev/null | kubectl --kubeconfig ${get_tfvars_dir()}/kubeconfig apply -f -"] + execute = ["bash", "-c", "terraform output config_map_aws_auth 2>/dev/null | kubectl --kubeconfig ${get_tfvars_dir()}/kubeconfig apply -f -"] } + after_hook "calico" { commands = ["apply"] - execute = ["bash","-c","terraform output calico_yaml 2>/dev/null | kubectl --kubeconfig ${get_tfvars_dir()}/kubeconfig apply -f -"] + execute = ["bash", "-c", "terraform output calico_yaml 2>/dev/null | kubectl --kubeconfig ${get_tfvars_dir()}/kubeconfig apply -f -"] } + after_hook "cni_metrics_helper" { commands = ["apply"] - execute = ["bash","-c","terraform output cni_metrics_helper_yaml 2>/dev/null | kubectl --kubeconfig ${get_tfvars_dir()}/kubeconfig apply -f -"] + execute = ["bash", "-c", "terraform output cni_metrics_helper_yaml 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 -"] + execute = ["bash", "-c", "terraform output helm_rbac 2>/dev/null | kubectl --kubeconfig ${get_tfvars_dir()}/kubeconfig apply -f -"] + } + + after_hook "kube-system-label" { + commands = ["apply"] + execute = ["bash", "-c", "kubectl --kubeconfig ${get_tfvars_dir()}/kubeconfig label --overwrite ns kube-system name=kube-system"] + } + + after_hook "network-policies" { + commands = ["apply"] + execute = ["bash", "-c", "terraform output network_policies 2>/dev/null | kubectl --kubeconfig ${get_tfvars_dir()}/kubeconfig apply -f -"] } } } @@ -38,10 +54,10 @@ aws = { // [vpc] // vpc = { - create = true - cidr = "10.0.0.0/16" - vpc_id = "vpc-0fd2efe63408f5aba" - public_subnets_id = "subnet-0a60f7202528d8f64,subnet-0f7deaa3e53b86817,subnet-0f58143b87ef10257" + create = true + cidr = "10.0.0.0/16" + vpc_id = "vpc-0fd2efe63408f5aba" + public_subnets_id = "subnet-0a60f7202528d8f64,subnet-0f7deaa3e53b86817,subnet-0f58143b87ef10257" private_subnets_id = "subnet-0b0cca9118459c6c9,subnet-0296207fa6ff0c9ce,subnet-00f139ff79e016c19" } @@ -49,22 +65,48 @@ vpc = { // [dns] // use_route53 = false + domain_name = "example.domain" + subdomain_name = "eks" // // [kubernetes] // cluster-name = "sample" -kubernetes_version = "1.11" + +kubernetes_version = "1.12" + +endpoint_private_access = true + +endpoint_public_access = true + +enabled_cluster_log_types = ["api", "audit", "authenticator", "controllerManager", "scheduler"] + +cluster_log_retention_in_days = 180 + +allowed_cidr_blocks = ["0.0.0.0/0"] + +ssh_remote_security_group_id = "" + +map_users = <