Skip to content

Commit 43bbd3c

Browse files
authored
feat: Add support for https_proxy parameter for the config_sync.git block (terraform-google-modules#1457)
* Add support for https_proxy parameter for the config_sync.git block * Changes post make buid and make docker_generate_docs runs
1 parent 5f468fd commit 43bbd3c

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

modules/acm/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ data "google_client_config" "default" {}
7474
| enable\_policy\_controller | Whether to enable the ACM Policy Controller on the cluster | `bool` | `true` | no |
7575
| enable\_referential\_rules | Enables referential constraints which reference another object in it definition and are therefore eventually consistent. | `bool` | `true` | no |
7676
| 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 |
77+
| https\_proxy | URL for the HTTPS proxy to be used when communicating with the Git repo. | `string` | `null` | no |
7778
| install\_template\_library | Whether to install the default Policy Controller template library | `bool` | `true` | no |
7879
| location | GCP location used to reach cluster. | `string` | n/a | yes |
7980
| policy\_dir | Subfolder containing configs in ACM Git repo. If un-set, uses Config Management default. | `string` | `""` | no |

modules/acm/feature.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ resource "google_gke_hub_feature_membership" "main" {
4747
sync_branch = var.sync_branch != "" ? var.sync_branch : null
4848
sync_rev = var.sync_revision != "" ? var.sync_revision : null
4949
secret_type = var.secret_type
50+
https_proxy = var.https_proxy
5051
}
5152
}
5253

modules/acm/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,12 @@ variable "secret_type" {
9090
default = "ssh"
9191
}
9292

93+
variable "https_proxy" {
94+
description = "URL for the HTTPS proxy to be used when communicating with the Git repo."
95+
type = string
96+
default = null
97+
}
98+
9399
variable "create_ssh_key" {
94100
description = "Controls whether a key will be generated for Git authentication"
95101
type = bool

0 commit comments

Comments
 (0)