Skip to content

Commit

Permalink
feat: Add support for https_proxy parameter for the config_sync.git b…
Browse files Browse the repository at this point in the history
…lock (#1457)

* Add support for https_proxy parameter for the config_sync.git block

* Changes post make buid and make docker_generate_docs runs
  • Loading branch information
muresan authored Nov 10, 2022
1 parent 5f468fd commit 43bbd3c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions modules/acm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ data "google_client_config" "default" {}
| 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 |
| 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 |
| location | GCP location used to reach cluster. | `string` | n/a | yes |
| policy\_dir | Subfolder containing configs in ACM Git repo. If un-set, uses Config Management default. | `string` | `""` | no |
Expand Down
1 change: 1 addition & 0 deletions modules/acm/feature.tf
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ resource "google_gke_hub_feature_membership" "main" {
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
}
}

Expand Down
6 changes: 6 additions & 0 deletions modules/acm/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,12 @@ variable "secret_type" {
default = "ssh"
}

variable "https_proxy" {
description = "URL for the HTTPS proxy to be used when communicating with the Git repo."
type = string
default = null
}

variable "create_ssh_key" {
description = "Controls whether a key will be generated for Git authentication"
type = bool
Expand Down

0 comments on commit 43bbd3c

Please sign in to comment.