diff --git a/.github/workflows/test_aws_integration.yaml b/.github/workflows/test_aws_integration.yaml index a02628cd2e..6c4eecbf06 100644 --- a/.github/workflows/test_aws_integration.yaml +++ b/.github/workflows/test_aws_integration.yaml @@ -26,7 +26,7 @@ on: env: AWS_DEFAULT_REGION: "us-west-2" NEBARI_IMAGE_TAG: ${{ github.event.inputs.image-tag || 'main' }} - TF_LOG: ${{ github.event.inputs.tf-log-level || 'info' }}∏ + TF_LOG: ${{ github.event.inputs.tf-log-level || 'info' }} jobs: test-aws-integration: diff --git a/src/_nebari/constants.py b/src/_nebari/constants.py index 0edbf65d04..3e4e186eb5 100644 --- a/src/_nebari/constants.py +++ b/src/_nebari/constants.py @@ -9,7 +9,7 @@ # 04-kubernetes-ingress DEFAULT_TRAEFIK_IMAGE_TAG = "2.9.1" -HIGHEST_SUPPORTED_K8S_VERSION = ("1", "29", "2") +HIGHEST_SUPPORTED_K8S_VERSION = ("1", "31") # specify Major and Minor version DEFAULT_GKE_RELEASE_CHANNEL = "UNSPECIFIED" DEFAULT_NEBARI_DASK_VERSION = CURRENT_RELEASE @@ -76,6 +76,6 @@ "kubernetes": { "_name": "kubernetes", "source": "hashicorp/kubernetes", - "version": ">= 2.20.0", + "version": ">= 2.35.1", }, } diff --git a/src/_nebari/provider/cloud/commons.py b/src/_nebari/provider/cloud/commons.py index 566b2029a4..d2bed87c48 100644 --- a/src/_nebari/provider/cloud/commons.py +++ b/src/_nebari/provider/cloud/commons.py @@ -6,9 +6,7 @@ def filter_by_highest_supported_k8s_version(k8s_versions_list): filtered_k8s_versions_list = [] for k8s_version in k8s_versions_list: - version = tuple( - filter(None, re.search(r"(\d+)\.(\d+)(?:\.(\d+))?", k8s_version).groups()) - ) + version = tuple(filter(None, re.search(r"(\d+)\.(\d+)", k8s_version).groups())) if version <= HIGHEST_SUPPORTED_K8S_VERSION: filtered_k8s_versions_list.append(k8s_version) return filtered_k8s_versions_list diff --git a/src/_nebari/stages/infrastructure/template/aws/modules/kubernetes/main.tf b/src/_nebari/stages/infrastructure/template/aws/modules/kubernetes/main.tf index 1f3e688e68..2537b12dad 100644 --- a/src/_nebari/stages/infrastructure/template/aws/modules/kubernetes/main.tf +++ b/src/_nebari/stages/infrastructure/template/aws/modules/kubernetes/main.tf @@ -147,6 +147,9 @@ resource "aws_eks_addon" "aws-ebs-csi-driver" { "eks.amazonaws.com/nodegroup" = "general" } } + defaultStorageClass = { + enabled = true + } }) # Ensure cluster and node groups are created