Skip to content

Commit 217d0f6

Browse files
jarpatjarpat
authored
Merge pull request #116 from sassoftware/staging
3.9.0 - March 21, 2024
2 parents 076fee5 + 2d36647 commit 217d0f6

File tree

19 files changed

+98
-96
lines changed

19 files changed

+98
-96
lines changed

‎Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ RUN apt-get update && apt-get upgrade -y --no-install-recommends \
88

99
# Layers used for building/downloading/installing tools
1010
FROM baseline as tool_builder
11-
ARG HELM_VERSION=3.13.2
12-
ARG KUBECTL_VERSION=1.27.9
13-
ARG TERRAFORM_VERSION=1.6.6-*
11+
ARG HELM_VERSION=3.14.2
12+
ARG KUBECTL_VERSION=1.27.11
13+
ARG TERRAFORM_VERSION=1.7.4-*
1414

1515
WORKDIR /build
1616

‎docs/CONFIG-VARS.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ Terraform input variables can be set in the following ways:
6969

7070
| Name | Description | Type | Default | Notes |
7171
| :--- | :--- | :--- | :--- | :--- |
72-
| cluster_version | Kubernetes version | string | "1.27.9" | 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). |
72+
| 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). |
7373
| cluster_cni | Kubernetes container network interface (CNI) | string | "calico" | |
74-
| cluster_cni_version | Kubernetes Container Network Interface (CNI) Version | string | "3.27.0" | |
74+
| cluster_cni_version | Kubernetes Container Network Interface (CNI) Version | string | "3.27.2" | |
7575
| cluster_cri | Kubernetes container runtime interface (CRI) | string | "containerd" | |
76-
| 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 |
76+
| 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 |
7777
| cluster_service_subnet | Kubernetes service subnet | string | "10.43.0.0/16" | |
7878
| cluster_pod_subnet | Kubernetes pod subnet | string | "10.42.0.0/16" | |
7979
| cluster_domain | Cluster domain suffix for DNS | string | | |
@@ -82,7 +82,7 @@ Terraform input variables can be set in the following ways:
8282

8383
| Name | Description | Type | Default | Notes |
8484
| :--- | :--- | :--- | :--- | :--- |
85-
| 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. |
85+
| 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.5.7. |
8686
| 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. |
8787
| cluster_vip_fqdn | kube-vip DNS | string | | FQDN used in the creation of the kubeconfig file, which is used to access the cluster. |
8888

@@ -297,7 +297,7 @@ Each server element, like `foo = {}`, can contain none, some, or all of the para
297297
| server_memory | Memory in MB | number | 16385 | |
298298
| server_disk_size | Size of disk in GB | number | 250 | |
299299
| server_ip | Static IP address for PostgreSQL server | string | | This is a required field. |
300-
| server_version | The version of the PostgreSQL server | string | "13" | Refer to the [SAS Viya platform System Requirements](https://documentation.sas.com/?cdcId=sasadmincdc&cdcVersion=default&docsetId=itopssr&docsetTarget=p05lfgkwib3zxbn1t6nyihexp12n.htm#p1wq8ouke3c6ixn1la636df9oa1u) for the supported versions of PostgreSQL for the SAS Viya platform. |
300+
| server_version | The version of the PostgreSQL server | string | "15" | Refer to the [SAS Viya platform System Requirements](https://documentation.sas.com/?cdcId=sasadmincdc&cdcVersion=default&docsetId=itopssr&docsetTarget=p05lfgkwib3zxbn1t6nyihexp12n.htm#p1wq8ouke3c6ixn1la636df9oa1u) for the supported versions of PostgreSQL for the SAS Viya platform. |
301301
| server_ssl | Enable/disable SSL | string | "off" | |
302302
| server_ssl_cert_file | Path to the PostgreSQL SSL certificate file | string | "" | If `server_ssl` is enabled and this variable is not defined, the system default SSL certificate is used. |
303303
| server_ssl_key_file | Path to the PostgreSQL SSL key file | string | "" | If `server_ssl` is enabled and this variable is not defined, the system default SSL key is used. |
@@ -326,7 +326,7 @@ postgres_servers = {
326326
server_memory = 16384 # 16 GB
327327
server_disk_size = 250 # 256 GB
328328
server_ip = "10.10.10.11" # Assigned values for static IPs
329-
server_version = 13 # PostgreSQL version
329+
server_version = 15 # PostgreSQL version
330330
server_ssl = "on" # SSL flag
331331
server_ssl_cert_file = "./ssl_cert.pem" # Path to the PostgreSQL SSL certificate file
332332
server_ssl_key_file = "./ssl_cert.key" # Path to the PostgreSQL SSL key file
@@ -353,16 +353,16 @@ The following variables are used to describe the machine targets for the SAS Viy
353353
| prefix | A prefix used in the names of all the resources created by this script | string | | |
354354
| deployment_type | Type of deployment to be performed | string | "bare_metal" | Specify `bare_metal` or `vsphere`. |
355355
| kubernetes_cluster_name | Cluster name | string | "{{ prefix }}-oss" | This item is auto-filled. **ONLY** change the `prefix` value described previously. |
356-
| kubernetes_version | Kubernetes version | string | "1.27.9" | Valid values are listed here: [Kubernetes Releases](https://kubernetes.io/releases/). |
356+
| kubernetes_version | Kubernetes version | string | "1.27.11" | Valid values are listed here: [Kubernetes Releases](https://kubernetes.io/releases/). |
357357
| kubernetes_upgrade_allowed | | bool | true | **NOTE:** Not currently used. |
358358
| kubernetes_arch | | string | "{{ vm_arch }}" | This item is auto-filled. **ONLY** change the `vm_arch` value described previously. |
359359
| kubernetes_cni | Kubernetes Container Network Interface (CNI) | string | "calico" | |
360-
| kubernetes_cni_version | Kubernetes Container Network Interface (CNI) Version | string | "3.27.0" | |
360+
| kubernetes_cni_version | Kubernetes Container Network Interface (CNI) Version | string | "3.27.2" | |
361361
| kubernetes_cri | Kubernetes Container Runtime Interface (CRI) | string | "containerd" | |
362-
| 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 | |
362+
| 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 | |
363363
| kubernetes_service_subnet | Kubernetes service subnet | string | "10.43.0.0/16" | |
364364
| kubernetes_pod_subnet | Kubernetes pod subnet | string | "10.42.0.0/16" | |
365-
| kubernetes_vip_version | kube-vip version | string | "0.5.7" | |
365+
| kubernetes_vip_version | kube-vip version | string | "0.7.1" | |
366366
| kubernetes_vip_ip | kube-vip IP address | string | | |
367367
| kubernetes_vip_fqdn | kube-vip DNS | string | | |
368368
| kubernetes_loadbalancer | Load balancer provider | string | "kube_vip" | Choices are `kube_vip` or `metallb`. |

‎docs/REQUIREMENTS.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ This section provides an example configuration based on the physical-machine and
171171

172172
### vCenter/vSphere Sample tfvars File
173173

174-
If you are creating virtual machines with vCenter or vSphere, the terraform .tfvars file that you create will generate the required inventory and ansible-vars.yaml files for a SAS Viya platform deployment using the tools in the [viya4-deployment](https://github.com/sassoftware/viya4-deployment) repository.
174+
If you are creating virtual machines with vCenter or vSphere, based on the values from the `terraform.tfvars` file that you create and the resulting infrastructure, this project will generate the required `inventory` and `ansible-vars.yaml` files for use with the `setup` and `install` actions executed by the `oss-k8s.sh` script
175175

176176
For this example, the network setup is as follows:
177177

@@ -203,17 +203,17 @@ vsphere_network = "" # Name of the network to to use for the VMs
203203
system_ssh_keys_dir = "~/.ssh" # Directory holding public keys to be used on each machine
204204
205205
# Kubernetes - Cluster
206-
cluster_version = "1.27.9" # Kubernetes version
206+
cluster_version = "1.27.11" # Kubernetes version
207207
cluster_cni = "calico" # Kubernetes Container Network Interface (CNI)
208-
cluster_cni_version = "3.27.0" # Kubernetes Container Network Interface (CNI) Version
208+
cluster_cni_version = "3.27.2" # Kubernetes Container Network Interface (CNI) Version
209209
cluster_cri = "containerd" # Kubernetes Container Runtime Interface (CRI)
210-
cluster_cri_version = "1.6.26" # Kubernetes Container Runtime Interface (CRI) Version
210+
cluster_cri_version = "1.6.28" # Kubernetes Container Runtime Interface (CRI) Version
211211
cluster_service_subnet = "10.35.0.0/16" # Kubernetes service subnet
212212
cluster_pod_subnet = "10.36.0.0/16" # Kubernetes Pod subnet
213213
cluster_domain = "sample.domain.foo.com" # Cluster domain suffix for DNS
214214
215215
# Kubernetes - Cluster VIP
216-
cluster_vip_version = "0.5.7"
216+
cluster_vip_version = "0.7.1"
217217
cluster_vip_ip = "10.18.0.175"
218218
cluster_vip_fqdn = "vm-dev-oss-vip.sample.domain.foo.com"
219219
@@ -377,7 +377,7 @@ postgres_servers = {
377377
server_memory = 16384 # 16 GB
378378
server_disk_size = 250 # 256 GB
379379
server_ip = "10.18.0.14" # Assigned values for static IPs
380-
server_version = 13 # PostgreSQL version
380+
server_version = 15 # PostgreSQL version
381381
server_ssl = "off" # SSL flag
382382
administrator_login = "postgres" # PostgreSQL admin user - CANNOT BE CHANGED
383383
administrator_password = "my$up3rS3cretPassw0rd" # PostgreSQL admin user password
@@ -460,7 +460,7 @@ nfs_server
460460
[viya4_oss_default_pgsql]
461461
192.168.5.0
462462
[viya4_oss_default_pgsql:vars]
463-
postgres_server_version=12
463+
postgres_server_version=15
464464
postgres_server_ssl=off # NOTE: Values - [on,off]
465465
postgres_administrator_login="postgres" # NOTE: Do not change this value at this time
466466
postgres_administrator_password="Un33d2ChgM3n0W!"
@@ -489,7 +489,7 @@ ansible_user : ""
489489
ansible_password : ""
490490

491491
# VM items
492-
vm_os : "ubuntu" # Choices : [ubuntu|rhel] - Ubuntu 22.04 LTS / Red Hat Enterprise Linux ???
492+
vm_os : "ubuntu" # Choices : [ubuntu] - Ubuntu 22.04 LTS
493493
vm_arch : "amd64" # Choices : [amd64] - 64-bit OS / ???
494494

495495
# System items
@@ -510,9 +510,9 @@ kubernetes_version : ""
510510
kubernetes_upgrade_allowed : true
511511
kubernetes_arch : "{{ vm_arch }}"
512512
kubernetes_cni : "calico" # Choices : [calico]
513-
kubernetes_cni_version : "3.27.0" # Choices : [3.27.0]
513+
kubernetes_cni_version : "3.27.2" # Choices : [3.27.2]
514514
kubernetes_cri : "containerd" # Choices : [containerd]
515-
kubernetes_cri_version : "1.6.26" # Choices : [1.6.26]
515+
kubernetes_cri_version : "1.6.28" # Choices : [1.6.28]
516516
kubernetes_service_subnet : ""
517517
kubernetes_pod_subnet : ""
518518

@@ -524,7 +524,7 @@ kubernetes_pod_subnet : ""
524524
# VIP IP : https://kube-vip.io/docs/installation/static/
525525
# VIP Cloud Provider IP Range : https://kube-vip.io/docs/usage/cloud-provider/#the-kube-vip-cloud-provider-configmap
526526
#
527-
kubernetes_vip_version : "0.5.7"
527+
kubernetes_vip_version : "0.7.1"
528528
kubernetes_vip_ip : ""
529529
kubernetes_vip_fqdn : ""
530530

@@ -672,6 +672,6 @@ The third-party applications that are listed in the following table are supporte
672672
| Application | Minimum Version |
673673
| ---: | ---: |
674674
| [Ansible](https://www.ansible.com/) | Core 2.16.1 |
675-
| [Terraform](https://www.terraform.io/) | 1.6.6 |
675+
| [Terraform](https://www.terraform.io/) | 1.7.4 |
676676
| [Docker](https://www.docker.com/) | 20.10.17 |
677-
| [Helm](https://helm.sh/) | 3.13.2 |
677+
| [Helm](https://helm.sh/) | 3.14.2 |

0 commit comments

Comments
 (0)