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.

Sign up for GitHub

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

Update k8s max version #2903

Merged
merged 11 commits into from
Jan 16, 2025
Merged

Update k8s max version #2903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a89b0ae
update to latest k8s version, set max k8s version to only major and m…
dcmcand Jan 8, 2025
068d293
Merge branch 'main' into update-k8s-max-version
dcmcand Jan 9, 2025
c7ab98a
roll back helm chart provider upgrade
dcmcand Jan 9, 2025
e840d75
set max version to 1.31
dcmcand Jan 9, 2025
5a17507
Merge branch 'main' into update-k8s-max-version
dcmcand Jan 10, 2025
f6062a7
Merge branch 'main' into update-k8s-max-version
dcmcand Jan 10, 2025
4f3de51
Merge branch 'fix-azure-addon-policy-default' into update-k8s-max-ver…
dcmcand Jan 10, 2025
3a95be3
Merge branch 'main' into update-k8s-max-version
dcmcand Jan 10, 2025
4e50142
Merge branch 'main' into update-k8s-max-version
marcelovilla Jan 15, 2025
488c6e0
Merge branch 'main' into update-k8s-max-version
marcelovilla Jan 15, 2025
e970217
make gp2 storage class default
dcmcand Jan 16, 2025
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
2 changes: 1 addition & 1 deletion src/_nebari/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions src/_nebari/provider/cloud/commons.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions src/_nebari/stages/infrastructure/template/aws/modules/kubernetes/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/_nebari/stages/kubernetes_ingress/template/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "2.20.0"
version = "2.35.1"
}
}
required_version = ">= 1.0"
Expand Down
2 changes: 1 addition & 1 deletion src/_nebari/stages/kubernetes_initialize/template/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "2.20.0"
version = "2.35.1"
}
}
required_version = ">= 1.0"
Expand Down
2 changes: 1 addition & 1 deletion src/_nebari/stages/kubernetes_keycloak/template/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "2.20.0"
version = "2.35.1"
}
}
required_version = ">= 1.0"
Expand Down
2 changes: 1 addition & 1 deletion src/_nebari/stages/kubernetes_keycloak_configuration/template/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "2.20.0"
version = "2.35.1"
}
keycloak = {
source = "mrparkers/keycloak"
Expand Down
2 changes: 1 addition & 1 deletion ...tages/kubernetes_services/template/modules/kubernetes/services/argo-workflows/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "2.20.0"
version = "2.35.1"
}
}
required_version = ">= 1.0"
Expand Down
2 changes: 1 addition & 1 deletion ...ri/stages/kubernetes_services/template/modules/kubernetes/services/monitoring/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "2.20.0"
version = "2.35.1"
}
}
required_version = ">= 1.0"
Expand Down
2 changes: 1 addition & 1 deletion ...ari/stages/kubernetes_services/template/modules/kubernetes/services/rook-ceph/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "2.20.0"
version = "2.35.1"
}
}
required_version = ">= 1.0"
Expand Down
2 changes: 1 addition & 1 deletion src/_nebari/stages/kubernetes_services/template/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "2.20.0"
version = "2.35.1"
}
keycloak = {
source = "mrparkers/keycloak"
Expand Down
2 changes: 1 addition & 1 deletion src/_nebari/stages/nebari_tf_extensions/template/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "2.20.0"
version = "2.35.1"
}
keycloak = {
source = "mrparkers/keycloak"
Expand Down
Loading