From edbd72224e1db336f4a9783f436fd5706ff5b146 Mon Sep 17 00:00:00 2001 From: jarpat Date: Tue, 27 Feb 2024 10:10:21 -0500 Subject: [PATCH] bump calico, containerd, kube-vip, & metallb --- docs/CONFIG-VARS.md | 12 ++++++------ docs/REQUIREMENTS.md | 12 ++++++------ examples/bare-metal/sample-ansible-vars.yaml | 6 +++--- examples/vsphere/sample-terraform-dhcp.tfvars | 6 +++--- examples/vsphere/sample-terraform-minimal.tfvars | 6 +++--- examples/vsphere/sample-terraform-static-ips.tfvars | 6 +++--- .../sample-terraform-static-singlestore.tfvars | 6 +++--- examples/vsphere/sample-terraform-vi.tfvars | 6 +++--- roles/kubernetes/cri/containerd/defaults/main.yaml | 2 +- .../loadbalancer/metallb/defaults/main.yaml | 2 +- variables.tf | 6 +++--- 11 files changed, 35 insertions(+), 35 deletions(-) diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md index 587e75e..a279d4f 100644 --- a/docs/CONFIG-VARS.md +++ b/docs/CONFIG-VARS.md @@ -71,9 +71,9 @@ Terraform input variables can be set in the following ways: | :--- | :--- | :--- | :--- | :--- | | cluster_version | Kubernetes version | string | "1.27.11" | 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.27.0" | | +| cluster_cni_version | Kubernetes Container Network Interface (CNI) Version | string | "3.27.2" | | | 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.26" | 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_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" | | | cluster_pod_subnet | Kubernetes pod subnet | string | "10.42.0.0/16" | | | cluster_domain | Cluster domain suffix for DNS | string | | | @@ -82,7 +82,7 @@ Terraform input variables can be set in the following ways: | Name | Description | Type | Default | Notes | | :--- | :--- | :--- | :--- | :--- | -| cluster_vip_version | kube-vip version | string | "0.5.7" | Currently kube-vip is the only supported Kubernetes virtual IP address. The minimum supported version is 0.5.7. | +| cluster_vip_version | kube-vip version | string | "0.7.1" | Currently kube-vip is the only supported Kubernetes virtual IP address. The minimum supported version is 0.7.1. | | cluster_vip_ip | kube-vip IP address | string | | IP address assigned to the FQDN value. You must access the cluster via the FQDN value supplied. | | cluster_vip_fqdn | kube-vip DNS | string | | FQDN used in the creation of the kubeconfig file, which is used to access the cluster. | @@ -357,12 +357,12 @@ The following variables are used to describe the machine targets for the SAS Viy | 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.27.0" | | +| kubernetes_cni_version | Kubernetes Container Network Interface (CNI) Version | string | "3.27.2" | | | 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.26" | 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_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" | | | kubernetes_pod_subnet | Kubernetes pod subnet | string | "10.42.0.0/16" | | -| kubernetes_vip_version | kube-vip version | string | "0.5.7" | | +| kubernetes_vip_version | kube-vip version | string | "0.7.1" | | | kubernetes_vip_ip | kube-vip IP address | string | | | | kubernetes_vip_fqdn | kube-vip DNS | string | | | | kubernetes_loadbalancer | Load balancer provider | string | "kube_vip" | Choices are `kube_vip` or `metallb`. | diff --git a/docs/REQUIREMENTS.md b/docs/REQUIREMENTS.md index 74a5558..a73dd16 100644 --- a/docs/REQUIREMENTS.md +++ b/docs/REQUIREMENTS.md @@ -205,15 +205,15 @@ system_ssh_keys_dir = "~/.ssh" # Directory holding public keys to be used on eac # Kubernetes - Cluster cluster_version = "1.27.11" # Kubernetes version cluster_cni = "calico" # Kubernetes Container Network Interface (CNI) -cluster_cni_version = "3.27.0" # Kubernetes Container Network Interface (CNI) Version +cluster_cni_version = "3.27.2" # Kubernetes Container Network Interface (CNI) Version cluster_cri = "containerd" # Kubernetes Container Runtime Interface (CRI) -cluster_cri_version = "1.6.26" # Kubernetes Container Runtime Interface (CRI) Version +cluster_cri_version = "1.6.28" # Kubernetes Container Runtime Interface (CRI) Version cluster_service_subnet = "10.35.0.0/16" # Kubernetes service subnet cluster_pod_subnet = "10.36.0.0/16" # Kubernetes Pod subnet cluster_domain = "sample.domain.foo.com" # Cluster domain suffix for DNS # Kubernetes - Cluster VIP -cluster_vip_version = "0.5.7" +cluster_vip_version = "0.7.1" cluster_vip_ip = "10.18.0.175" cluster_vip_fqdn = "vm-dev-oss-vip.sample.domain.foo.com" @@ -510,9 +510,9 @@ kubernetes_version : "" kubernetes_upgrade_allowed : true kubernetes_arch : "{{ vm_arch }}" kubernetes_cni : "calico" # Choices : [calico] -kubernetes_cni_version : "3.27.0" # Choices : [3.27.0] +kubernetes_cni_version : "3.27.2" # Choices : [3.27.2] kubernetes_cri : "containerd" # Choices : [containerd] -kubernetes_cri_version : "1.6.26" # Choices : [1.6.26] +kubernetes_cri_version : "1.6.28" # Choices : [1.6.28] kubernetes_service_subnet : "" kubernetes_pod_subnet : "" @@ -524,7 +524,7 @@ kubernetes_pod_subnet : "" # VIP IP : https://kube-vip.io/docs/installation/static/ # VIP Cloud Provider IP Range : https://kube-vip.io/docs/usage/cloud-provider/#the-kube-vip-cloud-provider-configmap # -kubernetes_vip_version : "0.5.7" +kubernetes_vip_version : "0.7.1" kubernetes_vip_ip : "" kubernetes_vip_fqdn : "" diff --git a/examples/bare-metal/sample-ansible-vars.yaml b/examples/bare-metal/sample-ansible-vars.yaml index f8f611f..e3a7793 100644 --- a/examples/bare-metal/sample-ansible-vars.yaml +++ b/examples/bare-metal/sample-ansible-vars.yaml @@ -24,9 +24,9 @@ kubernetes_version : "" kubernetes_upgrade_allowed : true kubernetes_arch : "{{ vm_arch }}" kubernetes_cni : "calico" # Choices : [calico] -kubernetes_cni_version : "3.27.0" # Choices : [3.27.0] +kubernetes_cni_version : "3.27.2" # Choices : [3.27.2] kubernetes_cri : "containerd" # Choices : [containerd] -kubernetes_cri_version : "1.6.26" # Choices : [1.6.26] +kubernetes_cri_version : "1.6.28" # Choices : [1.6.28] kubernetes_service_subnet : "" kubernetes_pod_subnet : "" @@ -36,7 +36,7 @@ kubernetes_pod_subnet : "" # # VIP IP : https://kube-vip.io/docs/installation/static/ # -kubernetes_vip_version : "0.5.7" +kubernetes_vip_version : "0.7.1" kubernetes_vip_ip : "" kubernetes_vip_fqdn : "" diff --git a/examples/vsphere/sample-terraform-dhcp.tfvars b/examples/vsphere/sample-terraform-dhcp.tfvars index dbfc1a6..5c15b52 100644 --- a/examples/vsphere/sample-terraform-dhcp.tfvars +++ b/examples/vsphere/sample-terraform-dhcp.tfvars @@ -20,15 +20,15 @@ system_ssh_keys_dir = "~/.ssh/oss" # Directory holding public keys to be used on # Kubernetes - Cluster cluster_version = "1.27.11" # Kubernetes Version cluster_cni = "calico" # Kubernetes Container Network Interface (CNI) -cluster_cni_version = "3.27.0" # Kubernetes Container Network Interface (CNI) Version +cluster_cni_version = "3.27.2" # Kubernetes Container Network Interface (CNI) Version cluster_cri = "containerd" # Kubernetes Container Runtime Interface (CRI) -cluster_cri_version = "1.6.26" # Kubernetes Container Runtime Interface (CRI) Version +cluster_cri_version = "1.6.28" # Kubernetes Container Runtime Interface (CRI) Version cluster_service_subnet = "10.43.0.0/16" # Kubernetes Service Subnet cluster_pod_subnet = "10.42.0.0/16" # Kubernetes Pod Subnet cluster_domain = "" # Cluster domain suffix for DNS # Kubernetes - Cluster VIP -cluster_vip_version = "0.5.7" +cluster_vip_version = "0.7.1" cluster_vip_ip = "" cluster_vip_fqdn = "" diff --git a/examples/vsphere/sample-terraform-minimal.tfvars b/examples/vsphere/sample-terraform-minimal.tfvars index c4d7c20..d45063c 100644 --- a/examples/vsphere/sample-terraform-minimal.tfvars +++ b/examples/vsphere/sample-terraform-minimal.tfvars @@ -20,15 +20,15 @@ system_ssh_keys_dir = "~/.ssh/oss" # Directory holding public keys to be used on # Kubernetes - Cluster cluster_version = "1.27.11" # Kubernetes Version cluster_cni = "calico" # Kubernetes Container Network Interface (CNI) -cluster_cni_version = "3.27.0" # Kubernetes Container Network Interface (CNI) Version +cluster_cni_version = "3.27.2" # Kubernetes Container Network Interface (CNI) Version cluster_cri = "containerd" # Kubernetes Container Runtime Interface (CRI) -cluster_cri_version = "1.6.26" # Kubernetes Container Runtime Interface (CRI) Version +cluster_cri_version = "1.6.28" # Kubernetes Container Runtime Interface (CRI) Version cluster_service_subnet = "10.43.0.0/16" # Kubernetes Service Subnet cluster_pod_subnet = "10.42.0.0/16" # Kubernetes Pod Subnet cluster_domain = "" # Cluster domain suffix for DNS # Kubernetes - Cluster VIP -cluster_vip_version = "0.5.7" +cluster_vip_version = "0.7.1" cluster_vip_ip = "" cluster_vip_fqdn = "" diff --git a/examples/vsphere/sample-terraform-static-ips.tfvars b/examples/vsphere/sample-terraform-static-ips.tfvars index 77769ba..a9effc3 100644 --- a/examples/vsphere/sample-terraform-static-ips.tfvars +++ b/examples/vsphere/sample-terraform-static-ips.tfvars @@ -20,15 +20,15 @@ system_ssh_keys_dir = "~/.ssh/oss" # Directory holding public keys to be used on # Kubernetes - Cluster cluster_version = "1.27.11" # Kubernetes Version cluster_cni = "calico" # Kubernetes Container Network Interface (CNI) -cluster_cni_version = "3.27.0" # Kubernetes Container Network Interface (CNI) Version +cluster_cni_version = "3.27.2" # Kubernetes Container Network Interface (CNI) Version cluster_cri = "containerd" # Kubernetes Container Runtime Interface (CRI) -cluster_cri_version = "1.6.26" # Kubernetes Container Runtime Interface (CRI) Version +cluster_cri_version = "1.6.28" # Kubernetes Container Runtime Interface (CRI) Version cluster_service_subnet = "10.43.0.0/16" # Kubernetes Service Subnet cluster_pod_subnet = "10.42.0.0/16" # Kubernetes Pod Subnet cluster_domain = "" # Cluster domain suffix for DNS # Kubernetes - Cluster VIP -cluster_vip_version = "0.5.7" +cluster_vip_version = "0.7.1" cluster_vip_ip = "" cluster_vip_fqdn = "" diff --git a/examples/vsphere/sample-terraform-static-singlestore.tfvars b/examples/vsphere/sample-terraform-static-singlestore.tfvars index 27a3de7..e27b1a9 100644 --- a/examples/vsphere/sample-terraform-static-singlestore.tfvars +++ b/examples/vsphere/sample-terraform-static-singlestore.tfvars @@ -20,15 +20,15 @@ system_ssh_keys_dir = "~/.ssh/oss" # Directory holding public keys to be used on # Kubernetes - Cluster cluster_version = "1.27.11" # Kubernetes Version cluster_cni = "calico" # Kubernetes Container Network Interface (CNI) -cluster_cni_version = "3.27.0" # Kubernetes Container Network Interface (CNI) Version +cluster_cni_version = "3.27.2" # Kubernetes Container Network Interface (CNI) Version cluster_cri = "containerd" # Kubernetes Container Runtime Interface (CRI) -cluster_cri_version = "1.6.26" # Kubernetes Container Runtime Interface (CRI) Version +cluster_cri_version = "1.6.28" # Kubernetes Container Runtime Interface (CRI) Version cluster_service_subnet = "10.43.0.0/16" # Kubernetes Service Subnet cluster_pod_subnet = "10.42.0.0/16" # Kubernetes Pod Subnet cluster_domain = "" # Cluster domain suffix for DNS # Kubernetes - Cluster VIP -cluster_vip_version = "0.5.7" +cluster_vip_version = "0.7.1" cluster_vip_ip = "" cluster_vip_fqdn = "" diff --git a/examples/vsphere/sample-terraform-vi.tfvars b/examples/vsphere/sample-terraform-vi.tfvars index a918011..fde1002 100644 --- a/examples/vsphere/sample-terraform-vi.tfvars +++ b/examples/vsphere/sample-terraform-vi.tfvars @@ -20,15 +20,15 @@ system_ssh_keys_dir = "~/.ssh/oss" # Directory holding public keys to be used on # Kubernetes - Cluster cluster_version = "1.27.11" # Kubernetes Version cluster_cni = "calico" # Kubernetes Container Network Interface (CNI) -cluster_cni_version = "3.27.0" # Kubernetes Container Network Interface (CNI) Version +cluster_cni_version = "3.27.2" # Kubernetes Container Network Interface (CNI) Version cluster_cri = "containerd" # Kubernetes Container Runtime Interface (CRI) -cluster_cri_version = "1.6.26" # Kubernetes Container Runtime Interface (CRI) Version +cluster_cri_version = "1.6.28" # Kubernetes Container Runtime Interface (CRI) Version cluster_service_subnet = "10.43.0.0/16" # Kubernetes Service Subnet cluster_pod_subnet = "10.42.0.0/16" # Kubernetes Pod Subnet cluster_domain = "" # Cluster domain suffix for DNS # Kubernetes - Cluster VIP -cluster_vip_version = "0.5.7" +cluster_vip_version = "0.7.1" cluster_vip_ip = "" cluster_vip_fqdn = "" diff --git a/roles/kubernetes/cri/containerd/defaults/main.yaml b/roles/kubernetes/cri/containerd/defaults/main.yaml index 04f502d..d60bd03 100644 --- a/roles/kubernetes/cri/containerd/defaults/main.yaml +++ b/roles/kubernetes/cri/containerd/defaults/main.yaml @@ -11,5 +11,5 @@ # Focal 20 https://download.docker.com/linux/ubuntu/dists/focal/stable/binary-amd64/ # On that page select "Packages" and the text file that is downloaded will contain all the versions of # containerd available in the repository. -kubernetes_cri_version: "1.6.26" +kubernetes_cri_version: "1.6.28" kubernetes_cri_deb_rev: "" diff --git a/roles/kubernetes/loadbalancer/metallb/defaults/main.yaml b/roles/kubernetes/loadbalancer/metallb/defaults/main.yaml index fe199cf..4067070 100644 --- a/roles/kubernetes/loadbalancer/metallb/defaults/main.yaml +++ b/roles/kubernetes/loadbalancer/metallb/defaults/main.yaml @@ -7,7 +7,7 @@ METALLB_NAME: metallb METALLB_NAMESPACE: kube-system METALLB_CHART_NAME: metallb METALLB_CHART_URL: https://metallb.github.io/metallb -METALLB_CHART_VERSION: 0.13.7 +METALLB_CHART_VERSION: 0.14.3 METALLB_KUBE_CONFIG: ~/.kube/config METALLB_CONFIG: controller: diff --git a/variables.tf b/variables.tf index ca7b567..ad5cb38 100644 --- a/variables.tf +++ b/variables.tf @@ -307,7 +307,7 @@ variable "cluster_cni" { variable "cluster_cni_version" { type = string - default = "3.27.0" + default = "3.27.2" } variable "cluster_cri" { @@ -317,7 +317,7 @@ variable "cluster_cri" { variable "cluster_cri_version" { type = string - default = "1.6.26" + default = "1.6.28" } variable "cluster_service_subnet" { @@ -332,7 +332,7 @@ variable "cluster_pod_subnet" { variable "cluster_vip_version" { type = string - default = "0.5.7" + default = "0.7.1" } variable "cluster_vip_ip" {