Skip to content

Commit

Permalink
bump calico, containerd, kube-vip, & metallb
Browse files Browse the repository at this point in the history
  • Loading branch information
jarpat committed Feb 27, 2024
1 parent 74acf97 commit edbd722
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 35 deletions.
12 changes: 6 additions & 6 deletions docs/CONFIG-VARS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 | | |
Expand All @@ -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. |

Expand Down Expand Up @@ -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`. |
Expand Down
12 changes: 6 additions & 6 deletions docs/REQUIREMENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 : ""

Expand All @@ -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 : ""

Expand Down
6 changes: 3 additions & 3 deletions examples/bare-metal/sample-ansible-vars.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 : ""

Expand All @@ -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 : ""

Expand Down
6 changes: 3 additions & 3 deletions examples/vsphere/sample-terraform-dhcp.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""

Expand Down
6 changes: 3 additions & 3 deletions examples/vsphere/sample-terraform-minimal.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""

Expand Down
6 changes: 3 additions & 3 deletions examples/vsphere/sample-terraform-static-ips.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""

Expand Down
6 changes: 3 additions & 3 deletions examples/vsphere/sample-terraform-static-singlestore.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""

Expand Down
6 changes: 3 additions & 3 deletions examples/vsphere/sample-terraform-vi.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""

Expand Down
2 changes: 1 addition & 1 deletion roles/kubernetes/cri/containerd/defaults/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
2 changes: 1 addition & 1 deletion roles/kubernetes/loadbalancer/metallb/defaults/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ variable "cluster_cni" {

variable "cluster_cni_version" {
type = string
default = "3.27.0"
default = "3.27.2"
}

variable "cluster_cri" {
Expand All @@ -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" {
Expand All @@ -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" {
Expand Down

0 comments on commit edbd722

Please sign in to comment.