Merge branch 'GONRG-4951-fix-anthos-pipeline' into 'master'

GONRG-4951: fix anthos pipeline

See merge request !185

.gitlab-ci.yml

@@ -8,7 +8,6 @@ variables:
     --set data.google_cloud_project=$OSDU_GCP_PROJECT 
     --set data.google_audiences=$GOOGLE_AUDIENCE 
     --set data.gcloud_region=$OSDU_GCP_REGION 
-    --set data.environment=$ENVIRONMENT 
     --set data.records_change_pubsub_endpoint=$RECORDS_CHANGE_PUBSUB_ENDPOINT 
     --set data.service_identity=$SERVICE_IDENTITY 
     --set data.log_level=$OSDU_GCP_LOG_LEVEL
@@ -18,7 +17,6 @@ variables:
     --set data.google_cloud_project=$OSDU_GCP_PROJECT 
     --set data.google_audiences=$GOOGLE_AUDIENCE 
     --set data.gcloud_region=$OSDU_GCP_REGION 
-    --set data.environment=$ENVIRONMENT 
     --set data.records_change_pubsub_endpoint=$RECORDS_CHANGE_PUBSUB_ENDPOINT 
     --set data.service_identity=$SERVICE_IDENTITY 
     --set data.log_level=$OSDU_GCP_LOG_LEVEL

devops/gcp/configmap/values.yaml

@@ -3,16 +3,17 @@
 # Declare variables to be passed into your templates.
 
 data:
+  # common
   log_level: "INFO"
+  spring_profiles_active: "gcp"
+  # gcp
   google_cloud_project: ""
   google_audiences: ""
-  environment: ""
   records_change_pubsub_endpoint: ""
   service_identity: ""
   key_ring: "csqp"
   kms_key: "registerService"
   subscriber_private_key_id: "testkey"
-  spring_profiles_active: "gcp"
 
 conf:
   configmap: "register-config"

devops/gcp/deploy/values.yaml

@@ -7,16 +7,16 @@ data:
   requests_memory: "384M"
   limits_cpu: "1"
   limits_memory: "1G"
-  serviceAccountName: ""
+  serviceAccountName: "register"
   imagePullPolicy: "IfNotPresent"
   image: ""
 
 conf:
   configmap: "register-config"
-  rabbitmq_secret_name: ""
-  register_postgres_secret_name: ""
-  register_keycloak_secret_name: ""
-  register_kms_secret_name: ""
+  rabbitmq_secret_name: "rabbitmq-secret"
+  register_postgres_secret_name: "register-postgres-secret"
+  register_keycloak_secret_name: "register-keycloak-secret"
+  register_kms_secret_name: "register-kms-secret"
   app_name: "register"
   on_prem_enabled: false
   domain: ""