diff --git a/cluster/eksctl/cluster.yaml b/cluster/eksctl/cluster.yaml index dbbaf5cc1..1ca544c55 100644 --- a/cluster/eksctl/cluster.yaml +++ b/cluster/eksctl/cluster.yaml @@ -7,7 +7,7 @@ availabilityZones: metadata: name: ${EKS_CLUSTER_NAME} region: ${AWS_REGION} - version: "1.30" + version: "1.31" tags: karpenter.sh/discovery: ${EKS_CLUSTER_NAME} created-by: eks-workshop-v2 @@ -21,7 +21,7 @@ vpc: publicAccess: true addons: - name: vpc-cni - version: 1.16.0 + version: 1.19.2 configurationValues: '{"env":{"ENABLE_PREFIX_DELEGATION":"true", "ENABLE_POD_ENI":"true", "POD_SECURITY_GROUP_ENFORCING_MODE":"standard"},"enableNetworkPolicy": "true", "nodeAgent": {"enablePolicyEventLogs": "true"}}' resolveConflicts: overwrite managedNodeGroups: @@ -31,7 +31,7 @@ managedNodeGroups: maxSize: 6 instanceType: m5.large privateNetworking: true - releaseVersion: "1.30.0-20240625" + releaseVersion: "1.31.3-20250103" updateConfig: maxUnavailablePercentage: 50 labels: diff --git a/cluster/terraform/variables.tf b/cluster/terraform/variables.tf index 8a618810f..c35e077fe 100644 --- a/cluster/terraform/variables.tf +++ b/cluster/terraform/variables.tf @@ -7,13 +7,13 @@ variable "cluster_name" { variable "cluster_version" { description = "EKS cluster version." type = string - default = "1.30" + default = "1.31" } variable "ami_release_version" { description = "Default EKS AMI release version for node groups" type = string - default = "1.30.0-20240625" + default = "1.31.3-20250103" } variable "vpc_cidr" { diff --git a/hack/lib/kubectl-version.sh b/hack/lib/kubectl-version.sh index e7825e5d4..88fefd18a 100644 --- a/hack/lib/kubectl-version.sh +++ b/hack/lib/kubectl-version.sh @@ -1 +1 @@ -export KUBECTL_VERSION='v1.30.2' +export KUBECTL_VERSION='v1.31.3' diff --git a/lab/scripts/installer.sh b/lab/scripts/installer.sh index 0cdd815a4..83a580772 100644 --- a/lab/scripts/installer.sh +++ b/lab/scripts/installer.sh @@ -3,7 +3,7 @@ set -e # renovate: depName=kubernetes/kubernetes -kubectl_version='1.30.8' +kubectl_version='1.31.3' # renovate: depName=helm/helm helm_version='3.16.4' diff --git a/lab/scripts/setup.sh b/lab/scripts/setup.sh index 568c528be..5f22c30cc 100644 --- a/lab/scripts/setup.sh +++ b/lab/scripts/setup.sh @@ -38,6 +38,7 @@ function prepare-environment() { } function use-cluster() { bash /usr/local/bin/use-cluster \$1; source ~/.bashrc.d/env.bash; } +function create-cluster() { URL=https://raw.githubusercontent.com/${REPOSITORY_OWNER}/${REPOSITORY_NAME}/refs/heads/${REPOSITORY_REF}/cluster/eksctl/cluster.yaml; echo "Creating cluster with eksctl from $URL"; curl -fsSL $URL | envsubst | eksctl create cluster -f -; } EOT REPOSITORY_OWNER=${REPOSITORY_OWNER:-"aws-samples"} diff --git a/renovate.json b/renovate.json index 8c8888f7b..a68339367 100644 --- a/renovate.json +++ b/renovate.json @@ -23,12 +23,12 @@ }, { "matchDepNames": ["kubernetes/kubernetes"], - "allowedVersions": "/^v1.30.[0-9]+$/" + "allowedVersions": "/^v1.31.[0-9]+$/" }, { "matchDepNames": ["kubernetes/autoscaler"], "extractVersion": "^cluster-autoscaler-(?.*)$", - "allowedVersions": "/^1.30.[0-9]+$/" + "allowedVersions": "/^1.31.[0-9]+$/" }, { "automerge": true, diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index f712159a3..c434706da 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -73,8 +73,8 @@ const config = { MANIFESTS_REF: manifestsRef, MANIFESTS_OWNER: manifestsOwner, MANIFESTS_REPOSITORY: manifestsRepository, - KUBERNETES_VERSION: "1.30", - KUBERNETES_NODE_VERSION: "1.30-eks-036c24b", + KUBERNETES_VERSION: "1.31", + KUBERNETES_NODE_VERSION: "1.31-eks-036c24b", }, }, ],