From eddca4d1b1108b3998eb042e75054a05f068d686 Mon Sep 17 00:00:00 2001 From: chjmil Date: Thu, 19 Dec 2024 17:08:21 -0500 Subject: [PATCH] feat: (PSKD-817) Support K8s 1.31 --- Dockerfile | 6 +++--- docs/CONFIG-VARS.md | 8 ++++---- docs/REQUIREMENTS.md | 6 +++--- docs/user/Dependencies.md | 2 +- examples/bare-metal/sample-ansible-vars.yaml | 2 +- examples/vsphere/sample-terraform-dhcp.tfvars | 4 ++-- examples/vsphere/sample-terraform-minimal.tfvars | 4 ++-- examples/vsphere/sample-terraform-static-ips.tfvars | 4 ++-- .../vsphere/sample-terraform-static-singlestore.tfvars | 4 ++-- examples/vsphere/sample-terraform-vi.tfvars | 4 ++-- variables.tf | 4 ++-- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1c0f956..5ff5b48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Base layer -FROM ubuntu:22.04 as baseline +FROM ubuntu:22.04 AS baseline RUN apt-get update && apt-get upgrade -y --no-install-recommends \ && apt-get install -y python3 python3-dev python3-pip curl unzip gnupg --no-install-recommends \ && update-alternatives --install /usr/bin/python python /usr/bin/python3 1 \ @@ -7,9 +7,9 @@ RUN apt-get update && apt-get upgrade -y --no-install-recommends \ && apt-get clean && rm -rf /var/lib/apt/lists/* # Layers used for building/downloading/installing tools -FROM baseline as tool_builder +FROM baseline AS tool_builder ARG HELM_VERSION=3.16.2 -ARG KUBECTL_VERSION=1.29.10 +ARG KUBECTL_VERSION=1.30.8 ARG TERRAFORM_VERSION=1.9.8-* WORKDIR /build diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md index ed3e37c..20bf176 100644 --- a/docs/CONFIG-VARS.md +++ b/docs/CONFIG-VARS.md @@ -69,9 +69,9 @@ Terraform input variables can be set in the following ways: | Name | Description | Type | Default | Notes | | :--- | :--- | :--- | :--- | :--- | -| cluster_version | Kubernetes version | string | "1.29.7" | Valid values are listed here: [SAS Viya platform Supported Kubernetes Versions](https://documentation.sas.com/?cdcId=itopscdc&cdcVersion=default&docsetId=itopssr&docsetTarget=n1ika6zxghgsoqn1mq4bck9dx695.htm#p03v0o4maa8oidn1awe0w4xlxcf6). | +| cluster_version | Kubernetes version | string | "1.30.8" | Valid values are listed here: [SAS Viya platform Supported Kubernetes Versions](https://documentation.sas.com/?cdcId=itopscdc&cdcVersion=default&docsetId=itopssr&docsetTarget=n1ika6zxghgsoqn1mq4bck9dx695.htm#p03v0o4maa8oidn1awe0w4xlxcf6). | | cluster_cni | Kubernetes container network interface (CNI) | string | "calico" | | -| cluster_cni_version | Kubernetes Container Network Interface (CNI) Version | string | "3.28.0" | | +| cluster_cni_version | Kubernetes Container Network Interface (CNI) Version | string | "3.29.0" | | | cluster_cri | Kubernetes container runtime interface (CRI) | string | "containerd" | | | cluster_cri_version | Version of the CRI specifed by `cluster_cri` to be installed | string | "1.6.28" | Set as an empty string to use the latest upstream version from the Docker APT repository. Currently only containerd is supported, see the [releases page](https://github.com/containerd/containerd/releases) for available versions | | cluster_service_subnet | Kubernetes service subnet | string | "10.43.0.0/16" | | @@ -353,11 +353,11 @@ The following variables are used to describe the machine targets for the SAS Viy | prefix | A prefix used in the names of all the resources created by this script | string | | | | deployment_type | Type of deployment to be performed | string | "bare_metal" | Specify `bare_metal` or `vsphere`. | | kubernetes_cluster_name | Cluster name | string | "{{ prefix }}-oss" | This item is auto-filled. **ONLY** change the `prefix` value described previously. | -| kubernetes_version | Kubernetes version | string | "1.29.7" | Valid values are listed here: [Kubernetes Releases](https://kubernetes.io/releases/). | +| kubernetes_version | Kubernetes version | string | "1.30.8" | Valid values are listed here: [Kubernetes Releases](https://kubernetes.io/releases/). | | kubernetes_upgrade_allowed | | bool | true | **NOTE:** Not currently used. | | kubernetes_arch | | string | "{{ vm_arch }}" | This item is auto-filled. **ONLY** change the `vm_arch` value described previously. | | kubernetes_cni | Kubernetes Container Network Interface (CNI) | string | "calico" | | -| kubernetes_cni_version | Kubernetes Container Network Interface (CNI) Version | string | "3.28.0" | | +| kubernetes_cni_version | Kubernetes Container Network Interface (CNI) Version | string | "3.29.0" | | | kubernetes_cri | Kubernetes Container Runtime Interface (CRI) | string | "containerd" | | | kubernetes_cri_version | Version of the CRI specifed by `kubernetes_cri` to be installed | string | "1.6.28" | Set as an empty string to use the latest upstream version from the Docker APT repository. Currently only containerd is supported, see the [releases page](https://github.com/containerd/containerd/releases) for available versions | | | kubernetes_service_subnet | Kubernetes service subnet | string | "10.43.0.0/16" | | diff --git a/docs/REQUIREMENTS.md b/docs/REQUIREMENTS.md index 59908b5..6142204 100644 --- a/docs/REQUIREMENTS.md +++ b/docs/REQUIREMENTS.md @@ -215,9 +215,9 @@ vsphere_network = "" # Name of the network to to use for the VMs system_ssh_keys_dir = "~/.ssh" # Directory holding public keys to be used on each machine # Kubernetes - Cluster -cluster_version = "1.29.7" # Kubernetes version +cluster_version = "1.30.8" # Kubernetes version cluster_cni = "calico" # Kubernetes Container Network Interface (CNI) -cluster_cni_version = "3.28.0" # Kubernetes Container Network Interface (CNI) Version +cluster_cni_version = "3.29.0" # Kubernetes Container Network Interface (CNI) Version cluster_cri = "containerd" # Kubernetes Container Runtime Interface (CRI) cluster_cri_version = "1.6.28" # Kubernetes Container Runtime Interface (CRI) Version cluster_service_subnet = "10.35.0.0/16" # Kubernetes service subnet @@ -522,7 +522,7 @@ kubernetes_version : "" kubernetes_upgrade_allowed : true kubernetes_arch : "{{ vm_arch }}" kubernetes_cni : "calico" # Choices : [calico] -kubernetes_cni_version : "3.28.0" # Choices : [3.28.0] +kubernetes_cni_version : "3.29.0" # Choices : [3.29.0] kubernetes_cri : "containerd" # Choices : [containerd] kubernetes_cri_version : "1.6.28" # Choices : [1.6.28] kubernetes_service_subnet : "" diff --git a/docs/user/Dependencies.md b/docs/user/Dependencies.md index 0d3b9b5..a77d40c 100644 --- a/docs/user/Dependencies.md +++ b/docs/user/Dependencies.md @@ -53,7 +53,7 @@ Example of using build arguments to control specific versions of dependencies in ```bash # Override kubectl version docker build \ - --build-arg KUBECTL_VERSION=1.29.7 \ + --build-arg KUBECTL_VERSION=1.30.8 \ -t viya4-iac-k8s . ``` diff --git a/examples/bare-metal/sample-ansible-vars.yaml b/examples/bare-metal/sample-ansible-vars.yaml index acffce3..53440c9 100644 --- a/examples/bare-metal/sample-ansible-vars.yaml +++ b/examples/bare-metal/sample-ansible-vars.yaml @@ -24,7 +24,7 @@ kubernetes_version : "" kubernetes_upgrade_allowed : true kubernetes_arch : "{{ vm_arch }}" kubernetes_cni : "calico" # Choices : [calico] -kubernetes_cni_version : "3.28.0" # Choices : [3.28.0] +kubernetes_cni_version : "3.29.0" # Choices : [3.29.0] kubernetes_cri : "containerd" # Choices : [containerd] kubernetes_cri_version : "1.6.28" # Choices : [1.6.28] kubernetes_service_subnet : "" diff --git a/examples/vsphere/sample-terraform-dhcp.tfvars b/examples/vsphere/sample-terraform-dhcp.tfvars index 176b202..c6d5a79 100644 --- a/examples/vsphere/sample-terraform-dhcp.tfvars +++ b/examples/vsphere/sample-terraform-dhcp.tfvars @@ -18,9 +18,9 @@ vsphere_network = "" # Name of the network to to use for the VMs system_ssh_keys_dir = "~/.ssh/oss" # Directory holding public keys to be used on each system # Kubernetes - Cluster -cluster_version = "1.29.7" # Kubernetes Version +cluster_version = "1.30.8" # Kubernetes Version cluster_cni = "calico" # Kubernetes Container Network Interface (CNI) -cluster_cni_version = "3.28.0" # Kubernetes Container Network Interface (CNI) Version +cluster_cni_version = "3.29.0" # Kubernetes Container Network Interface (CNI) Version cluster_cri = "containerd" # Kubernetes Container Runtime Interface (CRI) cluster_cri_version = "1.6.28" # Kubernetes Container Runtime Interface (CRI) Version cluster_service_subnet = "10.43.0.0/16" # Kubernetes Service Subnet diff --git a/examples/vsphere/sample-terraform-minimal.tfvars b/examples/vsphere/sample-terraform-minimal.tfvars index 2e87c3c..35ae458 100644 --- a/examples/vsphere/sample-terraform-minimal.tfvars +++ b/examples/vsphere/sample-terraform-minimal.tfvars @@ -18,9 +18,9 @@ vsphere_network = "" # Name of the network to to use for the VMs system_ssh_keys_dir = "~/.ssh/oss" # Directory holding public keys to be used on each system # Kubernetes - Cluster -cluster_version = "1.29.7" # Kubernetes Version +cluster_version = "1.30.8" # Kubernetes Version cluster_cni = "calico" # Kubernetes Container Network Interface (CNI) -cluster_cni_version = "3.28.0" # Kubernetes Container Network Interface (CNI) Version +cluster_cni_version = "3.29.0" # Kubernetes Container Network Interface (CNI) Version cluster_cri = "containerd" # Kubernetes Container Runtime Interface (CRI) cluster_cri_version = "1.6.28" # Kubernetes Container Runtime Interface (CRI) Version cluster_service_subnet = "10.43.0.0/16" # Kubernetes Service Subnet diff --git a/examples/vsphere/sample-terraform-static-ips.tfvars b/examples/vsphere/sample-terraform-static-ips.tfvars index 57ed206..704cb61 100644 --- a/examples/vsphere/sample-terraform-static-ips.tfvars +++ b/examples/vsphere/sample-terraform-static-ips.tfvars @@ -18,9 +18,9 @@ vsphere_network = "" # Name of the network to to use for the VMs system_ssh_keys_dir = "~/.ssh/oss" # Directory holding public keys to be used on each system # Kubernetes - Cluster -cluster_version = "1.29.7" # Kubernetes Version +cluster_version = "1.30.8" # Kubernetes Version cluster_cni = "calico" # Kubernetes Container Network Interface (CNI) -cluster_cni_version = "3.28.0" # Kubernetes Container Network Interface (CNI) Version +cluster_cni_version = "3.29.0" # Kubernetes Container Network Interface (CNI) Version cluster_cri = "containerd" # Kubernetes Container Runtime Interface (CRI) cluster_cri_version = "1.6.28" # Kubernetes Container Runtime Interface (CRI) Version cluster_service_subnet = "10.43.0.0/16" # Kubernetes Service Subnet diff --git a/examples/vsphere/sample-terraform-static-singlestore.tfvars b/examples/vsphere/sample-terraform-static-singlestore.tfvars index d782bbd..59ab845 100644 --- a/examples/vsphere/sample-terraform-static-singlestore.tfvars +++ b/examples/vsphere/sample-terraform-static-singlestore.tfvars @@ -18,9 +18,9 @@ vsphere_network = "" # Name of the network to to use for the VMs system_ssh_keys_dir = "~/.ssh/oss" # Directory holding public keys to be used on each system # Kubernetes - Cluster -cluster_version = "1.29.7" # Kubernetes Version +cluster_version = "1.30.8" # Kubernetes Version cluster_cni = "calico" # Kubernetes Container Network Interface (CNI) -cluster_cni_version = "3.28.0" # Kubernetes Container Network Interface (CNI) Version +cluster_cni_version = "3.29.0" # Kubernetes Container Network Interface (CNI) Version cluster_cri = "containerd" # Kubernetes Container Runtime Interface (CRI) cluster_cri_version = "1.6.28" # Kubernetes Container Runtime Interface (CRI) Version cluster_service_subnet = "10.43.0.0/16" # Kubernetes Service Subnet diff --git a/examples/vsphere/sample-terraform-vi.tfvars b/examples/vsphere/sample-terraform-vi.tfvars index ab1bb76..413f41b 100644 --- a/examples/vsphere/sample-terraform-vi.tfvars +++ b/examples/vsphere/sample-terraform-vi.tfvars @@ -18,9 +18,9 @@ vsphere_network = "" # Name of the network to to use for the VMs system_ssh_keys_dir = "~/.ssh/oss" # Directory holding public keys to be used on each system # Kubernetes - Cluster -cluster_version = "1.29.7" # Kubernetes Version +cluster_version = "1.30.8" # Kubernetes Version cluster_cni = "calico" # Kubernetes Container Network Interface (CNI) -cluster_cni_version = "3.28.0" # Kubernetes Container Network Interface (CNI) Version +cluster_cni_version = "3.29.0" # Kubernetes Container Network Interface (CNI) Version cluster_cri = "containerd" # Kubernetes Container Runtime Interface (CRI) cluster_cri_version = "1.6.28" # Kubernetes Container Runtime Interface (CRI) Version cluster_service_subnet = "10.43.0.0/16" # Kubernetes Service Subnet diff --git a/variables.tf b/variables.tf index 7c8ca40..0f197c2 100644 --- a/variables.tf +++ b/variables.tf @@ -297,7 +297,7 @@ variable "cluster_domain" { variable "cluster_version" { type = string - default = "1.29.7" + default = "1.30.8" } variable "cluster_cni" { @@ -307,7 +307,7 @@ variable "cluster_cni" { variable "cluster_cni_version" { type = string - default = "3.28.0" + default = "3.29.0" } variable "cluster_cri" {