Skip to content

Commit

Permalink
feat: Add the option to disable Kubernetes SA annotation in workload-…
Browse files Browse the repository at this point in the history
…identity. (terraform-google-modules#787)

* Add the option to disable Kubernetes SA annotation in workload-identity.

* Add the option to disable Kubernetes SA annotation in workload-identity. Generated documentation.

Co-authored-by: Bharath KKB <[email protected]>
  • Loading branch information
martinivanov and bharathkkb authored Jan 19, 2021
1 parent a33bf17 commit fffe702
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions modules/workload-identity/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ module "my-app-workload-identity" {

| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| annotate\_k8s\_sa | Annotate the kubernetes service account with 'iam.gke.io/gcp-service-account' annotation. Valid in cases when an existing SA is used. | `bool` | `true` | no |
| automount\_service\_account\_token | Enable automatic mounting of the service account token | `bool` | `false` | no |
| cluster\_name | Cluster name. Required if using existing KSA. | `string` | `""` | no |
| k8s\_sa\_name | Name for the existing Kubernetes service account | `string` | `null` | no |
Expand Down
2 changes: 1 addition & 1 deletion modules/workload-identity/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ module "annotate-sa" {
source = "terraform-google-modules/gcloud/google//modules/kubectl-wrapper"
version = "~> 2.0.2"

enabled = var.use_existing_k8s_sa
enabled = var.use_existing_k8s_sa && var.annotate_k8s_sa
skip_download = true
cluster_name = var.cluster_name
cluster_location = var.location
Expand Down
6 changes: 6 additions & 0 deletions modules/workload-identity/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ variable "use_existing_k8s_sa" {
type = bool
}

variable "annotate_k8s_sa" {
description = "Annotate the kubernetes service account with 'iam.gke.io/gcp-service-account' annotation. Valid in cases when an existing SA is used."
default = true
type = bool
}

variable "automount_service_account_token" {
description = "Enable automatic mounting of the service account token"
default = false
Expand Down

0 comments on commit fffe702

Please sign in to comment.