From 9d79f4d6e20f9e74a74c7e80100e77c312810932 Mon Sep 17 00:00:00 2001
From: Ed Beaty <ebeaty@cisco.com>
Date: Wed, 16 Oct 2024 08:25:58 -0700
Subject: [PATCH] added 1.31 support

---
 aws-quickstart                  | 11 ++++++-----
 examples/bootstrap/README.md    |  2 +-
 examples/bootstrap/variables.tf |  2 +-
 tests/ut/test_eks.py            |  3 ++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/aws-quickstart b/aws-quickstart
index a3ad783..bf7f767 100755
--- a/aws-quickstart
+++ b/aws-quickstart
@@ -40,15 +40,15 @@ OPTIONS:
             Destroy the workload and infrastructure.
 
     --kubernetes-version
-            Kubernetes version to use.  This must be one of: 1.23, 1.24, 1.25, 1.26, 1.27, 1.28, 1.29, 1.30
-            (default: 1.30).
+            Kubernetes version to use.  This must be one of: 1.23, 1.24, 1.25, 1.26, 1.27, 1.28, 1.29, 1.30, 1.31
+            (default: 1.31).
 EOF
 }
 
 # Default arguments.
 AMI_ID=""
 DESTROY=""
-KUBERNETES_VERSION="1.30"
+KUBERNETES_VERSION="1.31"
 XR_USERNAME=""
 XR_PASSWORD=""
 BASTION_REMOTE_ACCESS_CIDR_BLOCKS=""
@@ -108,8 +108,9 @@ if [ "${KUBERNETES_VERSION}" != "1.23" ] &&
    [ "${KUBERNETES_VERSION}" != "1.27" ] &&
    [ "${KUBERNETES_VERSION}" != "1.28" ] &&
    [ "${KUBERNETES_VERSION}" != "1.29" ] &&
-   [ "${KUBERNETES_VERSION}" != "1.30" ]; then
-    >&2 echo "error: Kubernetes version (--kubernetes-version) must be one of: 1.23, 1.24, 1.25, 1.26, 1.27, 1.28, 1.29, 1.30"
+   [ "${KUBERNETES_VERSION}" != "1.30" ] &&
+   [ "${KUBERNETES_VERSION}" != "1.31" ]; then
+    >&2 echo "error: Kubernetes version (--kubernetes-version) must be one of: 1.23, 1.24, 1.25, 1.26, 1.27, 1.28, 1.29, 1.30, 1.31"
     ERROR=1
 fi
 
diff --git a/examples/bootstrap/README.md b/examples/bootstrap/README.md
index 3a8a29f..e2a7ff0 100644
--- a/examples/bootstrap/README.md
+++ b/examples/bootstrap/README.md
@@ -42,7 +42,7 @@ terraform destroy
 |------|-------------|------|---------|:--------:|
 | <a name="input_azs"></a> [azs](#input\_azs) | List of exactly two availability zones in the currently configured AWS region.<br>A private subnet and a public subnet is created in each of these availability zones.<br>Each cluster node is launched in one of the private subnets.<br>If null, then the first two availability zones in the currently configured AWS region is used. | `list(string)` | `null` | no |
 | <a name="input_bastion_remote_access_cidr_blocks"></a> [bastion\_remote\_access\_cidr\_blocks](#input\_bastion\_remote\_access\_cidr\_blocks) | Allowed CIDR blocks for external SSH access to the Bastion instance.<br>This must be a list of strings.<br>If null, then access to the Bastion instance is prevented. | `list(string)` | n/a | yes |
-| <a name="input_cluster_version"></a> [cluster\_version](#input\_cluster\_version) | Cluster version | `string` | `"1.30"` | no |
+| <a name="input_cluster_version"></a> [cluster\_version](#input\_cluster\_version) | Cluster version | `string` | `"1.31"` | no |
 | <a name="input_name_prefix"></a> [name\_prefix](#input\_name\_prefix) | Used as a prefix for the 'Name' tag for each created resource.<br>If null, then a random name 'xrd-terraform-[0-9a-z]{8}' is used. | `string` | `null` | no |
 
 ## Outputs
diff --git a/examples/bootstrap/variables.tf b/examples/bootstrap/variables.tf
index 6fc4137..85d1636 100644
--- a/examples/bootstrap/variables.tf
+++ b/examples/bootstrap/variables.tf
@@ -35,6 +35,6 @@ variable "bastion_remote_access_cidr_blocks" {
 variable "cluster_version" {
   description = "Cluster version"
   type        = string
-  default     = "1.30"
+  default     = "1.31"
   nullable    = false
 }
diff --git a/tests/ut/test_eks.py b/tests/ut/test_eks.py
index 883c88a..ed36aac 100644
--- a/tests/ut/test_eks.py
+++ b/tests/ut/test_eks.py
@@ -101,7 +101,7 @@ def security_group(ec2: EC2ServiceResource, vpc: Vpc) -> SecurityGroup:
 @pytest.fixture
 def base_vars(subnet1: Subnet, subnet2: Subnet) -> dict[str, Any]:
     return {
-        "cluster_version": "1.30",
+        "cluster_version": "1.31",
         "name": str(uuid.uuid4()),
         "subnet_ids": [subnet1.id, subnet2.id],
     }
@@ -131,6 +131,7 @@ def test_defaults(
         "1.27",
         "1.28",
         "1.29",
+        "1.30",
     ),
 )
 def test_cluster_version(