From c92d99cb957024dbb2a285e017d431e729bdc0f8 Mon Sep 17 00:00:00 2001 From: Jay Patel <78554593+jarpat@users.noreply.github.com> Date: Wed, 24 Apr 2024 15:43:49 -0400 Subject: [PATCH 1/2] feat: (IAC-1449) Update Google Cloud CLI version to be in sync with viya4-iac-gcp (#547) --- Dockerfile | 2 +- docs/user/Dependencies.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ee5caac5..ac03900b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN curl -sLO https://storage.googleapis.com/kubernetes-release/release/v$kubect FROM baseline ARG helm_version=3.14.2 ARG aws_cli_version=2.15.22 -ARG gcp_cli_version=471.0.0-0 +ARG gcp_cli_version=472.0.0-0 # Add extra packages RUN apt-get update && apt-get install --no-install-recommends -y gzip wget git jq ssh sshpass skopeo rsync \ diff --git a/docs/user/Dependencies.md b/docs/user/Dependencies.md index 240555c7..0e59738d 100644 --- a/docs/user/Dependencies.md +++ b/docs/user/Dependencies.md @@ -28,7 +28,7 @@ The following list details our dependencies and versions (~ indicates multiple p If you are using a provider based kubeconfig file created by viya4-iac-gcp:4.5.0 or newer, install these dependencies: | SOURCE | NAME | VERSION | |----------------|-------------------------|-------------| -| ~ | gcloud | 471.0.0 | +| ~ | gcloud | 472.0.0 | | ~ | gcloud-gke-auth-plugin | >= 0.5.2 | Required project dependencies are generally pinned to known working or stable versions to ensure users have a smooth initial experience. In some cases it may be required to change the default version of a dependency. In such cases users are welcome to experiment with alternate versions, however compatibility may not be guaranteed. From d69889b9a9ac753ed5f4dcc22da560d9ddcc8b2b Mon Sep 17 00:00:00 2001 From: Jay Patel <78554593+jarpat@users.noreply.github.com> Date: Wed, 8 May 2024 13:29:49 -0400 Subject: [PATCH 2/2] docs: (IAC-1242) Update Documentation for V4_CFG_RWX_FILESTORE (#550) closes #493 --- docs/CONFIG-VARS.md | 4 +--- roles/vdm/defaults/main.yaml | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md index 8d68f1da..e5baaf4a 100644 --- a/docs/CONFIG-VARS.md +++ b/docs/CONFIG-VARS.md @@ -89,7 +89,7 @@ Viya4-deployment uses the jump server to interact with the RWX filestore, which ## Storage When `V4_CFG_MANAGE_STORAGE` is set to `true`, viya4-deployment creates the `sas` and `pg-storage` storage classes using the nfs-subdir-external-provisioner Helm chart. If a jump server is used, viya4-deployment uses that server to create the folders for the `astores`, `bin`, `data` and `homes` RWX Filestore NFS paths that are outlined below in the [RWX Filestore](#rwx-filestore) section. -When `V4_CFG_MANAGE_STORAGE` is set to `false`, viya4-deployment does not create the `sas` or `pg-storage` storage classes for you. In addition, viya4-deployment does not create or manage the RWX Filestore NFS paths. Before you run the SAS Viya deployment, you must set the values for `V4_CFG_RWX_FILESTORE_ASTORES_PATH`, `V4_CFG_RWX_FILESTORE_BIN_PATH`, `V4_CFG_RWX_FILESTORE_DATA_PATH` and `V4_CFG_RWX_FILESTORE_HOMES_PATH` to specify existing NFS folder locations. The viya4-deployment user can create the required NFS folders from the jump server before starting the deployment. Recommended attribute settings for each folder are as follows: +When `V4_CFG_MANAGE_STORAGE` is set to `false`, viya4-deployment does not create the `sas` or `pg-storage` storage classes for you. In addition, viya4-deployment does not create or manage the RWX Filestore NFS paths. Before you run the SAS Viya deployment, you must set the values for `V4_CFG_RWX_FILESTORE_DATA_PATH` and `V4_CFG_RWX_FILESTORE_HOMES_PATH` to specify existing NFS folder locations. The viya4-deployment user can create the required NFS folders from the jump server before starting the deployment. Recommended attribute settings for each folder are as follows: - **filemode**: `0777` - **group**: the equivalent of `nogroup` for your operating system - **owner**: `nobody` @@ -105,8 +105,6 @@ When `V4_CFG_MANAGE_STORAGE` is set to `false`, viya4-deployment does not create | :--- | ---: | ---: | ---: | ---: | ---: | ---: | | V4_CFG_RWX_FILESTORE_ENDPOINT | NFS IP address or host name | string | | false | | baseline, viya | | V4_CFG_RWX_FILESTORE_PATH | NFS export path | string | /export | false | | baseline, viya | -| V4_CFG_RWX_FILESTORE_ASTORES_PATH | NFS path to astores directory | string | /\/astores | false | | viya | -| V4_CFG_RWX_FILESTORE_BIN_PATH | NFS path to bin directory | string | /\/bin | false | | viya | | V4_CFG_RWX_FILESTORE_DATA_PATH | NFS path to data directory | string | /\/data | false | | viya | | V4_CFG_RWX_FILESTORE_HOMES_PATH | NFS path to homes directory | string | /\/homes | false | | viya | diff --git a/roles/vdm/defaults/main.yaml b/roles/vdm/defaults/main.yaml index c98eab8d..38cddcc6 100644 --- a/roles/vdm/defaults/main.yaml +++ b/roles/vdm/defaults/main.yaml @@ -26,6 +26,8 @@ V4_CFG_RWX_FILESTORE_ENDPOINT: null V4_CFG_RWX_FILESTORE_PATH: /export V4_CFG_RWX_FILESTORE_DATA_PATH: "{{ V4_CFG_RWX_FILESTORE_PATH | replace('/$', '') }}/{{ NAMESPACE }}/data" V4_CFG_RWX_FILESTORE_HOMES_PATH: "{{ V4_CFG_RWX_FILESTORE_PATH | replace('/$', '') }}/{{ NAMESPACE }}/homes" +# The two variables below are not used in updating any template files or used in any ansible tasks +# They have been removed from CONFIG-VARS.md, if they are used in the future add them back. V4_CFG_RWX_FILESTORE_ASTORES_PATH: "{{ V4_CFG_RWX_FILESTORE_PATH | replace('/$', '') }}/{{ NAMESPACE }}/astores" V4_CFG_RWX_FILESTORE_BIN_PATH: "{{ V4_CFG_RWX_FILESTORE_PATH | replace('/$', '') }}/{{ NAMESPACE }}/bin"