Skip to content

Commit

Permalink
added 1.31 support
Browse files Browse the repository at this point in the history
  • Loading branch information
ebeaty-cisco committed Oct 16, 2024
1 parent ec8b22e commit 9d79f4d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
11 changes: 6 additions & 5 deletions aws-quickstart
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion examples/bootstrap/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/bootstrap/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
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.30",
"cluster_version": "1.31",
"name": str(uuid.uuid4()),
"subnet_ids": [subnet1.id, subnet2.id],
}
Expand Down Expand Up @@ -131,6 +131,7 @@ def test_defaults(
"1.27",
"1.28",
"1.29",
"1.30",
),
)
def test_cluster_version(
Expand Down

0 comments on commit 9d79f4d

Please sign in to comment.