From c9240230400ed26a4945f21c40c4ae737b8afb40 Mon Sep 17 00:00:00 2001 From: Andrew S Date: Fri, 23 Apr 2021 16:06:51 +0600 Subject: [PATCH 1/4] #30 Updated EKS module version --- terraform/layer1-aws/aws-eks.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/layer1-aws/aws-eks.tf b/terraform/layer1-aws/aws-eks.tf index 9eb67cae..d7072fc4 100644 --- a/terraform/layer1-aws/aws-eks.tf +++ b/terraform/layer1-aws/aws-eks.tf @@ -1,6 +1,6 @@ module "eks" { source = "terraform-aws-modules/eks/aws" - version = "14.0.0" + version = "15.1.0" cluster_name = local.name cluster_version = var.eks_cluster_version From 07b506ebe11ac73c08128b7391103e10f085511e Mon Sep 17 00:00:00 2001 From: Andrew S Date: Fri, 23 Apr 2021 16:16:15 +0600 Subject: [PATCH 2/4] #30 Updated cluster autoscaler chart and version --- terraform/layer2-k8s/README.md | 9 +++------ terraform/layer2-k8s/eks-cluster-autoscaler.tf | 7 ++++--- .../layer2-k8s/templates/cluster-autoscaler-values.yaml | 7 +++++-- terraform/layer2-k8s/variables.tf | 9 +++++++-- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/terraform/layer2-k8s/README.md b/terraform/layer2-k8s/README.md index 13730930..3c60f3be 100644 --- a/terraform/layer2-k8s/README.md +++ b/terraform/layer2-k8s/README.md @@ -24,21 +24,18 @@ | additional\_allowed\_ips | IP addresses allowed to connect to private resources | `list(any)` | `[]` | no | | alb\_ingress\_chart\_version | Version of alb-ingress helm chart | `string` | `"1.0.4"` | no | | alb\_ingress\_image\_tag | Tag of docker image for alb-ingress controller | `string` | `"v1.1.5"` | no | -| alertmanager\_slack\_channel | Slack channel for alertmanager alerts | `string` | `"madops-demo-alerts"` | no | | allowed\_account\_ids | List of allowed AWS account IDs | `list` | `[]` | no | | aws\_node\_termination\_handler\_version | Version of aws-node-termination-handler helm chart | `string` | `"0.13.3"` | no | | calico\_daemonset | Version of calico helm chart | `string` | `"0.3.4"` | no | | cert\_manager\_version | Version of cert-manager helm chart | `string` | `"1.1.0"` | no | -| cluster\_autoscaler\_version | Version of autoscaler helm chart | `string` | `"1.1.0"` | no | +| cluster\_autoscaler\_chart\_version | Version of cluster autoscaler helm chart | `string` | `"9.9.2"` | no | +| cluster\_autoscaler\_version | Version of cluster autoscaler | `string` | `"v1.19.0"` | no | | elk\_index\_retention\_days | Days before remove index from system elasticsearch | `number` | `14` | no | | elk\_snapshot\_retention\_days | Days to capture index in snapshot | `number` | `90` | no | | elk\_version | Version of ELK helm chart | `string` | `"7.8.0"` | no | | external\_dns\_version | Version of external-dns helm chart | `string` | `"4.9.4"` | no | | external\_secrets\_version | Version of external-secrets helm chart | `string` | `"6.3.0"` | no | | gitlab\_runner\_version | Version of gitlab runner helm chart | `string` | `"0.26.0"` | no | -| grafana\_gitlab\_group | Gitlab group for grafana oauth | `string` | `"madops"` | no | -| kibana\_gitlab\_group | Gitlab group for kibana oauth2 | `string` | `"madops"` | no | -| loki\_datasource\_for\_prometheus\_stack | Enable Loki Datasource in prometheus stack chart | `bool` | `false` | no | | loki\_stack | Version of Loki Stack helm chart | `string` | `"2.3.1"` | no | | nginx\_ingress\_controller\_version | Version of nginx-ingress helm chart | `string` | `"3.23.0"` | no | | nginx\_ingress\_ssl\_terminator | Select SSL termination type | `string` | `"lb"` | no | @@ -48,7 +45,7 @@ | redis\_version | Version of redis helm chart | `string` | `"12.7.3"` | no | | region | Default infrastructure region | `string` | `"us-east-1"` | no | | reloader\_version | Version of reloader helm chart | `string` | `"0.0.81"` | no | -| remote\_state\_bucket | Name of the bucket with the state | `string` | `"madops-terraform-state-us-east-1"` | no | +| remote\_state\_bucket | Name of the bucket for terraform state | `string` | n/a | yes | | remote\_state\_key | Key of the remote state for terraform\_remote\_state | `string` | `"layer1-aws"` | no | ## Outputs diff --git a/terraform/layer2-k8s/eks-cluster-autoscaler.tf b/terraform/layer2-k8s/eks-cluster-autoscaler.tf index 6d186cd7..c234b7c3 100644 --- a/terraform/layer2-k8s/eks-cluster-autoscaler.tf +++ b/terraform/layer2-k8s/eks-cluster-autoscaler.tf @@ -14,14 +14,15 @@ data "template_file" "cluster_autoscaler" { role_arn = module.aws_iam_autoscaler.role_arn region = local.region cluster_name = local.eks_cluster_id + version = var.cluster_autoscaler_version } } resource "helm_release" "cluster_autoscaler" { - name = "cluster-autoscaler-chart" - chart = "cluster-autoscaler-chart" + name = "cluster-autoscaler" + chart = "cluster-autoscaler" repository = local.helm_repo_cluster_autoscaler - version = var.cluster_autoscaler_version + version = var.cluster_autoscaler_chart_version namespace = kubernetes_namespace.sys.id values = [ diff --git a/terraform/layer2-k8s/templates/cluster-autoscaler-values.yaml b/terraform/layer2-k8s/templates/cluster-autoscaler-values.yaml index 2f0d423e..ed588064 100644 --- a/terraform/layer2-k8s/templates/cluster-autoscaler-values.yaml +++ b/terraform/layer2-k8s/templates/cluster-autoscaler-values.yaml @@ -1,3 +1,6 @@ +image: + tag: ${version} + awsRegion: ${region} rbac: @@ -23,5 +26,5 @@ affinity: - matchExpressions: - key: node.kubernetes.io/lifecycle operator: In - values: - - ondemand \ No newline at end of file + values: + - ondemand diff --git a/terraform/layer2-k8s/variables.tf b/terraform/layer2-k8s/variables.tf index c27d2993..d8fbed6e 100644 --- a/terraform/layer2-k8s/variables.tf +++ b/terraform/layer2-k8s/variables.tf @@ -72,8 +72,13 @@ variable "alb_ingress_chart_version" { # Cluster autoscaler variable "cluster_autoscaler_version" { - description = "Version of autoscaler helm chart" - default = "1.1.0" + description = "Version of cluster autoscaler" + default = "v1.19.0" +} + +variable "cluster_autoscaler_chart_version" { + description = "Version of cluster autoscaler helm chart" + default = "9.9.2" } # Prometheus Operator From 89607d0d7ff83e6449a46e98cd22ff9e40e96ca5 Mon Sep 17 00:00:00 2001 From: Andrew S Date: Fri, 23 Apr 2021 16:16:37 +0600 Subject: [PATCH 3/4] #30 Updated EKS cluster version --- terraform/layer1-aws/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/layer1-aws/variables.tf b/terraform/layer1-aws/variables.tf index d1ea16a2..4a81903c 100644 --- a/terraform/layer1-aws/variables.tf +++ b/terraform/layer1-aws/variables.tf @@ -91,7 +91,7 @@ variable "single_nat_gateway" { # EKS variable "eks_cluster_version" { - default = "1.18" + default = "1.19" description = "Version of the EKS K8S cluster" } From 356071ad9abd924e3a7c6d8fd3bf1e63f509c3e1 Mon Sep 17 00:00:00 2001 From: Andrew S Date: Fri, 23 Apr 2021 16:30:14 +0600 Subject: [PATCH 4/4] #30 Updated EKS cluster version in example tfvars --- terraform/layer1-aws/demo.tfvars.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/layer1-aws/demo.tfvars.example b/terraform/layer1-aws/demo.tfvars.example index 6f1f6f62..4c96125f 100644 --- a/terraform/layer1-aws/demo.tfvars.example +++ b/terraform/layer1-aws/demo.tfvars.example @@ -18,7 +18,7 @@ single_nat_gateway = true ########## # EKS ########## -eks_cluster_version = "1.18" +eks_cluster_version = "1.19" eks_worker_groups = { spot = {