Allow upgrading AWS Terraform provider to v4.x

* https://github.com/hashicorp/terraform-provider-aws/releases/tag/v4.0.0

CHANGES.md

@@ -4,9 +4,14 @@ Notable changes between versions.
 
 ## Latest
 
+* Kubernetes [v1.23.4](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.23.md#v1234)
 * Update etcd from v3.5.1 to [v3.5.2](https://github.com/etcd-io/etcd/releases/tag/v3.5.2)
 * Change default CNI `networking` provider from `calico` to `cilium` ([#1114](https://github.com/poseidon/typhoon/pull/1114))
 
+### AWS
+
+* Allow upgrading AWS Terraform Provider to v4.x
+
 ### Addons
 
 * Align nginx-ingress `--controller-class` with `IngressClass`

aws/fedora-coreos/kubernetes/versions.tf

@@ -3,7 +3,7 @@
 terraform {
   required_version = ">= 0.13.0, < 2.0.0"
   required_providers {
-    aws      = ">= 2.23, <= 4.0"
+    aws      = ">= 2.23, <= 5.0"
     template = "~> 2.2"
     null     = ">= 2.1"
 

aws/fedora-coreos/kubernetes/workers/versions.tf

@@ -3,7 +3,7 @@
 terraform {
   required_version = ">= 0.13.0, < 2.0.0"
   required_providers {
-    aws      = ">= 2.23, <= 4.0"
+    aws      = ">= 2.23, <= 5.0"
     template = "~> 2.2"
 
     ct = {

aws/fedora-coreos/kubernetes/workers/workers.tf

@@ -33,13 +33,11 @@ resource "aws_autoscaling_group" "workers" {
   # used. Disable wait to avoid issues and align with other clouds.
   wait_for_capacity_timeout = "0"
 
-  tags = [
+  tag {
-    {
+    key                 = "Name"
-      key                 = "Name"
+    value               = "${var.name}-worker"
-      value               = "${var.name}-worker"
+    propagate_at_launch = true
-      propagate_at_launch = true
+  }
-    },
-  ]
 }
 
 # Worker template

aws/flatcar-linux/kubernetes/versions.tf

@@ -3,7 +3,7 @@
 terraform {
   required_version = ">= 0.13.0, < 2.0.0"
   required_providers {
-    aws      = ">= 2.23, <= 4.0"
+    aws      = ">= 2.23, <= 5.0"
     template = "~> 2.2"
     null     = ">= 2.1"
 

aws/flatcar-linux/kubernetes/workers/versions.tf

@@ -3,7 +3,7 @@
 terraform {
   required_version = ">= 0.13.0, < 2.0.0"
   required_providers {
-    aws      = ">= 2.23, <= 4.0"
+    aws      = ">= 2.23, <= 5.0"
     template = "~> 2.2"
 
     ct = {

aws/flatcar-linux/kubernetes/workers/workers.tf

@@ -33,13 +33,11 @@ resource "aws_autoscaling_group" "workers" {
   # used. Disable wait to avoid issues and align with other clouds.
   wait_for_capacity_timeout = "0"
 
-  tags = [
+  tag {
-    {
+    key                 = "Name"
-      key                 = "Name"
+    value               = "${var.name}-worker"
-      value               = "${var.name}-worker"
+    propagate_at_launch = true
-      propagate_at_launch = true
+  }
-    },
-  ]
 }
 
 # Worker template