Skip to content

Commit

Permalink
Merge pull request #116 from sassoftware/staging
Browse files Browse the repository at this point in the history 
3.9.0 - March 21, 2024
  • Loading branch information
@jarpat
jarpat authored Mar 21, 2024
2 parents 076fee5 + 2d36647 commit 217d0f6
Show file tree
Hide file tree
Showing 19 changed files with 98 additions and 96 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ RUN apt-get update && apt-get upgrade -y --no-install-recommends \

# Layers used for building/downloading/installing tools
FROM baseline as tool_builder
ARG HELM_VERSION=3.13.2
ARG KUBECTL_VERSION=1.27.9
ARG TERRAFORM_VERSION=1.6.6-*
ARG HELM_VERSION=3.14.2
ARG KUBECTL_VERSION=1.27.11
ARG TERRAFORM_VERSION=1.7.4-*

WORKDIR /build

Expand Down
20 changes: 10 additions & 10 deletions docs/CONFIG-VARS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ Terraform input variables can be set in the following ways:

| Name | Description | Type | Default | Notes |
| :--- | :--- | :--- | :--- | :--- |
| 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). |
| 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.5.7. |
| 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 @@ -297,7 +297,7 @@ Each server element, like `foo = {}`, can contain none, some, or all of the para
| server_memory | Memory in MB | number | 16385 | |
| server_disk_size | Size of disk in GB | number | 250 | |
| server_ip | Static IP address for PostgreSQL server | string | | This is a required field. |
| 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. |
| 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. |
| server_ssl | Enable/disable SSL | string | "off" | |
| 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. |
| 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. |
Expand Down Expand Up @@ -326,7 +326,7 @@ postgres_servers = {
server_memory = 16384 # 16 GB
server_disk_size = 250 # 256 GB
server_ip = "10.10.10.11" # Assigned values for static IPs
server_version = 13 # PostgreSQL version
server_version = 15 # PostgreSQL version
server_ssl = "on" # SSL flag
server_ssl_cert_file = "./ssl_cert.pem" # Path to the PostgreSQL SSL certificate file
server_ssl_key_file = "./ssl_cert.key" # Path to the PostgreSQL SSL key file
Expand All @@ -353,16 +353,16 @@ 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.27.9" | Valid values are listed here: [Kubernetes Releases](https://kubernetes.io/releases/). |
| kubernetes_version | Kubernetes version | string | "1.27.11" | 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.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
26 changes: 13 additions & 13 deletions docs/REQUIREMENTS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ This section provides an example configuration based on the physical-machine and

### vCenter/vSphere Sample tfvars File

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.
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

For this example, the network setup is as follows:

Expand Down Expand Up @@ -203,17 +203,17 @@ 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.27.9" # Kubernetes version
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 @@ -377,7 +377,7 @@ postgres_servers = {
server_memory = 16384 # 16 GB
server_disk_size = 250 # 256 GB
server_ip = "10.18.0.14" # Assigned values for static IPs
server_version = 13 # PostgreSQL version
server_version = 15 # PostgreSQL version
server_ssl = "off" # SSL flag
administrator_login = "postgres" # PostgreSQL admin user - CANNOT BE CHANGED
administrator_password = "my$up3rS3cretPassw0rd" # PostgreSQL admin user password
Expand Down Expand Up @@ -460,7 +460,7 @@ nfs_server
[viya4_oss_default_pgsql]
192.168.5.0
[viya4_oss_default_pgsql:vars]
postgres_server_version=12
postgres_server_version=15
postgres_server_ssl=off # NOTE: Values - [on,off]
postgres_administrator_login="postgres" # NOTE: Do not change this value at this time
postgres_administrator_password="Un33d2ChgM3n0W!"
Expand Down Expand Up @@ -489,7 +489,7 @@ ansible_user : ""
ansible_password : ""

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

# System items
Expand All @@ -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 Expand Up @@ -672,6 +672,6 @@ The third-party applications that are listed in the following table are supporte
| Application | Minimum Version |
| ---: | ---: |
| [Ansible](https://www.ansible.com/) | Core 2.16.1 |
| [Terraform](https://www.terraform.io/) | 1.6.6 |
| [Terraform](https://www.terraform.io/) | 1.7.4 |
| [Docker](https://www.docker.com/) | 20.10.17 |
| [Helm](https://helm.sh/) | 3.13.2 |
| [Helm](https://helm.sh/) | 3.14.2 |
Loading

0 comments on commit 217d0f6

Please sign in to comment.