Add EKS 1.33 (#44)

Author: ebeaty-cisco

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
           - "keypair"
 
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.81.0
+    rev: v1.83.6
     hooks:
       - id: terraform_fmt
       - id: terraform_docs

aws-quickstart

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

examples/bootstrap/README.md

@@ -26,7 +26,7 @@ When you are finished, make sure you first destroy any other configurations laye
 terraform destroy
 ```
 
-<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- BEGIN_TF_DOCS -->
 ## Requirements
 
 | Name | Version |
@@ -42,12 +42,12 @@ 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.32"` | no |
+| <a name="input_cluster_version"></a> [cluster\_version](#input\_cluster\_version) | Cluster version | `string` | `"1.33"` | 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
 
 | Name | Description |
 |------|-------------|
 | <a name="output_bootstrap"></a> [bootstrap](#output\_bootstrap) | Bootstrap module outputs |
-<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END_TF_DOCS -->

examples/bootstrap/variables.tf

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

examples/overlay/infra/README.md

@@ -1,4 +1,4 @@
-<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- BEGIN_TF_DOCS -->
 ## Requirements
 
 | Name | Version |
@@ -24,4 +24,4 @@
 | <a name="output_cluster_name"></a> [cluster\_name](#output\_cluster\_name) | Cluster name |
 | <a name="output_kubeconfig_path"></a> [kubeconfig\_path](#output\_kubeconfig\_path) | Path to the generated kubeconfig file |
 | <a name="output_nodes"></a> [nodes](#output\_nodes) | Map of worker node name to instance ID |
-<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END_TF_DOCS -->

examples/overlay/workload/README.md

@@ -1,4 +1,4 @@
-<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- BEGIN_TF_DOCS -->
 ## Requirements
 
 | Name | Version |
@@ -23,4 +23,4 @@
 | Name | Description |
 |------|-------------|
 | <a name="output_cluster_name"></a> [cluster\_name](#output\_cluster\_name) | Cluster name |
-<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END_TF_DOCS -->

examples/singleton/infra/README.md

@@ -1,4 +1,4 @@
-<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- BEGIN_TF_DOCS -->
 ## Requirements
 
 | Name | Version |
@@ -23,4 +23,4 @@
 | <a name="output_cluster_name"></a> [cluster\_name](#output\_cluster\_name) | Cluster name |
 | <a name="output_kubeconfig_path"></a> [kubeconfig\_path](#output\_kubeconfig\_path) | Path to the generated kubeconfig file |
 | <a name="output_node_id"></a> [node\_id](#output\_node\_id) | Instance ID of the single worker node instance |
-<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END_TF_DOCS -->

examples/singleton/workload/README.md

@@ -1,4 +1,4 @@
-<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- BEGIN_TF_DOCS -->
 ## Requirements
 
 | Name | Version |
@@ -24,4 +24,4 @@
 | Name | Description |
 |------|-------------|
 | <a name="output_cluster_name"></a> [cluster\_name](#output\_cluster\_name) | Cluster name |
-<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END_TF_DOCS -->

modules/aws/eks-config/versions.tf

@@ -9,7 +9,7 @@ terraform {
 
     helm = {
       source  = "hashicorp/helm"
-      version = ">= 2.9"
+      version = ">= 2.9, < 3.0"
     }
 
     http = {

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.32",
+        "cluster_version": "1.33",
         "name": str(uuid.uuid4()),
         "subnet_ids": [subnet1.id, subnet2.id],
     }
@@ -130,6 +130,7 @@ def test_defaults(
         "1.29",
         "1.30",
         "1.31",
+        "1.32",
     ),
 )
 def test_cluster_version(