Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add EKS v1.30 support #21

Merged
merged 3 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions aws-quickstart
Original file line number Diff line number Diff line change
Expand Up @@ -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=""

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion examples/bootstrap/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ terraform destroy
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <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_cluster_version"></a> [cluster\_version](#input\_cluster\_version) | Cluster version | `string` | `"1.29"` | no |
| <a name="input_cluster_version"></a> [cluster\_version](#input\_cluster\_version) | Cluster version | `string` | `"1.30"` | 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
Expand Down
2 changes: 1 addition & 1 deletion examples/bootstrap/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ variable "azs" {
variable "cluster_version" {
description = "Cluster version"
type = string
default = "1.29"
default = "1.30"
nullable = false
}
3 changes: 2 additions & 1 deletion tests/ut/test_eks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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],
}
Expand Down Expand Up @@ -130,6 +130,7 @@ def test_defaults(
"1.26",
"1.27",
"1.28",
"1.29",
),
)
def test_cluster_version(
Expand Down
Loading