Skip to content

Revert "feat(google_workload_identity): removed data source and updated outputs to use provided service account name and email" #287

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

Merged
dlactin merged 1 commit into from
Apr 14, 2025
Merged

Revert "feat(google_workload_identity): removed data source and updated outputs to use provided service account name and email" #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion google_workload_identity/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ accounts to go with it
|------|-------------|------|---------|:--------:|
| <a name="input_automount_service_account_token"></a> [automount\_service\_account\_token](#input\_automount\_service\_account\_token) | Enable automatic mounting of the service account token | `bool` | `false` | no |
| <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | Cluster name. Required if using existing KSA. | `string` | `""` | no |
| <a name="input_gcp_sa_email"></a> [gcp\_sa\_email](#input\_gcp\_sa\_email) | Email for an existing Google service account. | `string` | `null` | no |
| <a name="input_gcp_sa_name"></a> [gcp\_sa\_name](#input\_gcp\_sa\_name) | Name for the Google service account; overrides `var.name`. | `string` | `null` | no |
| <a name="input_impersonate_service_account"></a> [impersonate\_service\_account](#input\_impersonate\_service\_account) | An optional service account to impersonate for gcloud commands. If this service account is not specified, the module will use Application Default Credentials. | `string` | `""` | no |
| <a name="input_k8s_sa_name"></a> [k8s\_sa\_name](#input\_k8s\_sa\_name) | Name for the Kubernetes service account; overrides `var.name`. | `string` | `null` | no |
Expand Down
13 changes: 10 additions & 3 deletions google_workload_identity/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

locals {
gcp_given_name = var.gcp_sa_name != null ? var.gcp_sa_name : substr(var.name, 0, 30)
gcp_sa_email = var.use_existing_gcp_sa ? var.gcp_sa_email : google_service_account.cluster_service_account[0].email
gcp_sa_email = var.use_existing_gcp_sa ? data.google_service_account.cluster_service_account[0].email : google_service_account.cluster_service_account[0].email
gcp_sa_fqn = "serviceAccount:${local.gcp_sa_email}"

# This will cause Terraform to block returning outputs until the service account is created
Expand All @@ -17,6 +17,13 @@ locals {
k8s_sa_gcp_derived_name = "serviceAccount:${var.project_id}.svc.id.goog[${var.namespace}/${local.output_k8s_name}]"
}

data "google_service_account" "cluster_service_account" {
count = var.use_existing_gcp_sa ? 1 : 0

account_id = local.gcp_given_name
project = var.project_id
}

resource "google_service_account" "cluster_service_account" {
count = var.use_existing_gcp_sa ? 0 : 1

Expand All @@ -39,7 +46,7 @@ resource "kubernetes_service_account" "main" {
}

resource "google_service_account_iam_member" "main" {
service_account_id = var.use_existing_gcp_sa ? var.gcp_sa_name : google_service_account.cluster_service_account[0].name
service_account_id = var.use_existing_gcp_sa ? data.google_service_account.cluster_service_account[0].name : google_service_account.cluster_service_account[0].name
role = "roles/iam.workloadIdentityUser"
member = local.k8s_sa_gcp_derived_name
}
Expand All @@ -50,4 +57,4 @@ resource "google_project_iam_member" "workload_identity_sa_bindings" {
project = var.project_id
role = each.value
member = local.gcp_sa_fqn
}
}
4 changes: 2 additions & 2 deletions google_workload_identity/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ output "gcp_service_account_name" {

output "gcp_service_account" {
description = "GCP service account."
value = var.use_existing_gcp_sa ? var.gcp_sa_name : google_service_account.cluster_service_account[0]
}
value = var.use_existing_gcp_sa ? data.google_service_account.cluster_service_account[0] : google_service_account.cluster_service_account[0]
}
8 changes: 1 addition & 7 deletions google_workload_identity/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ variable "gcp_sa_name" {
default = null
}

variable "gcp_sa_email" {
description = "Email for an existing Google service account."
type = string
default = null
}

variable "use_existing_gcp_sa" {
description = "Use an existing Google service account instead of creating one"
type = bool
Expand Down Expand Up @@ -72,4 +66,4 @@ variable "impersonate_service_account" {
description = "An optional service account to impersonate for gcloud commands. If this service account is not specified, the module will use Application Default Credentials."
type = string
default = ""
}
}