Bump versions

farioas · farioas · commit 91bf9ef23481 · 2023-04-17T19:06:08.000+01:00
diff --git a/.github/workflows/cicd_pipeline.yml b/.github/workflows/cicd_pipeline.yml
@@ -20,7 +20,7 @@ concurrency:
 
 env:
   TFSEC_VERSION: "v1.28.1"
-  TFLINT_VERSION: "v0.42.2"
+  TFLINT_VERSION: "v0.46.0"
 
 jobs:
 
diff --git a/terraform/aws/env/.terraform.lock.hcl b/terraform/aws/env/.terraform.lock.hcl
diff --git a/terraform/aws/env/main.tf b/terraform/aws/env/main.tf
@@ -204,6 +204,8 @@ module "cert-manager" {
 }
 
 module "label-studio" {
+  count            = var.deploy_label_studio ? 1 : 0
+
   source = "../../common/modules/label-studio"
 
   name                     = local.name_prefix
diff --git a/terraform/aws/env/variables.tf b/terraform/aws/env/variables.tf
@@ -157,7 +157,7 @@ variable "label_studio_helm_chart_name" {
 variable "label_studio_helm_chart_version" {
   description = "Label Studio Helm chart version"
   type        = string
-  default     = "1.0.3"
+  default     = "1.0.16"
 }
 
 # Label Studio Docker registry
@@ -195,6 +195,12 @@ variable "enterprise" {
   default     = false
 }
 
+variable "deploy_label_studio" {
+  description = "Include Label Studio module?"
+  type        = bool
+  default     = true
+}
+
 variable "license_literal" {
   description = "License link for enterprise Label Studio"
   type        = string
diff --git a/terraform/aws/env/version.tf b/terraform/aws/env/version.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "= 4.61.0"
+      version = "= 4.63.0"
     }
     helm = {
       source  = "hashicorp/helm"
diff --git a/terraform/aws/examples/enterprise.tfvars b/terraform/aws/examples/enterprise.tfvars
@@ -17,8 +17,8 @@ enterprise      = true
 license_literal = "<SECRET>"
 
 # Docker private registry credentials
-label_studio_registry_username = "<SECRET>"
-label_studio_registry_password = "<SECRET>"
+label_studio_docker_registry_username = "<SECRET>"
+label_studio_docker_registry_password = "<SECRET>"
 
 # Redis
 redis_type     = "elasticache"
diff --git a/terraform/aws/examples/enterprise_external_redis.tfvars b/terraform/aws/examples/enterprise_external_redis.tfvars
@@ -17,8 +17,8 @@ enterprise      = true
 license_literal = "<SECRET>"
 
 # Docker private registry credentials
-label_studio_registry_username = "<SECRET>"
-label_studio_registry_password = "<SECRET>"
+label_studio_docker_registry_username = "<SECRET>"
+label_studio_docker_registry_password = "<SECRET>"
 
 # Redis
 redis_type = "external"
diff --git a/terraform/aws/examples/enterprise_external_redis_ssl.tfvars b/terraform/aws/examples/enterprise_external_redis_ssl.tfvars
@@ -17,8 +17,8 @@ enterprise      = true
 license_literal = "<SECRET>"
 
 # Docker private registry credentials
-label_studio_registry_username = "<SECRET>"
-label_studio_registry_password = "<SECRET>"
+label_studio_docker_registry_username = "<SECRET>"
+label_studio_docker_registry_password = "<SECRET>"
 
 # Redis
 redis_type = "external"
diff --git a/terraform/aws/modules/eks/addons.tf b/terraform/aws/modules/eks/addons.tf
@@ -1,9 +1,9 @@
 locals {
   addon_versions = {
-    "coredns"            = "v1.8.7-eksbuild.3"
-    "kube-proxy"         = "v1.24.7-eksbuild.2"
-    "vpc_cni"            = "v1.12.0-eksbuild.1"
-    "aws_ebs_csi_driver" = "v1.13.0-eksbuild.1"
+    "coredns"            = "v1.9.3-eksbuild.2"
+    "kube-proxy"         = "v1.26.2-eksbuild.1"
+    "vpc_cni"            = "v1.12.6-eksbuild.1"
+    "aws_ebs_csi_driver" = "v1.17.0-eksbuild.1"
   }
 }
 
diff --git a/terraform/aws/modules/eks/variables.tf b/terraform/aws/modules/eks/variables.tf
@@ -49,7 +49,7 @@ variable "instance_profile_name" {
 variable "cluster_version" {
   description = "Version of the EKS cluster"
   type        = string
-  default     = "1.24"
+  default     = "1.26"
 }
 
 variable "instance_type" {
diff --git a/terraform/aws/modules/load-balancer-controller/main.tf b/terraform/aws/modules/load-balancer-controller/main.tf
@@ -235,6 +235,28 @@ resource "aws_iam_policy" "this" {
                 }
             }
         },
+        {
+            "Effect": "Allow",
+            "Action": [
+                "elasticloadbalancing:AddTags"
+            ],
+            "Resource": [
+                "arn:aws:elasticloadbalancing:*:*:targetgroup/*/*",
+                "arn:aws:elasticloadbalancing:*:*:loadbalancer/net/*/*",
+                "arn:aws:elasticloadbalancing:*:*:loadbalancer/app/*/*"
+            ],
+            "Condition": {
+                "StringEquals": {
+                    "elasticloadbalancing:CreateAction": [
+                        "CreateTargetGroup",
+                        "CreateLoadBalancer"
+                    ]
+                },
+                "Null": {
+                    "aws:RequestTag/elbv2.k8s.aws/cluster": "false"
+                }
+            }
+        },
         {
             "Effect": "Allow",
             "Action": [
diff --git a/terraform/aws/modules/load-balancer-controller/variables.tf b/terraform/aws/modules/load-balancer-controller/variables.tf
@@ -23,8 +23,8 @@ variable "cluster_name" {
 
 variable "helm_chart_version" {
   type        = string
-  default     = "1.4.6"
-  description = "Metrics Server Helm chart version"
+  default     = "1.5.0"
+  description = "AWS Load Balancer Helm chart version"
 }
 
 variable "helm_chart_release_name" {
diff --git a/terraform/common/modules/cert-manager/variables.tf b/terraform/common/modules/cert-manager/variables.tf
@@ -19,7 +19,7 @@ variable "helm_chart_name" {
 variable "helm_chart_version" {
   description = "Cert-manager Helm chart version."
   type        = string
-  default     = "1.10.1"
+  default     = "1.11.1"
 }
 
 variable "namespace" {
diff --git a/terraform/common/modules/label-studio/variables.tf b/terraform/common/modules/label-studio/variables.tf
@@ -23,7 +23,7 @@ variable "helm_chart_release_name" {
 variable "helm_chart_version" {
   description = "Label Studio Helm chart version"
   type        = string
-  default     = "1.0.3"
+  default     = "1.0.16"
 }
 
 variable "helm_chart_repo" {
diff --git a/terraform/common/modules/metrics-server/variables.tf b/terraform/common/modules/metrics-server/variables.tf
@@ -18,7 +18,7 @@ variable "helm_chart_release_name" {
 variable "helm_chart_version" {
   description = "Metrics Server Helm chart version"
   type        = string
-  default     = "6.2.3"
+  default     = "6.2.15"
 }
 
 variable "helm_chart_repo" {
diff --git a/terraform/common/modules/nginx-ingress-controller/variables.tf b/terraform/common/modules/nginx-ingress-controller/variables.tf
@@ -19,7 +19,7 @@ variable "helm_chart_name" {
 variable "helm_chart_version" {
   description = "Metrics Server Helm chart version"
   type    = string
-  default = "4.1.4"
+  default = "4.6.0"
 }
 
 variable "namespace" {

Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,8 @@ module "cert-manager" {`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`module "label-studio" {`
	`207`	`+ count = var.deploy_label_studio ? 1 : 0`
	`208`	`+`
`207`	`209`	`source = "../../common/modules/label-studio"`
`208`	`210`
`209`	`211`	`name = local.name_prefix`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ terraform {`
`4`	`4`	`required_providers {`
`5`	`5`	`aws = {`
`6`	`6`	`source = "hashicorp/aws"`
`7`		`- version = "= 4.61.0"`
	`7`	`+ version = "= 4.63.0"`
`8`	`8`	`}`
`9`	`9`	`helm = {`
`10`	`10`	`source = "hashicorp/helm"`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`locals {`
`2`	`2`	`addon_versions = {`
`3`		`- "coredns" = "v1.8.7-eksbuild.3"`
`4`		`- "kube-proxy" = "v1.24.7-eksbuild.2"`
`5`		`- "vpc_cni" = "v1.12.0-eksbuild.1"`
`6`		`- "aws_ebs_csi_driver" = "v1.13.0-eksbuild.1"`
	`3`	`+ "coredns" = "v1.9.3-eksbuild.2"`
	`4`	`+ "kube-proxy" = "v1.26.2-eksbuild.1"`
	`5`	`+ "vpc_cni" = "v1.12.6-eksbuild.1"`
	`6`	`+ "aws_ebs_csi_driver" = "v1.17.0-eksbuild.1"`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ variable "instance_profile_name" {`
`49`	`49`	`variable "cluster_version" {`
`50`	`50`	`description = "Version of the EKS cluster"`
`51`	`51`	`type = string`
`52`		`- default = "1.24"`
	`52`	`+ default = "1.26"`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`variable "instance_type" {`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ variable "cluster_name" {`
`23`	`23`
`24`	`24`	`variable "helm_chart_version" {`
`25`	`25`	`type = string`
`26`		`- default = "1.4.6"`
`27`		`- description = "Metrics Server Helm chart version"`
	`26`	`+ default = "1.5.0"`
	`27`	`+ description = "AWS Load Balancer Helm chart version"`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`variable "helm_chart_release_name" {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ variable "helm_chart_name" {`
`19`	`19`	`variable "helm_chart_version" {`
`20`	`20`	`description = "Cert-manager Helm chart version."`
`21`	`21`	`type = string`
`22`		`- default = "1.10.1"`
	`22`	`+ default = "1.11.1"`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`variable "namespace" {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ variable "helm_chart_release_name" {`
`23`	`23`	`variable "helm_chart_version" {`
`24`	`24`	`description = "Label Studio Helm chart version"`
`25`	`25`	`type = string`
`26`		`- default = "1.0.3"`
	`26`	`+ default = "1.0.16"`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`variable "helm_chart_repo" {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ variable "helm_chart_release_name" {`
`18`	`18`	`variable "helm_chart_version" {`
`19`	`19`	`description = "Metrics Server Helm chart version"`
`20`	`20`	`type = string`
`21`		`- default = "6.2.3"`
	`21`	`+ default = "6.2.15"`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`variable "helm_chart_repo" {`