From 89102b71057161b8e9e88a8541978cbf5a03d6ae Mon Sep 17 00:00:00 2001 From: Catalin Muresan Date: Thu, 10 Nov 2022 06:15:51 +0000 Subject: [PATCH] feat: Add support for https_proxy parameter for the config_sync.git block (#1457) * Add support for https_proxy parameter for the config_sync.git block * Changes post make buid and make docker_generate_docs runs --- modules/acm/README.md | 1 + modules/acm/feature.tf | 1 + modules/acm/variables.tf | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/modules/acm/README.md b/modules/acm/README.md index 769bcf97bb..de785bccd5 100644 --- a/modules/acm/README.md +++ b/modules/acm/README.md @@ -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 | diff --git a/modules/acm/feature.tf b/modules/acm/feature.tf index bd928551d0..3bb977388a 100644 --- a/modules/acm/feature.tf +++ b/modules/acm/feature.tf @@ -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 } } diff --git a/modules/acm/variables.tf b/modules/acm/variables.tf index c225a45a79..f9bf8a41f5 100644 --- a/modules/acm/variables.tf +++ b/modules/acm/variables.tf @@ -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