Merge pull request #392 from bcgov/test

TEST -> PROD
bcgov · Aug 14, 2024 · 12d703c · 12d703c
2 parents 9a6b9c0 + bdf4e24
commit 12d703c
Show file tree

Hide file tree

Showing 10 changed files with 408 additions and 9 deletions.
diff --git a/...case-image/build-files/suitecrm/public/legacy/themes/suite8/css/suitep-base/editview.scss b/...case-image/build-files/suitecrm/public/legacy/themes/suite8/css/suitep-base/editview.scss
@@ -1797,7 +1797,7 @@ div.confirmTable {
 
 .moduleTitle {
   color: $header-sub-title;
-  margin-left: -57px;
+  margin-left: -96px;
   display: flex;
   width: 200%;
   background-color: white;

diff --git a/...vocase-image/build-files/suitecrm/public/legacy/themes/suite8/css/suitep-base/panels.scss b/...vocase-image/build-files/suitecrm/public/legacy/themes/suite8/css/suitep-base/panels.scss
@@ -26,7 +26,7 @@
 /**** Panels ****/
 
 .panel {
-  margin: 0 40px;
+
 }
 
 form  #EditView_tabs .panel {

diff --git a/...advocase-image/build-files/suitecrm/public/legacy/themes/suite8/css/suitep-base/tabs.scss b/...advocase-image/build-files/suitecrm/public/legacy/themes/suite8/css/suitep-base/tabs.scss
@@ -62,7 +62,6 @@
     border-radius: 4px;
     font-size: 11px;
     font-weight: 600;
-    height: 28px;
     line-height: 16px;
     padding: 5px 12px 0 12px;
     display: inline-block;
@@ -204,9 +203,9 @@
   }
 
   #tab-actions > a .suitepicon-action-caret {
-    font-size: 8px;
-    margin-left: 8px;
-    line-height: 14px;
+    font-size: 10px;
+    margin-left: 14px !important;
+    line-height: 25px;
     position: relative;
     bottom: 0.2em;
   }

diff --git a/...-image/build-files/suitecrm/public/legacy/themes/suite8/include/DetailView/DetailView.tpl b/...-image/build-files/suitecrm/public/legacy/themes/suite8/include/DetailView/DetailView.tpl
diff --git a/docker/suitecrm-image/suitecrm/scripts/suitecrm/env-validation.sh b/docker/suitecrm-image/suitecrm/scripts/suitecrm/env-validation.sh
@@ -38,4 +38,8 @@ function env_validation() {
     error "SUITE_DB_NAME environment variable is required"
     exit 1
   fi
+
+  if [ -z "$SUITECRM_URL" ]; then
+    error "SUITECRM_URL environment variable is required"
+  fi
 }
diff --git a/docker/suitecrm-image/suitecrm/scripts/suitecrm/install.sh b/docker/suitecrm-image/suitecrm/scripts/suitecrm/install.sh
@@ -88,7 +88,7 @@ function suitecrm_install_command() {
                 -P $SUITE_DB_PASSW \
                 -H $SUITE_DB_HOST \
                 -N $SUITE_DB_NAME \
-                -S "http://localhost:8181/" \
+                -S $SUITECRM_URL \
                 -d "no"
 }
 

diff --git a/docker/suitecrm-image/suitecrm/scripts/suitecrm/php/config-db-tpl.php b/docker/suitecrm-image/suitecrm/scripts/suitecrm/php/config-db-tpl.php
@@ -34,5 +34,5 @@
   array (
     'en_us' => 'English (US)',
   ),
-  'site_url' => 'http://localhost:8181',
+  'site_url' => getenv('SUITECRM_URL'),
 );
diff --git a/helm/suitecrm/templates/deployment.yaml b/helm/suitecrm/templates/deployment.yaml
@@ -87,7 +87,10 @@ spec:
             - name: SESSION_SAVE_HANDLER
               value: rediscluster
             - name: SESSION_SAVE_PATH
-              value: 'seed[]=tcp://suitecrm-redis-cluster-headless:6379&timeout=2&read_timeout=2'
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.global.secrets.suitecrmSecretName }}
+                  key: redis-path
             - name: SUITECRM_URL
               value: {{.Values.global.suitecrmHost}}
             - name: SUITECRM_ADMIN_PWD

diff --git a/openshift/pre-deployment-envs.example.env b/openshift/pre-deployment-envs.example.env
@@ -7,6 +7,8 @@ DB_PASSWORD=
 DB_USER=
 DB_NAME=
 DB_HOST=
+REDIS_PASSWORD=
+REDIS_HOST=
 SUITECRM_ADMIN_PASSWORD=
 SSO_IDP_X509_CERT=
 OAUTH_KEY=

diff --git a/openshift/pre-deployment-template.yaml b/openshift/pre-deployment-template.yaml
@@ -15,12 +15,20 @@ objects:
       mariadb-galera-mariabackup-password: ${DB_BACKUP_PASSWORD}
       mariadb-password: ${DB_PASSWORD}
     type: Opaque
+  - kind: Secret
+    apiVersion: v1
+    metadata:
+      name: ${APP_NAME}-redis-credentials
+    stringData:
+      redis-password: ${REDIS_PASSWORD}
+    type: Opaque
   - kind: Secret
     apiVersion: v1
     metadata:
       name: ${APP_NAME}-secrets
     stringData:
       database-url: mysql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}/${DB_NAME}
+      redis-path: 'seed[]=tcp://${REDIS_HOST}:6379&timeout=2&read_timeout=2&auth=${REDIS_PASSWORD}'
       suitecrm-admin-password: ${SUITECRM_ADMIN_PASSWORD}
       sso-idp-x509: ${SSO_IDP_X509_CERT}
       oauth-key:  ${OAUTH_KEY}
@@ -117,6 +125,14 @@ parameters:
     displayName: MariaDB Galera Cluster Database Host
     description: The MariaDB Galera Cluster database host
     required: true
+  - name: REDIS_HOST
+    displayName: Redis Cluster Host
+    description: The Redis Cluster host
+    required: true
+  - name: REDIS_PASSWORD
+    displayName: Redis ClusterPassword
+    description: The Redis Cluster password
+    required: true
   - name: SUITECRM_ADMIN_PASSWORD
     displayName: SuiteCRM Admin Password
     description: The SuiteCRM admin password