diff --git a/aws-quickstart b/aws-quickstart index 25e48e8..a16d538 100755 --- a/aws-quickstart +++ b/aws-quickstart @@ -37,15 +37,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 - (default: 1.29). + 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). EOF } # Default arguments. AMI_ID="" DESTROY="" -KUBERNETES_VERSION="1.29" +KUBERNETES_VERSION="1.30" XR_USERNAME="" XR_PASSWORD="" @@ -95,8 +95,9 @@ if [ "${KUBERNETES_VERSION}" != "1.23" ] && [ "${KUBERNETES_VERSION}" != "1.26" ] && [ "${KUBERNETES_VERSION}" != "1.27" ] && [ "${KUBERNETES_VERSION}" != "1.28" ] && - [ "${KUBERNETES_VERSION}" != "1.29" ]; 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" + [ "${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" ERROR=1 fi diff --git a/examples/bootstrap/README.md b/examples/bootstrap/README.md index 061f534..df37d3d 100644 --- a/examples/bootstrap/README.md +++ b/examples/bootstrap/README.md @@ -41,7 +41,7 @@ terraform destroy | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| | [azs](#input\_azs) | List of exactly two availability zones in the currently configured AWS region.
A private subnet and a public subnet is created in each of these availability zones.
Each cluster node is launched in one of the private subnets.
If null, then the first two availability zones in the currently configured AWS region is used. | `list(string)` | `null` | no | -| [cluster\_version](#input\_cluster\_version) | Cluster version | `string` | `"1.29"` | no | +| [cluster\_version](#input\_cluster\_version) | Cluster version | `string` | `"1.30"` | no | | [name\_prefix](#input\_name\_prefix) | Used as a prefix for the 'Name' tag for each created resource.
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 61042c5..5c333bf 100644 --- a/examples/bootstrap/variables.tf +++ b/examples/bootstrap/variables.tf @@ -26,6 +26,6 @@ variable "azs" { variable "cluster_version" { description = "Cluster version" type = string - default = "1.29" + default = "1.30" nullable = false } diff --git a/tests/ut/test_eks.py b/tests/ut/test_eks.py index 4b1675b..883c88a 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.29", + "cluster_version": "1.30", "name": str(uuid.uuid4()), "subnet_ids": [subnet1.id, subnet2.id], } @@ -130,6 +130,7 @@ def test_defaults( "1.26", "1.27", "1.28", + "1.29", ), ) def test_cluster_version(