Merge branch 'master' into primitive-text-array-sort

.gitlab-ci.yml

@@ -29,7 +29,7 @@ variables:
     --set data.redis_group_host=$REDIS_GROUP_HOST
     --set data.google_audiences=$GOOGLE_AUDIENCE
   OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: > 
-    --set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA
+    --set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA
     --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s
   OSDU_GCP_HELM_CONFIG_SERVICE: indexer-config
   OSDU_GCP_HELM_DEPLOYMENT_SERVICE: indexer-deploy

devops/gcp/deploy/templates/virtual-service.yaml

@@ -5,7 +5,11 @@ metadata:
   namespace: "{{ .Release.Namespace }}"
 spec:
   hosts:
+    {{- if .Values.conf.domain }}
+    - {{ printf "osdu.%s" .Values.conf.domain | quote }}
+    {{- else }}
     - "*"
+    {{- end }}
   gateways:
     - service-gateway
   http:

devops/gcp/deploy/values.yaml

@@ -17,3 +17,4 @@ conf:
   keycloak_secret_name: "indexer-keycloak-secret"
   on_prem_enabled: false
   rabbitmq_secret_name: "rabbitmq-secret"
+  domain: ""