Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add NREL GHA runner WIF setup #3952

Merged
merged 2 commits into from
Dec 30, 2024
Merged

Add NREL GHA runner WIF setup #3952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3719d9
Add NREL GHA runner WIF setup.
jdangerx Nov 8, 2024
981b753
keep this branch up-to-date so I can do other terraform things.
jdangerx Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 41 additions & 41 deletions terraform/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 32 additions & 2 deletions terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "5.39.0"
version = "6.14.1"
}
}
}
Expand Down Expand Up @@ -70,6 +70,10 @@ module "gh_oidc" {
sa_name = "projects/catalyst-cooperative-mozilla/serviceAccounts/mozilla-dev-sa@catalyst-cooperative-mozilla.iam.gserviceaccount.com"
attribute = "attribute.repository/catalyst-cooperative/mozilla-sec-eia"
}
"nrel-finito-inputs-gha" = {
sa_name = "projects/${var.project_id}/serviceAccounts/${google_service_account.nrel_finito_inputs_gha.email}"
attribute = "attribute.repository/catalyst-cooperative/nrel-fuel-and-industry-inputs"
}
}
}

Expand Down Expand Up @@ -115,7 +119,7 @@ resource "google_cloud_run_v2_service" "pudl-superset" {
location = "us-central1"
client = "terraform"

launch_stage = "BETA"
launch_stage = "GA"

template {
execution_environment = "EXECUTION_ENVIRONMENT_GEN2"
Expand Down Expand Up @@ -279,6 +283,7 @@ resource "google_sql_database_instance" "postgres_pvp_instance_name" {
password_change_interval = "30s"
enable_password_policy = true
}

}
# set `deletion_protection` to true, will ensure that one cannot accidentally delete this instance by
# use of Terraform whereas `deletion_protection_enabled` flag protects this instance at the GCP level.
Expand Down Expand Up @@ -470,3 +475,28 @@ resource "google_secret_manager_secret" "superset_bot_password" {
auto {}
}
}

resource "google_storage_bucket" "pudl_archive_bucket" {
name = "archives.catalyst.coop"
location = "US-EAST1"
storage_class = "STANDARD"

uniform_bucket_level_access = true
}

resource "google_service_account" "nrel_finito_inputs_gha" {
account_id = "nrel-finito-inputs-gha"
display_name = "NREL FINITO inputs github action service account"
}

resource "google_storage_bucket_iam_member" "nrel_finito_inputs_archiver_gcs_iam" {
for_each = toset([
"roles/storage.objectCreator",
"roles/storage.objectViewer",
"roles/storage.insightsCollectorService"
])

bucket = google_storage_bucket.pudl_archive_bucket.name
role = each.key
member = "serviceAccount:${google_service_account.nrel_finito_inputs_gha.email}"
}
Loading