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

Jump to bottom

feat: support configuring ACM git service account email #1685

Merged
merged 2 commits into from
Sep 13, 2023
Merged

feat: support configuring ACM git service account email #1685

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
37aa90c
Support configuring ACM service account email
ferrarimarco Jul 3, 2023
2fce89b
Merge branch 'master' into acm-gcp-account-email
apeabody Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/acm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ data "google_client_config" "default" {}
| enable\_mutation | Whether to enable mutations for ACM Policy Controller. | `bool` | `false` | no |
| enable\_policy\_controller | Whether to enable the ACM Policy Controller on the cluster | `bool` | `true` | no |
| enable\_referential\_rules | Enables referential constraints which reference another object in it definition and are therefore eventually consistent. | `bool` | `true` | no |
| gcp\_service\_account\_email | The service account email for authentication when `secret_type` is `gcpServiceAccount`. | `string` | `null` | no |
| hierarchy\_controller | Configurations for Hierarchy Controller. See [Hierarchy Controller docs](https://cloud.google.com/anthos-config-management/docs/how-to/installing-hierarchy-controller) for more details | `map(any)` | `null` | no |
| https\_proxy | URL for the HTTPS proxy to be used when communicating with the Git repo. | `string` | `null` | no |
| install\_template\_library | Whether to install the default Policy Controller template library | `bool` | `true` | no |
Expand Down
13 changes: 7 additions & 6 deletions modules/acm/feature.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,13 @@ resource "google_gke_hub_feature_membership" "main" {
source_format = var.source_format != "" ? var.source_format : null

git {
sync_repo = var.sync_repo
policy_dir = var.policy_dir != "" ? var.policy_dir : null
sync_branch = var.sync_branch != "" ? var.sync_branch : null
sync_rev = var.sync_revision != "" ? var.sync_revision : null
secret_type = var.secret_type
https_proxy = var.https_proxy
sync_repo = var.sync_repo
policy_dir = var.policy_dir != "" ? var.policy_dir : null
sync_branch = var.sync_branch != "" ? var.sync_branch : null
sync_rev = var.sync_revision != "" ? var.sync_revision : null
secret_type = var.secret_type
https_proxy = var.https_proxy
gcp_service_account_email = var.gcp_service_account_email
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions modules/acm/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ variable "ssh_auth_key" {
default = null
}

variable "gcp_service_account_email" {
description = "The service account email for authentication when `secret_type` is `gcpServiceAccount`."
type = string
default = null
}

variable "enable_config_sync" {
description = "Whether to enable the ACM Config Sync on the cluster"
type = bool
Expand Down