Merge branch 'GONRG-9619-Incorrect_var_ENT_bootstrap' into 'master'

Gonrg 9619 incorrect var ent bootstrap

See merge request !1466

(cherry picked from commit 54662af8)

7b0b8c9c Removing unused service SA
fca388cd Removing unused service SA
f340ba60 Fix fmt

modules/osdu/files/templates/values.tpl

@@ -94,7 +94,6 @@ gc_entitlements_deploy:
     bootstrapServiceAccountName: ${bootstrap_sa} # no default
     adminUserEmail: ${admin_email}
     airflowComposerEmail: ${airflow_sa}
-    registerPubsubIdentity: ${register_pubsub_id}
 # --- End of Entitlements values --- #
 
 # --- Crs-catalog values --- #

modules/osdu/service_sa.tf

@@ -35,10 +35,6 @@ variable "sa_list_service_project" {
       roles = [
         "roles/composer.worker"
       ]
-    },
-    {
-      id    = "register-pubsub-identity",
-      roles = []
     }
   ]
 }

modules/osdu/values-tpl.tf

@@ -30,11 +30,10 @@ resource "local_file" "helm_values" {
     replicas              = local.service_replicas
     storage_replicas      = local.storage_replicas
     # entitlements
-    admin_email        = var.admin_user_email
-    airflow_sa         = module.service_project_sa.hashmap_sa_names["airflow-sa"]
-    register_pubsub_id = module.service_project_sa.hashmap_sa_names["register-pubsub-identity"]
-    schema_version     = var.schema_version
-    schema_name        = var.schema_name
+    admin_email    = var.admin_user_email
+    airflow_sa     = module.service_project_sa.hashmap_sa_names["airflow-sa"]
+    schema_version = var.schema_version
+    schema_name    = var.schema_name
     # elastic
     elastic_enabled  = var.elastic_host != "" ? false : true
     elastic_password = var.elastic_pass != "" ? var.elastic_pass : random_password.elastic.result