Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions gcp/modules/ca/ca.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ resource "google_project_service" "service" {
disable_on_destroy = false
}

resource "google_privateca_ca_pool_iam_member" "fulcio_member" {
ca_pool = "projects/${var.project_id}/locations/${var.region}/caPools/${var.ca_pool_name}"
role = "roles/privateca.certificateManager"
member = "serviceAccount:${var.service_account_id}"
}

resource "google_privateca_ca_pool" "sigstore-ca-pool" {
name = var.ca_pool_name

Expand Down
4 changes: 4 additions & 0 deletions gcp/modules/ca/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,7 @@ variable "ca_name" {
default = "sigstore-authority"
}

variable "service_account_id" {
description = "Service account to which to grant CA pool membership to"
type = string
}
2 changes: 2 additions & 0 deletions gcp/modules/fulcio/fulcio.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ module "ca" {
project_id = var.project_id
ca_pool_name = var.ca_pool_name
ca_name = var.ca_name

service_account_id = google_service_account.fulcio-sa.email
}
7 changes: 0 additions & 7 deletions gcp/modules/fulcio/service_accounts.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,6 @@ resource "google_service_account_iam_member" "gke_sa_iam_member_fulcio" {
depends_on = [google_service_account.fulcio-sa]
}

resource "google_privateca_ca_pool_iam_member" "fulcio_member" {
ca_pool = "projects/${var.project_id}/locations/${var.region}/caPools/${var.ca_pool_name}"
role = "roles/privateca.certificateManager"
member = "serviceAccount:${google_service_account.fulcio-sa.email}"
depends_on = [google_service_account.fulcio-sa]
}

resource "google_kms_key_ring_iam_member" "fulcio_kms_signer_verifier_member" {
key_ring_id = google_kms_key_ring.fulcio-keyring.id
role = "roles/cloudkms.signerVerifier"
Expand Down