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

terraform: default to k8s 1.29 for new GKE/EKS clusters #3734

Merged
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
2 changes: 1 addition & 1 deletion eksctl/template.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ local daskNodes = [];
version should be the latest support version by the eksctl CLI, see
https://eksctl.io/getting-started/ for a list of supported versions.
-#}
version: "1.28",
version: "1.29",
},
availabilityZones: masterAzs,
iam: {
Expand Down
1 change: 0 additions & 1 deletion terraform/gcp/cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
# To get get the output of relevance, run:
#
# terraform plan -var-file=projects/$CLUSTER_NAME.tfvars
# terraform output regular_channel_latest_k8s_versions
#
# data ref: https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/container_engine_versions
data "google_container_engine_versions" "k8s_version_prefixes" {
Expand Down
15 changes: 15 additions & 0 deletions terraform/gcp/projects/basehub-template.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,21 @@ region = "{{ cluster_region }}"
# Default to a HA cluster for reliability
regional_cluster = true


# TODO: Before applying this, identify a k8s version to specify. Pick the latest
# k8s version from GKE's regular release channel. Look at the output
# called `regular_channel_latest_k8s_versions` as seen when using
# `terraform plan -var-file=projects/{{ cluster_name }}.tfvars`.
#
# Then use that version to explicitly set all k8s versions below, and
# finally decomment the k8s_versions section and removing this comment.
#
#k8s_versions = {
# min_master_version : "",
# core_nodes_version : "",
# notebook_nodes_version : "",
#}

core_node_machine_type = "n2-highmem-2"

# For multi-tenant cluster, network policy is required to enforce separation between hubs
Expand Down
15 changes: 15 additions & 0 deletions terraform/gcp/projects/daskhub-template.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,21 @@ region = "{{ cluster_region }}"
# Default to a HA cluster for reliability
regional_cluster = true

# TODO: Before applying this, identify a k8s version to specify. Pick the latest
# k8s version from GKE's regular release channel. Look at the output
# called `regular_channel_latest_k8s_versions` as seen when using
# `terraform plan -var-file=projects/{{ cluster_name }}.tfvars`.
#
# Then use that version to explicitly set all k8s versions below, and
# finally decomment the k8s_versions section and removing this comment.
#
#k8s_versions = {
# min_master_version : "",
# core_nodes_version : "",
# notebook_nodes_version : "",
# dask_nodes_version : "",
#}

core_node_machine_type = "n2-highmem-4"

# Network policy is required to enforce separation between hubs on multi-tenant clusters
Expand Down
1 change: 1 addition & 0 deletions terraform/gcp/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ variable "k8s_version_prefixes" {
default = [
"1.27.",
"1.28.",
"1.29.",
"1.",
]
description = <<-EOT
Expand Down