From 86936672dcbb9e5c81ac7ded03ec1d6428d6a8a5 Mon Sep 17 00:00:00 2001 From: Edvin Norling Date: Fri, 12 May 2023 07:39:04 +0200 Subject: [PATCH] Move variabels to also include autopilot clusters Signed-off-by: Edvin Norling --- autogen/main/variables.tf.tmpl | 23 +++++++++---------- .../beta-autopilot-private-cluster/README.md | 2 ++ .../variables.tf | 11 +++++++++ .../beta-autopilot-public-cluster/README.md | 2 ++ .../variables.tf | 11 +++++++++ .../variables.tf | 23 +++++++++---------- modules/beta-private-cluster/variables.tf | 23 +++++++++---------- .../variables.tf | 23 +++++++++---------- modules/beta-public-cluster/variables.tf | 23 +++++++++---------- 9 files changed, 81 insertions(+), 60 deletions(-) diff --git a/autogen/main/variables.tf.tmpl b/autogen/main/variables.tf.tmpl index 086003e619..d0d140b656 100644 --- a/autogen/main/variables.tf.tmpl +++ b/autogen/main/variables.tf.tmpl @@ -530,6 +530,17 @@ variable "enable_confidential_nodes" { description = "An optional flag to enable confidential node config." default = false } +variable "workload_vulnerability_mode" { + description = "(beta) Vulnerability mode." + type = string + default = "" +} + +variable "workload_config_audit_mode" { + description = "(beta) Worload config audit mode." + type = string + default = "DISABLED" +} {% endif %} variable "disable_default_snat" { @@ -766,17 +777,5 @@ variable "enable_identity_service" { description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API." default = false } - -variable "workload_vulnerability_mode" { - description = "(beta) Vulnerability mode." - type = string - default = "" -} - -variable "workload_config_audit_mode" { - description = "(beta) Worload config audit mode." - type = string - default = "DISABLED" -} {% endif %} {% endif %} diff --git a/modules/beta-autopilot-private-cluster/README.md b/modules/beta-autopilot-private-cluster/README.md index bbe9381708..9a3871bed3 100644 --- a/modules/beta-autopilot-private-cluster/README.md +++ b/modules/beta-autopilot-private-cluster/README.md @@ -129,6 +129,8 @@ Then perform the following commands on the root folder: | subnetwork | The subnetwork to host the cluster in (required) | `string` | n/a | yes | | timeouts | Timeout for cluster operations. | `map(string)` | `{}` | no | | upstream\_nameservers | If specified, the values replace the nameservers taken by default from the node’s /etc/resolv.conf | `list(string)` | `[]` | no | +| workload\_config\_audit\_mode | (beta) Worload config audit mode. | `string` | `"DISABLED"` | no | +| workload\_vulnerability\_mode | (beta) Vulnerability mode. | `string` | `""` | no | | zones | The zones to host the cluster in (optional if regional cluster / required if zonal) | `list(string)` | `[]` | no | ## Outputs diff --git a/modules/beta-autopilot-private-cluster/variables.tf b/modules/beta-autopilot-private-cluster/variables.tf index 8b0bf17e28..a9bd584314 100644 --- a/modules/beta-autopilot-private-cluster/variables.tf +++ b/modules/beta-autopilot-private-cluster/variables.tf @@ -366,6 +366,17 @@ variable "enable_confidential_nodes" { description = "An optional flag to enable confidential node config." default = false } +variable "workload_vulnerability_mode" { + description = "(beta) Vulnerability mode." + type = string + default = "" +} + +variable "workload_config_audit_mode" { + description = "(beta) Worload config audit mode." + type = string + default = "DISABLED" +} variable "disable_default_snat" { type = bool diff --git a/modules/beta-autopilot-public-cluster/README.md b/modules/beta-autopilot-public-cluster/README.md index 91a48d9ce3..00b9a25f39 100644 --- a/modules/beta-autopilot-public-cluster/README.md +++ b/modules/beta-autopilot-public-cluster/README.md @@ -118,6 +118,8 @@ Then perform the following commands on the root folder: | subnetwork | The subnetwork to host the cluster in (required) | `string` | n/a | yes | | timeouts | Timeout for cluster operations. | `map(string)` | `{}` | no | | upstream\_nameservers | If specified, the values replace the nameservers taken by default from the node’s /etc/resolv.conf | `list(string)` | `[]` | no | +| workload\_config\_audit\_mode | (beta) Worload config audit mode. | `string` | `"DISABLED"` | no | +| workload\_vulnerability\_mode | (beta) Vulnerability mode. | `string` | `""` | no | | zones | The zones to host the cluster in (optional if regional cluster / required if zonal) | `list(string)` | `[]` | no | ## Outputs diff --git a/modules/beta-autopilot-public-cluster/variables.tf b/modules/beta-autopilot-public-cluster/variables.tf index 947bf6df89..e244b73728 100644 --- a/modules/beta-autopilot-public-cluster/variables.tf +++ b/modules/beta-autopilot-public-cluster/variables.tf @@ -336,6 +336,17 @@ variable "enable_confidential_nodes" { description = "An optional flag to enable confidential node config." default = false } +variable "workload_vulnerability_mode" { + description = "(beta) Vulnerability mode." + type = string + default = "" +} + +variable "workload_config_audit_mode" { + description = "(beta) Worload config audit mode." + type = string + default = "DISABLED" +} variable "disable_default_snat" { type = bool diff --git a/modules/beta-private-cluster-update-variant/variables.tf b/modules/beta-private-cluster-update-variant/variables.tf index b9ca3a8263..11bd398c68 100644 --- a/modules/beta-private-cluster-update-variant/variables.tf +++ b/modules/beta-private-cluster-update-variant/variables.tf @@ -502,6 +502,17 @@ variable "enable_confidential_nodes" { description = "An optional flag to enable confidential node config." default = false } +variable "workload_vulnerability_mode" { + description = "(beta) Vulnerability mode." + type = string + default = "" +} + +variable "workload_config_audit_mode" { + description = "(beta) Worload config audit mode." + type = string + default = "DISABLED" +} variable "disable_default_snat" { type = bool @@ -725,15 +736,3 @@ variable "enable_identity_service" { description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API." default = false } - -variable "workload_vulnerability_mode" { - description = "(beta) Vulnerability mode." - type = string - default = "" -} - -variable "workload_config_audit_mode" { - description = "(beta) Worload config audit mode." - type = string - default = "DISABLED" -} diff --git a/modules/beta-private-cluster/variables.tf b/modules/beta-private-cluster/variables.tf index b9ca3a8263..11bd398c68 100644 --- a/modules/beta-private-cluster/variables.tf +++ b/modules/beta-private-cluster/variables.tf @@ -502,6 +502,17 @@ variable "enable_confidential_nodes" { description = "An optional flag to enable confidential node config." default = false } +variable "workload_vulnerability_mode" { + description = "(beta) Vulnerability mode." + type = string + default = "" +} + +variable "workload_config_audit_mode" { + description = "(beta) Worload config audit mode." + type = string + default = "DISABLED" +} variable "disable_default_snat" { type = bool @@ -725,15 +736,3 @@ variable "enable_identity_service" { description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API." default = false } - -variable "workload_vulnerability_mode" { - description = "(beta) Vulnerability mode." - type = string - default = "" -} - -variable "workload_config_audit_mode" { - description = "(beta) Worload config audit mode." - type = string - default = "DISABLED" -} diff --git a/modules/beta-public-cluster-update-variant/variables.tf b/modules/beta-public-cluster-update-variant/variables.tf index 1d7aedb32f..5e033e3eb3 100644 --- a/modules/beta-public-cluster-update-variant/variables.tf +++ b/modules/beta-public-cluster-update-variant/variables.tf @@ -472,6 +472,17 @@ variable "enable_confidential_nodes" { description = "An optional flag to enable confidential node config." default = false } +variable "workload_vulnerability_mode" { + description = "(beta) Vulnerability mode." + type = string + default = "" +} + +variable "workload_config_audit_mode" { + description = "(beta) Worload config audit mode." + type = string + default = "DISABLED" +} variable "disable_default_snat" { type = bool @@ -695,15 +706,3 @@ variable "enable_identity_service" { description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API." default = false } - -variable "workload_vulnerability_mode" { - description = "(beta) Vulnerability mode." - type = string - default = "" -} - -variable "workload_config_audit_mode" { - description = "(beta) Worload config audit mode." - type = string - default = "DISABLED" -} diff --git a/modules/beta-public-cluster/variables.tf b/modules/beta-public-cluster/variables.tf index 1d7aedb32f..5e033e3eb3 100644 --- a/modules/beta-public-cluster/variables.tf +++ b/modules/beta-public-cluster/variables.tf @@ -472,6 +472,17 @@ variable "enable_confidential_nodes" { description = "An optional flag to enable confidential node config." default = false } +variable "workload_vulnerability_mode" { + description = "(beta) Vulnerability mode." + type = string + default = "" +} + +variable "workload_config_audit_mode" { + description = "(beta) Worload config audit mode." + type = string + default = "DISABLED" +} variable "disable_default_snat" { type = bool @@ -695,15 +706,3 @@ variable "enable_identity_service" { description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API." default = false } - -variable "workload_vulnerability_mode" { - description = "(beta) Vulnerability mode." - type = string - default = "" -} - -variable "workload_config_audit_mode" { - description = "(beta) Worload config audit mode." - type = string - default = "DISABLED" -}