Merge pull request #217 from sassoftware/staging

6.2.0 - June 26, 2023

Dockerfile

@@ -11,6 +11,7 @@ COPY --from=terraform /bin/terraform /bin/terraform
 COPY . .
 
 RUN yum -y install git openssh jq which \
+  && yum -y update openssl-libs glib2 vim-minimal vim-data curl \
   && yum clean all && rm -rf /var/cache/yum \
   && curl -sLO https://storage.googleapis.com/kubernetes-release/release/v$KUBECTL_VERSION/bin/linux/amd64/kubectl \
   && chmod 755 ./kubectl /viya4-iac-aws/docker-entrypoint.sh \

files/cloud-init/jump/cloud-config

@@ -31,10 +31,14 @@ runcmd:
       # mount the nfs
       #
   -   while [ `df -h | grep "${rwx_filestore_endpoint}:${rwx_filestore_path}" | wc -l` -eq 0 ]; do sleep 5 && mount -a ; done
-      #
-      # Change permissions and owener
-      #
-  -   mkdir -p ${jump_rwx_filestore_path}/pvs
-  -   chmod 777 ${jump_rwx_filestore_path} -R
-  -   chown -R nobody:nogroup ${jump_rwx_filestore_path}
+      # Create pvs folder and adjust perms and owner only if the folder doesn't exist
+  -   if ! [ -d "${jump_rwx_filestore_path}/pvs" ]
+  -   then
+        #
+        # Change permissions and owner
+        #
+  -     mkdir -p ${jump_rwx_filestore_path}/pvs
+  -     chmod 777 ${jump_rwx_filestore_path} -R
+  -     chown -R nobody:nogroup ${jump_rwx_filestore_path}
+  -   fi
   - fi

versions.tf

@@ -30,7 +30,7 @@ terraform {
     }
     tls = {
       source  = "hashicorp/tls"
-      version = "3.4.0"
+      version = "4.0.4"
     }
     cloudinit = {
       source  = "hashicorp/cloudinit"