From 9aa99f1996b57b1a6df457621456ca8f6b6020f2 Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Thu, 17 Feb 2022 09:02:42 -0800
Subject: [PATCH] Allow upgrading AWS Terraform provider to v4.x

* https://github.com/hashicorp/terraform-provider-aws/releases/tag/v4.0.0
---
 CHANGES.md                                       |  5 +++++
 aws/fedora-coreos/kubernetes/versions.tf         |  2 +-
 aws/fedora-coreos/kubernetes/workers/versions.tf |  2 +-
 aws/fedora-coreos/kubernetes/workers/workers.tf  | 12 +++++-------
 aws/flatcar-linux/kubernetes/versions.tf         |  2 +-
 aws/flatcar-linux/kubernetes/workers/versions.tf |  2 +-
 aws/flatcar-linux/kubernetes/workers/workers.tf  | 12 +++++-------
 7 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index fab14fa5..18b7c071 100644
--- a/CHANGES.md
+++ b/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`
diff --git a/aws/fedora-coreos/kubernetes/versions.tf b/aws/fedora-coreos/kubernetes/versions.tf
index eb761c1c..64fb28aa 100644
--- a/aws/fedora-coreos/kubernetes/versions.tf
+++ b/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"
 
diff --git a/aws/fedora-coreos/kubernetes/workers/versions.tf b/aws/fedora-coreos/kubernetes/workers/versions.tf
index b8eb69ea..c6c95cdb 100644
--- a/aws/fedora-coreos/kubernetes/workers/versions.tf
+++ b/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 = {
diff --git a/aws/fedora-coreos/kubernetes/workers/workers.tf b/aws/fedora-coreos/kubernetes/workers/workers.tf
index 4e453358..87e17def 100644
--- a/aws/fedora-coreos/kubernetes/workers/workers.tf
+++ b/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 = [
-    {
-      key                 = "Name"
-      value               = "${var.name}-worker"
-      propagate_at_launch = true
-    },
-  ]
+  tag {
+    key                 = "Name"
+    value               = "${var.name}-worker"
+    propagate_at_launch = true
+  }
 }
 
 # Worker template
diff --git a/aws/flatcar-linux/kubernetes/versions.tf b/aws/flatcar-linux/kubernetes/versions.tf
index eb761c1c..64fb28aa 100644
--- a/aws/flatcar-linux/kubernetes/versions.tf
+++ b/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"
 
diff --git a/aws/flatcar-linux/kubernetes/workers/versions.tf b/aws/flatcar-linux/kubernetes/workers/versions.tf
index b8eb69ea..c6c95cdb 100644
--- a/aws/flatcar-linux/kubernetes/workers/versions.tf
+++ b/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 = {
diff --git a/aws/flatcar-linux/kubernetes/workers/workers.tf b/aws/flatcar-linux/kubernetes/workers/workers.tf
index 621763fb..eb1b2bee 100644
--- a/aws/flatcar-linux/kubernetes/workers/workers.tf
+++ b/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 = [
-    {
-      key                 = "Name"
-      value               = "${var.name}-worker"
-      propagate_at_launch = true
-    },
-  ]
+  tag {
+    key                 = "Name"
+    value               = "${var.name}-worker"
+    propagate_at_launch = true
+  }
 }
 
 # Worker template