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 the option to disable Kubernetes SA annotation in workload-identity. #787

Merged
merged 3 commits into from
Jan 19, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d376540
Add the option to disable Kubernetes SA annotation in workload-identity.
martinivanov Jan 14, 2021
9597d97
Add the option to disable Kubernetes SA annotation in workload-identi…
martinivanov Jan 14, 2021
82a1978
Merge branch 'master' into master
bharathkkb Jan 14, 2021
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: 1 addition & 0 deletions modules/workload-identity/README.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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