From f1bcf85cf6613adeaffba1432fff4eb3511653d1 Mon Sep 17 00:00:00 2001
From: dkeightley <derek@rancher.com>
Date: Wed, 29 Sep 2021 14:00:27 +1300
Subject: [PATCH 1/2] Add support for eks 1.18, 1.19 and 1.20

---
 drivers/eks/eks_driver.go | 75 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/drivers/eks/eks_driver.go b/drivers/eks/eks_driver.go
index e9475c44a..db9e3c928 100644
--- a/drivers/eks/eks_driver.go
+++ b/drivers/eks/eks_driver.go
@@ -41,6 +41,81 @@ const (
 )
 
 var amiForRegionAndVersion = map[string]map[string]string{
+	"1.20": {
+		"us-east-2":      "ami-008732cfc37c734ca",
+		"us-east-1":      "ami-0b297a512e2852b89",
+		"us-west-2":      "ami-0494b922d4a70c8d6",
+		"us-west-1":      "ami-05ee3a6a1cd97291d",
+		"af-south-1":     "ami-03feaede79d75565c",
+		"ap-east-1":      "ami-0a52e79a40e8f00a0",
+		"ap-south-1":     "ami-0a8da99c3f747810b",
+		"ap-northeast-1": "ami-0277737251066865c",
+		"ap-northeast-2": "ami-0d539f57985c5325d",
+		"ap-northeast-3": "ami-02a2997328078b960",
+		"ap-southeast-1": "ami-0f28cfe92954b3257",
+		"ap-southeast-2": "ami-08431bc62095ed93d",
+		"ca-central-1":   "ami-0621f527553cfafad",
+		"cn-north-1":     "",
+		"cn-northwest-1": "",
+		"eu-central-1":   "ami-0acca3abab3b7928a",
+		"eu-west-1":      "ami-0bd5dd3fc1e7bda76",
+		"eu-west-2":      "ami-027fb47c073f5293f",
+		"eu-south-1":     "",
+		"eu-west-3":      "ami-08498e1a8eaec6d78",
+		"eu-north-1":     "ami-0cf4a740a93081c07",
+		"me-south-1":     "ami-0608e3cef29b5c81e",
+		"sa-east-1":      "ami-01f9e059f88bc0b89",
+	},
+	"1.19": {
+		"us-east-2":      "ami-060e387c4a24f2434",
+		"us-east-1":      "ami-0fc1769afe619e097",
+		"us-west-2":      "ami-0adca766413605f27",
+		"us-west-1":      "ami-048b1117cec33fbcf",
+		"af-south-1":     "ami-002e879c0fc2eadb7",
+		"ap-east-1":      "ami-0145b016f50bb6513",
+		"ap-south-1":     "ami-0cf2930e0e1387df2",
+		"ap-northeast-1": "ami-0f42bc28d8f074cb8",
+		"ap-northeast-2": "ami-0eb836afc87dc8154",
+		"ap-northeast-3": "ami-0c82ef5ba63a35a41",
+		"ap-southeast-1": "ami-0ef19574eeab27490",
+		"ap-southeast-2": "ami-037da4d1db5db630f",
+		"ca-central-1":   "ami-081751edcee37a087",
+		"cn-north-1":     "",
+		"cn-northwest-1": "",
+		"eu-central-1":   "ami-0bccfc96034088054",
+		"eu-west-1":      "ami-0585c1ce5e7ad0b71",
+		"eu-west-2":      "ami-048a089dd33055e9f",
+		"eu-south-1":     "",
+		"eu-west-3":      "ami-06cdcbb6554ee2888",
+		"eu-north-1":     "ami-0b9ee30bc23a6cc30",
+		"me-south-1":     "ami-0f3970432ea1d95ea",
+		"sa-east-1":      "ami-093c11d6e2791412e",
+	},
+	"1.18": {
+		"us-east-2":      "ami-039348d4f35eeb566",
+		"us-east-1":      "ami-028b2c907293dcad3",
+		"us-west-2":      "ami-078539553b802b113",
+		"us-west-1":      "ami-0a803bd4fc3249378",
+		"af-south-1":     "ami-03d0e9e241e9438e4",
+		"ap-east-1":      "ami-09588c8583711c3e1",
+		"ap-south-1":     "ami-033d410ea55497a9c",
+		"ap-northeast-1": "ami-0904b052cacccb76f",
+		"ap-northeast-2": "ami-0b6f01a465ec80349",
+		"ap-northeast-3": "ami-0a385778f0d74a8a0",
+		"ap-southeast-1": "ami-07e784c146e92d9fb",
+		"ap-southeast-2": "ami-04806683ce74668e5",
+		"ca-central-1":   "ami-0692a4d3aa3539c06",
+		"cn-north-1":     "",
+		"cn-northwest-1": "",
+		"eu-central-1":   "ami-03b60cc48aeb2f7ff",
+		"eu-west-1":      "ami-00d1b45828b8e0fa6",
+		"eu-west-2":      "ami-0ebcd1100fc79e335",
+		"eu-south-1":      "",
+		"eu-west-3":      "ami-0559916f1a5f2c7e2",
+		"eu-north-1":     "ami-030439217b90ccaf7",
+		"me-south-1":     "ami-03bc32a8fb30f8c22",
+		"sa-east-1":      "ami-06fe10b852a751b0f",
+	},
 	"1.17": {
 		"us-east-2":      "ami-044cba456c7d6a2fe",
 		"us-east-1":      "ami-04125ecea1c9b3b27",

From 6de6584009220418ce7328468dafabd1b937f1e4 Mon Sep 17 00:00:00 2001
From: dkeightley <derek@rancher.com>
Date: Wed, 29 Sep 2021 15:30:43 +1300
Subject: [PATCH 2/2] Fix fmt

---
 drivers/eks/eks_driver.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/eks/eks_driver.go b/drivers/eks/eks_driver.go
index db9e3c928..97fd82af4 100644
--- a/drivers/eks/eks_driver.go
+++ b/drivers/eks/eks_driver.go
@@ -110,7 +110,7 @@ var amiForRegionAndVersion = map[string]map[string]string{
 		"eu-central-1":   "ami-03b60cc48aeb2f7ff",
 		"eu-west-1":      "ami-00d1b45828b8e0fa6",
 		"eu-west-2":      "ami-0ebcd1100fc79e335",
-		"eu-south-1":      "",
+		"eu-south-1":     "",
 		"eu-west-3":      "ami-0559916f1a5f2c7e2",
 		"eu-north-1":     "ami-030439217b90ccaf7",
 		"me-south-1":     "ami-03bc32a8fb30f8c22",