Merge branch 'main' into ebeaty_uprev_ami

.github/workflows/pre-commit.yml

@@ -17,6 +17,10 @@ jobs:
         with:
           fetch-depth: 0
 
+      - uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: "1.7.1"
+
       - name: "Setup prerequisites"
         # yamllint disable rule:line-length
         run: |

aws-quickstart

@@ -40,15 +40,15 @@ OPTIONS:
             Destroy the workload and infrastructure.
 
     --kubernetes-version
-            Kubernetes version to use.  This must be one of: 1.24, 1.25, 1.26, 1.27, 1.28, 1.29, 1.30, 1.31
-            (default: 1.31).
+            Kubernetes version to use.  This must be one of: 1.24, 1.25, 1.26, 1.27, 1.28, 1.29, 1.30, 1.31, 1.32
+            (default: 1.32).
 EOF
 }
 
 # Default arguments.
 AMI_ID=""
 DESTROY=""
-KUBERNETES_VERSION="1.31"
+KUBERNETES_VERSION="1.32"
 XR_USERNAME=""
 XR_PASSWORD=""
 BASTION_REMOTE_ACCESS_CIDR_BLOCKS=""
@@ -108,8 +108,9 @@ if [ "${KUBERNETES_VERSION}" != "1.24" ] &&
    [ "${KUBERNETES_VERSION}" != "1.28" ] &&
    [ "${KUBERNETES_VERSION}" != "1.29" ] &&
    [ "${KUBERNETES_VERSION}" != "1.30" ] &&
-   [ "${KUBERNETES_VERSION}" != "1.31" ]; then
-    >&2 echo "error: Kubernetes version (--kubernetes-version) must be one of: 1.24, 1.25, 1.26, 1.27, 1.28, 1.29, 1.30, 1.31"
+   [ "${KUBERNETES_VERSION}" != "1.31" ] &&
+   [ "${KUBERNETES_VERSION}" != "1.32" ]; then
+    >&2 echo "error: Kubernetes version (--kubernetes-version) must be one of: 1.24, 1.25, 1.26, 1.27, 1.28, 1.29, 1.30, 1.31, 1.32"
     ERROR=1
 fi
 

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.31"` | no |
+| <a name="input_cluster_version"></a> [cluster\_version](#input\_cluster\_version) | Cluster version | `string` | `"1.32"` | 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

examples/bootstrap/variables.tf

@@ -35,6 +35,6 @@ variable "bastion_remote_access_cidr_blocks" {
 variable "cluster_version" {
   description = "Cluster version"
   type        = string
-  default     = "1.31"
+  default     = "1.32"
   nullable    = false
 }

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.31",
+        "cluster_version": "1.32",
         "name": str(uuid.uuid4()),
         "subnet_ids": [subnet1.id, subnet2.id],
     }