Merge pull request #603 from sassoftware/staging

8.0.0 - March 19, 2025

Author: dhoucgitter

Dockerfile

@@ -9,7 +9,7 @@ RUN apt-get update && apt-get upgrade -y \
   && update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1
 
 FROM baseline AS tool_builder
-ARG kubectl_version=1.30.6
+ARG kubectl_version=1.30.10
 
 WORKDIR /build
 
@@ -24,9 +24,9 @@ RUN apk add --no-cache git build-base containers-common bash btrfs-progs-dev gli
 
 # Installation
 FROM baseline
-ARG helm_version=3.16.2
-ARG aws_cli_version=2.17.58
-ARG gcp_cli_version=496.0.0-0
+ARG helm_version=3.17.1
+ARG aws_cli_version=2.24.16
+ARG gcp_cli_version=513.0.0-0
 
 # Add extra packages
 RUN apt-get update && apt-get install --no-install-recommends -y gzip wget git jq ssh sshpass rsync \

README.md

@@ -19,7 +19,6 @@ This project contains Ansible code that creates a baseline cluster in an existin
   - Create affinity rules such that processes are targeted to appropriately labeled nodes
   - Create pod disruption budgets for each service such that cluster maintenance will not let the last instance of a service go down (during a node maintenance operation, for example)
   - Use kustomize to mount user private (home) directories and data directories on CAS nodes and on compute server instances
-  - Deploy [SAS Viya Monitoring for Kubernetes](https://github.com/sassoftware/viya4-monitoring-kubernetes)
   - Deploy MPP or SMP CAS servers
 
 - Manage SAS Viya Platform Deployments
@@ -260,7 +259,7 @@ Create and manage deployments using one of the following methods:
 
 ### DNS
 
-During the installation, an ingress load balancer can be installed for the SAS Viya platform and for the monitoring and logging stack. The host name for these services must be registered with your DNS provider in order to resolve to the LoadBalancer endpoint. This can be done by creating a record for each unique ingress controller host. 
+During the installation, an ingress load balancer can be installed for the SAS Viya platform. The host name for these services must be registered with your DNS provider in order to resolve to the LoadBalancer endpoint. This can be done by creating a record for each unique ingress controller host. 
 
 However, when you are managing multiple SAS Viya platform deployments, creating these records can be time-consuming. In such a case, SAS recommends creating a DNS record that points to the ingress controller's endpoint. The endpoint might be an IP address or FQDN, depending on the cloud provider. Take these steps:
 

docs/CONFIG-VARS.md

@@ -1,7 +1,6 @@
 # Troubleshooting
 
 - [Troubleshooting](#troubleshooting)
-  - [Viya4 Monitoring and Logging](#viya4-monitoring-and-logging)
   - [SAS Viya Orchestration Tool](#sas-viya-orchestration-tool)
   - [SAS Viya Deployment Operator](#sas-viya-deployment-operator)
   - [EKS - Cluster Autoscaler Installation](#eks---cluster-autoscaler-installation)
@@ -26,37 +25,16 @@ Example:
     --volume $HOME:/data \
     --volume $HOME/ansible-vars.yaml:/config/config \
     --volume $HOME/viya4-iac-azure/terraform.tfstate:/config/tfstate \
-    viya4-deployment --tags "baseline,viya,cluster-logging,cluster-monitoring,viya-monitoring,install" -vvv
+    viya4-deployment --tags "baseline,viya,install" -vvv
   ```
 
   ```bash
   ansible-playbook \
     -e CONFIG=$HOME/ansible-vars.yaml \
     -e TFSTATE=$HOME/viya4-iac-aws/terraform.tfstate \
-    viya4-deployment --tags "baseline,viya,cluster-logging,cluster-monitoring,viya-monitoring,install" -vvv
+    viya4-deployment --tags "baseline,viya,install" -vvv
   ```
 
-## Viya4 Monitoring and Logging
-### Symptom:
-While deploying the SAS Viya platform to a cluster with the "cluster-logging" and "install" Ansible task tags specified, the following error message is encountered.
-
-  ```bash
-TASK [monitoring : cluster-logging - deploy] ********************************************************************************
-fatal: [localhost]: FAILED! => changed=false
-  cmd: /home/user/.ansible/viya4-monitoring-kubernetes/logging/bin/deploy_logging.sh
-  msg: '[Errno 2] No such file or directory: b''/home/user/.ansible/viya4-monitoring-kubernetes/logging/bin/deploy_logging.sh'''
-  rc: 2
-
-PLAY RECAP ******************************************************************************************************************
-localhost                  : ok=52   changed=12   unreachable=0    failed=1    skipped=41   rescued=0    ignored=0
-  ```
-
-### Diagnosis:
-The cluster-logging task tried to deploy an older, incompatible release of sassoftware/viya4-monitoring-kubernetes (i.e. a release earlier than version 1.2.0) using a release of sassoftware/viya4-deployment at release 5.0.0 or later.
-Release 5.0.0 (and later) of sassoftware/viya4-deployment is only compatible with sassoftware/viya4-monitoring-kubernetes release 1.2.0 (and later).
-
-### Solution:
-When using sassoftware/viya4-deployment releases 5.0.0 or later, specify either the stable branch or a valid sassoftware/viya4-monitoring-kubernetes release tag of 1.2.0 or later for the value of the V4M_VERSION sassoftware/viya4-deployment variable, For more details on supported variables, refer to [CONFIG-VARS.md](./CONFIG-VARS.md)
 
 ## SAS Viya Orchestration Tool
 

docs/Troubleshooting.md

@@ -43,15 +43,12 @@ Actions are used to install or uninstall software. One must be set when running
 
 ### Tasks
 
-Any number of tasks can be run at the same time. An action can run against a single task or all tasks.
+More than one task can be run at the same time. An action can run against a single task or all tasks.
 
 | Name | Description |
 | :--- | :--- |
 | baseline | Installs cluster level tooling needed for all SAS Viya platform deployments. These may include, cert-manager, ingress-nginx, nfs-client-provisioners and more. |
 | viya | Deploys the SAS Viya platform |
-| cluster-logging | Installs cluster-wide logging using the [viya4-monitoring-kubernetes](https://github.com/sassoftware/viya4-monitoring-kubernetes) project. |
-| cluster-monitoring | Installs cluster-wide monitoring using the [viya4-monitoring-kubernetes](https://github.com/sassoftware/viya4-monitoring-kubernetes) project. |
-| viya-monitoring | Installs viya namespace level monitoring using the [viya4-monitoring-kubernetes](https://github.com/sassoftware/viya4-monitoring-kubernetes) project. |
 
 ### Examples
 
@@ -63,18 +60,18 @@ Any number of tasks can be run at the same time. An action can run against a sin
     -e CONFIG=$HOME/deployments/dev-cluster/dev-namespace/ansible-vars.yaml \
     -e TFSTATE=$HOME/deployments/dev-cluster/terraform.tfstate \
     -e JUMP_SVR_PRIVATE_KEY=$HOME/.ssh/id_rsa \
-    playbooks/playbook.yaml --tags "baseline,viya,cluster-logging,cluster-monitoring,viya-monitoring,install"
+    playbooks/playbook.yaml --tags "baseline,viya,install"
   ```
 
-- I have a custom built cluster and want to baseline and deploy viya only
+- I have a custom built cluster and want to install baseline dependencies only
 
   ```bash
   ansible-playbook \
     -e BASE_DIR=$HOME/deployments \
     -e KUBECONFIG=$HOME/deployments/.kube/config \
     -e CONFIG=$HOME/deployments/dev-cluster/dev-namespace/ansible-vars.yaml \
     -e JUMP_SVR_PRIVATE_KEY=$HOME/.ssh/id_rsa \
-    playbooks/playbook.yaml --tags "baseline,viya,install"
+    playbooks/playbook.yaml --tags "baseline,install"
   ```
 
 - I want to modify a customization under site-config for an existing viya deployment and reapply the manifest. I wish to continue to use the same deployment assets rather than pull the latest copy.
@@ -88,26 +85,26 @@ Any number of tasks can be run at the same time. An action can run against a sin
     playbooks/playbook.yaml --tags "viya,install"
   ```
 
-- I have an existing cluster with viya installed and want to install another viya instance in a different namespace with monitoring
+- I have an existing cluster with viya installed and want to install another viya instance in a different namespace
 
   ```bash
   ansible-playbook \
     -e BASE_DIR=$HOME/deployments \
     -e CONFIG=$HOME/deployments/dev-cluster/test-namespace/ansible-vars.yaml \
     -e TFSTATE=$HOME/deployments/dev-cluster/terraform.tfstate \
     -e JUMP_SVR_PRIVATE_KEY=$HOME/.ssh/id_rsa \
-    playbooks/playbook.yaml --tags "viya,viya-monitoring,install"
+    playbooks/playbook.yaml --tags "viya,install"
   ```
 
-- I have a cluster with a single viya install as well as the monitoring and logging stack. I want to uninstall everything
+- I have a cluster with a single viya install. I want to uninstall everything
 
   ```bash
   ansible-playbook \
     -e BASE_DIR=$HOME/deployments \
     -e CONFIG=$HOME/deployments/dev-cluster/test-namespace/ansible-vars.yaml \
     -e TFSTATE=$HOME/deployments/dev-cluster/terraform.tfstate \
     -e JUMP_SVR_PRIVATE_KEY=$HOME/.ssh/id_rsa \
-    playbooks/playbook.yaml --tags "baseline,viya,cluster-logging,cluster-monitoring,viya-monitoring,uninstall"
+    playbooks/playbook.yaml --tags "baseline,viya,uninstall"
   ```
 
 ### Ansible Config
@@ -116,4 +113,9 @@ In the examples above, we are running `ansible-playbook` from within the project
 
 ```bash
 export ANSIBLE_CONFIG=${WORKSPACE}/viya4-deployment/ansible.cfg
-```
+```
+
+### Monitoring and Logging
+
+To install SAS Viya Monitoring for Kubernetes, see the GitHub project https://github.com/sassoftware/viya4-monitoring-kubernetes for scripts and customization options 
+to deploy metric monitoring, alerts and log-message aggregation for SAS Viya.

docs/user/AnsibleUsage.md

@@ -57,15 +57,12 @@ Actions are used to install or uninstall software. One must be set when running
 
 ### Tasks
 
-Any number of tasks can be run at the same time. An action can run against a single task or all tasks.
+More than one task can be run at the same time. An action can run against a single task or all tasks.
 
 | Name | Description |
 | :--- | :--- |
 | baseline | Installs cluster level tooling needed for all SAS Viya platform deployments. These may include, cert-manager, ingress-nginx, nfs-client-provisioners and more. |
 | viya | Deploys the SAS Viya platform |
-| cluster-logging | Installs cluster-wide logging using the [viya4-monitoring-kubernetes](https://github.com/sassoftware/viya4-monitoring-kubernetes) project. |
-| cluster-monitoring | Installs cluster-wide monitoring using the [viya4-monitoring-kubernetes](https://github.com/sassoftware/viya4-monitoring-kubernetes) project. |
-| viya-monitoring | Installs viya namespace level monitoring using the [viya4-monitoring-kubernetes](https://github.com/sassoftware/viya4-monitoring-kubernetes) project. |
 
 ### Examples
 
@@ -79,10 +76,10 @@ Any number of tasks can be run at the same time. An action can run against a sin
     --volume $HOME/deployments/dev-cluster/dev-namespace/ansible-vars.yaml:/config/config \
     --volume $HOME/deployments/dev-cluster/terraform.tfstate:/config/tfstate \
     --volume $HOME/.ssh/id_rsa:/config/jump_svr_private_key \
-    viya4-deployment --tags "baseline,viya,cluster-logging,cluster-monitoring,viya-monitoring,install"
+    viya4-deployment --tags "baseline,viya,install"
   ```
 
-- I have a custom built cluster and want to baseline and deploy viya only
+- I have a custom built cluster and want to install baseline dependencies only
 
   ```bash
   docker run --rm \
@@ -92,7 +89,7 @@ Any number of tasks can be run at the same time. An action can run against a sin
     --volume $HOME/deployments/dev-cluster/.kube/config:/config/kubeconfig \
     --volume $HOME/deployments/dev-cluster/dev-namespace/ansible-vars.yaml:/config/config \
     --volume $HOME/.ssh/id_rsa:/config/jump_svr_private_key \
-    viya4-deployment --tags "baseline,viya,install"
+    viya4-deployment --tags "baseline,install"
   ```
 
 - I want to modify a customization under site-config for an existing viya deployment and reapply the manifest. I wish to continue to use the same deployment assets rather than pull the latest copy.
@@ -109,7 +106,7 @@ Any number of tasks can be run at the same time. An action can run against a sin
     viya4-deployment --tags "viya,install"
   ```
 
-- I have an existing cluster with viya installed and want to install another viya instance in a different namespace with monitoring
+- I have an existing cluster with viya installed and want to install another viya instance in a different namespace
 
   ```bash
   docker run --rm \
@@ -119,10 +116,10 @@ Any number of tasks can be run at the same time. An action can run against a sin
     --volume $HOME/deployments/dev-cluster/test-namespace/ansible-vars.yaml:/config/config \
     --volume $HOME/deployments/dev-cluster/.ssh/id_rsa:/config/jump_svr_private_key \
     --volume $HOME/deployments/dev-cluster/.kube/config:/config/kubeconfig \
-    viya4-deployment --tags "viya,viya-monitoring,install"
+    viya4-deployment --tags "viya,install"
   ```
 
-- I have a cluster with a single viya install as well as the monitoring and logging stack. I want to uninstall everything
+- I have a cluster with a single viya install. I want to uninstall everything
 
   ```bash
   docker run --rm \
@@ -131,5 +128,10 @@ Any number of tasks can be run at the same time. An action can run against a sin
     --volume $HOME/deployments:/data \
     --volume $HOME/deployments/dev-cluster/dev-namespace/ansible-vars.yaml:/config/config \
     --volume $HOME/deployments/dev-cluster/terraform.tfstate:/config/tfstate \
-    viya4-deployment --tags "baseline,viya,cluster-logging,cluster-monitoring,viya-monitoring,uninstall"
+    viya4-deployment --tags "baseline,viya,uninstall"
   ```
+
+### Monitoring and Logging
+
+To install SAS Viya Monitoring for Kubernetes, see the GitHub project https://github.com/sassoftware/viya4-monitoring-kubernetes for scripts and customization options 
+to deploy metric monitoring, alerts and log-message aggregation for SAS Viya.

docs/user/DockerUsage.md

@@ -25,37 +25,6 @@ Ansible vars to docker volume mounts mappings. For full listing of config vars s
 | V4_CFG_LICENSE | `--volume <desired_path>:/config/v4_cfg_license `|
 | V4_CFG_CERTS | `--volume <desired_path>:/config/v4_cfg_certs `|
 
-## Monitoring and Logging
-
-| Ansible Var | Docker Mount |
-| :--- | ---: |
-| V4M_CERT | `--volume <desired_path>:/config/v4m_cert `|
-| V4M_KEY | `--volume <desired_path>:/config/v4m_key `|
-| V4M_CUSTOM_CONFIG_USER_DIR | `--volume <desired_path>:/config/v4m_custom_config_user_dir `|
-
-### Monitoring
-
-| Ansible Var | Docker Mount |
-| :--- | ---: |
-| V4M_PROMETHEUS_CERT | `--volume <desired_path>:/config/v4m_prometheus_cert `|
-| V4M_PROMETHEUS_KEY | `--volume <desired_path>:/config/v4m_prometheus_key `|
-| | | | | | | |
-| V4M_GRAFANA_CERT | `--volume <desired_path>:/config/v4m_grafana_cert `|
-| V4M_GRAFANA_KEY | `--volume <desired_path>:/config/v4m_grafana_key `|
-| | | | | | | |
-| V4M_ALERTMANAGER_CERT | `--volume <desired_path>:/config/v4m_alertmanager_cert `|
-| V4M_ALERTMANAGER_KEY | `--volume <desired_path>:/config/v4m_alertmanager_key `|
-
-### Logging
-
-| Ansible Var | Docker Mount |
-| :--- | ---: |
-| V4M_KIBANA_CERT | `--volume <desired_path>:/config/v4m_kibana_cert `|
-| V4M_KIBANA_KEY | `--volume <desired_path>:/config/v4m_kibana_key `|
-| | | | | | | |
-| V4M_ELASTICSEARCH_CERT | `--volume <desired_path>:/config/v4m_elasticsearch_cert `|
-| V4M_ELASTICSEARCH_KEY | `--volume <desired_path>:/config/v4m_elasticsearch_key `|
-
 ## TLS
 
 | Ansible Var | Docker Mount |

docs/user/DockerVolumeMounts.md

@@ -33,10 +33,6 @@ V4_CFG_CONSUL_ENABLE_LOADBALANCER: false
 ## SAS/CONNECT
 V4_CFG_CONNECT_ENABLE_LOADBALANCER: false
 
-## Monitoring and Logging
-## uncomment and update the below values when deploying the viya4-monitoring-kubernetes stack
-# V4M_BASE_DOMAIN: <base_domain>
-
 ## Viya Start and Stop Schedule
 ## uncomment and update the values below with CronJob schedule expressions if you would
 ## like to start and stop your Viya Deployment on a schedule

examples/ansible-vars-iac.yaml

@@ -50,12 +50,6 @@
       when: ('baseline' in ansible_run_tags) and ('install' in ansible_run_tags)
       tags:
         - baseline
-    - name: Monitoring role - cluster
-      include_role:
-        name: monitoring
-      tags:
-        - cluster-monitoring
-        - cluster-logging
     - name: Multi-tenancy role
       include_role:
         name: multi-tenancy
@@ -68,12 +62,6 @@
       tags:
         - viya
         - multi-tenancy
-    - name: Monitoring role - namespace
-      include_role:
-        name: monitoring
-        tasks_from: viya-monitoring
-      tags:
-        - viya-monitoring
     - name: baseline role uninstall # noqa: name[casing]
       include_role:
         name: baseline