Move variabels to also include autopilot clusters

Signed-off-by: Edvin Norling <edvin.norling@kognic.com>

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 %}

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

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

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

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

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"
-}

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"
-}

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"
-}

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"
-}