diff --git a/modules/osdu/files/templates/values.tpl b/modules/osdu/files/templates/values.tpl index 0987fdd369d6a83e78a33ed6dfd6e1248270864e..d364071b8ff464ee2eb1ba42234915a7c0b4cbea 100644 --- a/modules/osdu/files/templates/values.tpl +++ b/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 --- # diff --git a/modules/osdu/service_sa.tf b/modules/osdu/service_sa.tf index 93233d3bf254a8aa6e62b85d2b37544c4d05eb59..46cc4d9fce3554ea5b2ca41e66d955d238f6cf4c 100644 --- a/modules/osdu/service_sa.tf +++ b/modules/osdu/service_sa.tf @@ -35,10 +35,6 @@ variable "sa_list_service_project" { roles = [ "roles/composer.worker" ] - }, - { - id = "register-pubsub-identity", - roles = [] } ] } diff --git a/modules/osdu/values-tpl.tf b/modules/osdu/values-tpl.tf index 24eeab17f6054f6e077f37c1e4cfbec5260d8648..1296737a4ec03f7326e85d71b9cb2c441959ecc9 100644 --- a/modules/osdu/values-tpl.tf +++ b/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