fix: gonrg-6641 fix redis connection

app/sdms/devops/gc/deploy/templates/seismic-store-configmap.yaml

@@ -24,16 +24,17 @@ data:
   SERVICE_CLOUD_PROJECT: {{ .Values.data.serviceCloudProject | quote }}
   {{- end }}
   {{- if .Values.data.redisSdmsHost }}
-  REDIS_SDMS_HOST: {{ .Values.data.redisSdmsHost | quote }}
+  DES_REDIS_INSTANCE_ADDRESS: {{ .Values.data.redisSdmsHost | quote }}
+  LOCKSMAP_REDIS_INSTANCE_ADDRESS: {{ .Values.data.redisSdmsHost | quote }}
   {{- else }}
-  REDIS_SDMS_HOST: {{ printf "redis-%s" .Values.conf.appName | quote }}
+  DES_REDIS_INSTANCE_ADDRESS: {{ printf "redis-%s" .Values.conf.appName | quote }}
+  LOCKSMAP_REDIS_INSTANCE_ADDRESS: {{ printf "redis-%s" .Values.conf.appName | quote }}
   {{- end}}
-  REDIS_SDMS_PORT: {{ .Values.data.redisSdmsPort | quote }}
   DES_SERVICE_HOST_ENTITLEMENT: {{ ternary .Values.data.entitlementsHost (printf "%s/api" .Values.data.entitlementsHost) .Values.conf.onPremEnabled | quote}}
-  DES_REDIS_INSTANCE_ADDRESS: {{ .Values.data.redisSdmsHost | quote }}
   DES_REDIS_INSTANCE_PORT: {{ .Values.data.redisSdmsPort | quote }}
-  LOCKSMAP_REDIS_INSTANCE_ADDRESS: {{ .Values.data.redisSdmsHost | quote }}
+  DES_REDIS_INSTANCE_TLS_DISABLE: {{ .Values.data.redisSdmsTlsDisabled | quote }}
   LOCKSMAP_REDIS_INSTANCE_PORT: {{ .Values.data.redisSdmsPort | quote }}
+  LOCKSMAP_REDIS_INSTANCE_TLS_DISABLE: {{ .Values.data.redisSdmsTlsDisabled | quote }}
   {{- if .Values.conf.onPremEnabled }}
   SERVICE_ENV: {{ .Values.data.serviceEnv | quote }}
   API_BASE_PATH: {{ .Values.data.apiBasePath | quote }}

app/sdms/devops/gc/deploy/templates/seismic-store-deploy.yaml

@@ -31,6 +31,11 @@ spec:
               secretKeyRef:
                 name: {{ .Values.conf.sdmsRedisSecretName | quote }}
                 key: REDIS_PASSWORD
+          - name: LOCKSMAP_REDIS_INSTANCE_KEY
+            valueFrom:
+              secretKeyRef:
+                name: {{ .Values.conf.sdmsRedisSecretName | quote }}
+                key: REDIS_PASSWORD
           envFrom:
           - configMapRef:
               name: {{ printf "%s-config" .Values.conf.appName | quote }}

app/sdms/devops/gc/deploy/values.yaml

@@ -15,6 +15,7 @@ data:
   redisPort: "6379"
   redisSdmsHost: ""
   redisSdmsPort: "6379"
+  redisSdmsTlsDisabled: true
   urlPrefix: "/api/seismic-store/v3"
   impServiceAccountSigner: "NA"
   seistoreDesAppkey: "NA"

app/sdms/src/cloud/providers/anthos/config.ts

@@ -56,9 +56,11 @@ export class AnthosConfig extends Config {
             LOCKSMAP_REDIS_INSTANCE_ADDRESS: process.env.LOCKSMAP_REDIS_INSTANCE_ADDRESS,
             LOCKSMAP_REDIS_INSTANCE_PORT: +process.env.LOCKSMAP_REDIS_INSTANCE_PORT,
             LOCKSMAP_REDIS_INSTANCE_KEY: process.env.LOCKSMAP_REDIS_INSTANCE_KEY || '',
+            LOCKSMAP_REDIS_INSTANCE_TLS_DISABLE: process.env.LOCKSMAP_REDIS_INSTANCE_TLS_DISABLE === 'true',
             DES_REDIS_INSTANCE_ADDRESS: process.env.DES_REDIS_INSTANCE_ADDRESS,
             DES_REDIS_INSTANCE_PORT: +process.env.DES_REDIS_INSTANCE_PORT,
             DES_REDIS_INSTANCE_KEY: process.env.DES_REDIS_INSTANCE_KEY,
+            DES_REDIS_INSTANCE_TLS_DISABLE: process.env.DES_REDIS_INSTANCE_TLS_DISABLE === 'true',
             DES_SERVICE_HOST_COMPLIANCE: process.env.DES_SERVICE_HOST_COMPLIANCE,
             DES_SERVICE_HOST_ENTITLEMENT: process.env.DES_SERVICE_HOST_ENTITLEMENT,
             DES_SERVICE_HOST_STORAGE: process.env.DES_SERVICE_HOST_STORAGE,

app/sdms/src/cloud/providers/google/config.ts

@@ -120,9 +120,11 @@ export class ConfigGoogle extends Config {
                 LOCKSMAP_REDIS_INSTANCE_ADDRESS: process.env.LOCKSMAP_REDIS_INSTANCE_ADDRESS,
                 LOCKSMAP_REDIS_INSTANCE_PORT: +process.env.LOCKSMAP_REDIS_INSTANCE_PORT,
                 LOCKSMAP_REDIS_INSTANCE_KEY: process.env.LOCKSMAP_REDIS_INSTANCE_KEY,
+                LOCKSMAP_REDIS_INSTANCE_TLS_DISABLE: process.env.LOCKSMAP_REDIS_INSTANCE_TLS_DISABLE === 'true',
                 DES_REDIS_INSTANCE_ADDRESS: process.env.DES_REDIS_INSTANCE_ADDRESS,
                 DES_REDIS_INSTANCE_PORT: +process.env.DES_REDIS_INSTANCE_PORT,
                 DES_REDIS_INSTANCE_KEY: process.env.DES_REDIS_INSTANCE_KEY,
+                DES_REDIS_INSTANCE_TLS_DISABLE: process.env.DES_REDIS_INSTANCE_TLS_DISABLE === 'true',
                 DES_SERVICE_HOST_COMPLIANCE: process.env.DES_SERVICE_HOST_COMPLIANCE || process.env.SEISTORE_DES_HOST,
                 DES_SERVICE_HOST_ENTITLEMENT: process.env.DES_SERVICE_HOST_ENTITLEMENT || process.env.SEISTORE_DES_HOST,
                 DES_SERVICE_HOST_STORAGE: process.env.DES_SERVICE_HOST_STORAGE || process.env.SEISTORE_DES_HOST,

app/sdms/src/services/dataset/locker.ts

@@ -54,7 +54,7 @@ export class Locker {
         } else {
 
             if (Config.LOCKSMAP_REDIS_INSTANCE_KEY) {
-                Config.LOCKSMAP_REDIS_INSTANCE_TLS_DISABLE ?
+                if (Config.LOCKSMAP_REDIS_INSTANCE_TLS_DISABLE) {
                     this.redisClient = new Redis({
                         host: Config.LOCKSMAP_REDIS_INSTANCE_ADDRESS,
                         port: Config.LOCKSMAP_REDIS_INSTANCE_PORT,
@@ -63,7 +63,17 @@ export class Locker {
                         retryStrategy: this.retryStrategy,
                         commandTimeout: 60000,
                         connectionName: 'sdms-locker'
-                    }) :
+                    });
+                    this.redisSubscriptionClient = new Redis({
+                        host: Config.LOCKSMAP_REDIS_INSTANCE_ADDRESS,
+                        port: Config.LOCKSMAP_REDIS_INSTANCE_PORT,
+                        password: Config.LOCKSMAP_REDIS_INSTANCE_KEY,
+                        maxRetriesPerRequest: 10,
+                        retryStrategy: this.retryStrategy,
+                        commandTimeout: 60000,
+                        connectionName: 'sdms-locker-subscription'
+                    });
+                } else {
                     this.redisClient = new Redis({
                         host: Config.LOCKSMAP_REDIS_INSTANCE_ADDRESS,
                         port: Config.LOCKSMAP_REDIS_INSTANCE_PORT,
@@ -73,18 +83,18 @@ export class Locker {
                         retryStrategy: this.retryStrategy,
                         commandTimeout: 60000,
                         connectionName: 'sdms-locker'
-                    }
-                    );
-                this.redisSubscriptionClient = new Redis({
-                    host: Config.LOCKSMAP_REDIS_INSTANCE_ADDRESS,
-                    port: Config.LOCKSMAP_REDIS_INSTANCE_PORT,
-                    password: Config.LOCKSMAP_REDIS_INSTANCE_KEY,
-                    tls: { servername: Config.LOCKSMAP_REDIS_INSTANCE_ADDRESS },
-                    maxRetriesPerRequest: 10,
-                    retryStrategy: this.retryStrategy,
-                    commandTimeout: 60000,
-                    connectionName: 'sdms-locker-subscription'
-                });
+                    });
+                    this.redisSubscriptionClient = new Redis({
+                        host: Config.LOCKSMAP_REDIS_INSTANCE_ADDRESS,
+                        port: Config.LOCKSMAP_REDIS_INSTANCE_PORT,
+                        password: Config.LOCKSMAP_REDIS_INSTANCE_KEY,
+                        tls: { servername: Config.LOCKSMAP_REDIS_INSTANCE_ADDRESS },
+                        maxRetriesPerRequest: 10,
+                        retryStrategy: this.retryStrategy,
+                        commandTimeout: 60000,
+                        connectionName: 'sdms-locker-subscription'
+                    });
+                }
 
             }
             else {

devops/osdu/cloud-providers/gc-common-pipeline.yml

@@ -225,6 +225,7 @@
       --namespace=$GC_HELM_NAMESPACE
       --wait
       --history-max=3
+      --set data.cloudProvider=anthos
       --set data.image=$CI_REGISTRY_IMAGE/gc-$SEISMIC_GC_SERVICE:$CI_COMMIT_SHORT_SHA
       --set data.serviceAccountName=$SEISMIC_GC_SERVICE
       --set data.domain=$DOMAIN