Merge branch 'cherry-pick-54662af8' into 'release/0.26'

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

See merge request !1476

examples/simple_osdu/README.md

@@ -243,7 +243,7 @@ Type **Composer** in search bar of Google Cloud Console, click on your Composer
 
 ![py-pi composer](images/composer-pypi-packages.JPG)
 
-*DAGs Folder* can be found here:
+_DAGs Folder_ can be found here:
 
 ![dag folder](images/composer-dag-folder.JPG)
 

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