File tree Expand file tree Collapse file tree 4 files changed +30
-0
lines changed
iac/cal-itp-data-infra-staging Expand file tree Collapse file tree 4 files changed +30
-0
lines changed Original file line number Diff line number Diff line change @@ -55,6 +55,7 @@ resource "google_composer_environment" "calitp-staging-composer" {
5555 " POD_LOCATION" = " us-west2" ,
5656 " POD_CLUSTER_NAME" = data.terraform_remote_state.gke.outputs.google_container_cluster_airflow- jobs- staging_name,
5757 " POD_SECRETS_NAMESPACE" = local.namespace,
58+ " SERVICE_ACCOUNT_NAME" = data.terraform_remote_state.iam.outputs.google_service_account_composer- service- account_email,
5859 " CALITP_BUCKET__AGGREGATOR_SCRAPER" = " gs://${ data . terraform_remote_state . gcs . outputs . google_storage_bucket_calitp-staging-aggregator-scraper_name } " ,
5960 " CALITP_BUCKET__AIRTABLE" = " gs://${ data . terraform_remote_state . gcs . outputs . google_storage_bucket_calitp-staging-airtable_name } " ,
6061 " CALITP_BUCKET__AMPLITUDE_BENEFITS_EVENTS" = " gs://${ data . terraform_remote_state . gcs . outputs . google_storage_bucket_calitp-staging-amplitude-benefits-events_name } " ,
Original file line number Diff line number Diff line change @@ -26,3 +26,22 @@ resource "kubernetes_secret" "composer" {
2626 transitland-api-key = data.kubernetes_secret.composer.data.transitland- api- key
2727 }
2828}
29+
30+ resource "kubernetes_priority_class" "dbt-high-priority" {
31+ metadata {
32+ name = " dbt-high-priority"
33+ }
34+ global_default = false
35+ value = 1000000
36+ description = " This priority class should be used for dbt pods only."
37+ }
38+
39+ resource "kubernetes_service_account" "composer-service-account" {
40+ metadata {
41+ name = " composer-service-account"
42+ namespace = local. namespace
43+ annotations = {
44+ " iam.gke.io/gcp-service-account" = data.terraform_remote_state.iam.outputs.google_service_account_composer- service- account_email
45+ }
46+ }
47+ }
Original file line number Diff line number Diff line change @@ -10,4 +10,8 @@ resource "google_container_cluster" "airflow-jobs-staging" {
1010 secret_manager_config {
1111 enabled = true
1212 }
13+
14+ workload_identity_config {
15+ workload_pool = " cal-itp-data-infra-staging.svc.id.goog"
16+ }
1317}
Original file line number Diff line number Diff line change @@ -15,3 +15,9 @@ resource "google_service_account_iam_member" "custom_service_account" {
1515 role = " roles/composer.ServiceAgentV2Ext"
1616 member = " serviceAccount:service-${ local . project_id } @cloudcomposer-accounts.iam.gserviceaccount.com"
1717}
18+
19+ resource "google_service_account_iam_member" "airflow-jobs_composer-service-account" {
20+ service_account_id = google_service_account. composer-service-account . id
21+ role = " roles/iam.workloadIdentityUser"
22+ member = " serviceAccount:cal-itp-data-infra-staging.svc.id.goog[airflow-jobs/composer-service-account]"
23+ }
You can’t perform that action at this time.
0 commit comments