Skip to content

Commit 94d8d56

Browse files
NissesSenapNissesSenap
committed
Move variabels to also include autopilot clusters
Signed-off-by: Edvin Norling <[email protected]>
1 parent 618f05b commit 94d8d56

File tree

9 files changed

+81
-60
lines changed

9 files changed

+81
-60
lines changed

‎autogen/main/variables.tf.tmpl

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,17 @@ variable "enable_confidential_nodes" {
530530
description = "An optional flag to enable confidential node config."
531531
default = false
532532
}
533+
variable "workload_vulnerability_mode" {
534+
description = "(beta) Vulnerability mode."
535+
type = string
536+
default = ""
537+
}
538+
539+
variable "workload_config_audit_mode" {
540+
description = "(beta) Worload config audit mode."
541+
type = string
542+
default = "DISABLED"
543+
}
533544
{% endif %}
534545

535546
variable "disable_default_snat" {
@@ -766,17 +777,5 @@ variable "enable_identity_service" {
766777
description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
767778
default = false
768779
}
769-
770-
variable "workload_vulnerability_mode" {
771-
description = "(beta) Vulnerability mode."
772-
type = string
773-
default = ""
774-
}
775-
776-
variable "workload_config_audit_mode" {
777-
description = "(beta) Worload config audit mode."
778-
type = string
779-
default = "DISABLED"
780-
}
781780
{% endif %}
782781
{% endif %}

‎modules/beta-autopilot-private-cluster/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ Then perform the following commands on the root folder:
129129
| subnetwork | The subnetwork to host the cluster in (required) | `string` | n/a | yes |
130130
| timeouts | Timeout for cluster operations. | `map(string)` | `{}` | no |
131131
| upstream\_nameservers | If specified, the values replace the nameservers taken by default from the node’s /etc/resolv.conf | `list(string)` | `[]` | no |
132+
| workload\_config\_audit\_mode | (beta) Worload config audit mode. | `string` | `"DISABLED"` | no |
133+
| workload\_vulnerability\_mode | (beta) Vulnerability mode. | `string` | `""` | no |
132134
| zones | The zones to host the cluster in (optional if regional cluster / required if zonal) | `list(string)` | `[]` | no |
133135

134136
## Outputs

‎modules/beta-autopilot-private-cluster/variables.tf

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,17 @@ variable "enable_confidential_nodes" {
366366
description = "An optional flag to enable confidential node config."
367367
default = false
368368
}
369+
variable "workload_vulnerability_mode" {
370+
description = "(beta) Vulnerability mode."
371+
type = string
372+
default = ""
373+
}
374+
375+
variable "workload_config_audit_mode" {
376+
description = "(beta) Worload config audit mode."
377+
type = string
378+
default = "DISABLED"
379+
}
369380

370381
variable "disable_default_snat" {
371382
type = bool

‎modules/beta-autopilot-public-cluster/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ Then perform the following commands on the root folder:
118118
| subnetwork | The subnetwork to host the cluster in (required) | `string` | n/a | yes |
119119
| timeouts | Timeout for cluster operations. | `map(string)` | `{}` | no |
120120
| upstream\_nameservers | If specified, the values replace the nameservers taken by default from the node’s /etc/resolv.conf | `list(string)` | `[]` | no |
121+
| workload\_config\_audit\_mode | (beta) Worload config audit mode. | `string` | `"DISABLED"` | no |
122+
| workload\_vulnerability\_mode | (beta) Vulnerability mode. | `string` | `""` | no |
121123
| zones | The zones to host the cluster in (optional if regional cluster / required if zonal) | `list(string)` | `[]` | no |
122124

123125
## Outputs

‎modules/beta-autopilot-public-cluster/variables.tf

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,17 @@ variable "enable_confidential_nodes" {
336336
description = "An optional flag to enable confidential node config."
337337
default = false
338338
}
339+
variable "workload_vulnerability_mode" {
340+
description = "(beta) Vulnerability mode."
341+
type = string
342+
default = ""
343+
}
344+
345+
variable "workload_config_audit_mode" {
346+
description = "(beta) Worload config audit mode."
347+
type = string
348+
default = "DISABLED"
349+
}
339350

340351
variable "disable_default_snat" {
341352
type = bool

‎modules/beta-private-cluster-update-variant/variables.tf

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,17 @@ variable "enable_confidential_nodes" {
502502
description = "An optional flag to enable confidential node config."
503503
default = false
504504
}
505+
variable "workload_vulnerability_mode" {
506+
description = "(beta) Vulnerability mode."
507+
type = string
508+
default = ""
509+
}
510+
511+
variable "workload_config_audit_mode" {
512+
description = "(beta) Worload config audit mode."
513+
type = string
514+
default = "DISABLED"
515+
}
505516

506517
variable "disable_default_snat" {
507518
type = bool
@@ -725,15 +736,3 @@ variable "enable_identity_service" {
725736
description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
726737
default = false
727738
}
728-
729-
variable "workload_vulnerability_mode" {
730-
description = "(beta) Vulnerability mode."
731-
type = string
732-
default = ""
733-
}
734-
735-
variable "workload_config_audit_mode" {
736-
description = "(beta) Worload config audit mode."
737-
type = string
738-
default = "DISABLED"
739-
}

‎modules/beta-private-cluster/variables.tf

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,17 @@ variable "enable_confidential_nodes" {
502502
description = "An optional flag to enable confidential node config."
503503
default = false
504504
}
505+
variable "workload_vulnerability_mode" {
506+
description = "(beta) Vulnerability mode."
507+
type = string
508+
default = ""
509+
}
510+
511+
variable "workload_config_audit_mode" {
512+
description = "(beta) Worload config audit mode."
513+
type = string
514+
default = "DISABLED"
515+
}
505516

506517
variable "disable_default_snat" {
507518
type = bool
@@ -725,15 +736,3 @@ variable "enable_identity_service" {
725736
description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
726737
default = false
727738
}
728-
729-
variable "workload_vulnerability_mode" {
730-
description = "(beta) Vulnerability mode."
731-
type = string
732-
default = ""
733-
}
734-
735-
variable "workload_config_audit_mode" {
736-
description = "(beta) Worload config audit mode."
737-
type = string
738-
default = "DISABLED"
739-
}

‎modules/beta-public-cluster-update-variant/variables.tf

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,17 @@ variable "enable_confidential_nodes" {
472472
description = "An optional flag to enable confidential node config."
473473
default = false
474474
}
475+
variable "workload_vulnerability_mode" {
476+
description = "(beta) Vulnerability mode."
477+
type = string
478+
default = ""
479+
}
480+
481+
variable "workload_config_audit_mode" {
482+
description = "(beta) Worload config audit mode."
483+
type = string
484+
default = "DISABLED"
485+
}
475486

476487
variable "disable_default_snat" {
477488
type = bool
@@ -695,15 +706,3 @@ variable "enable_identity_service" {
695706
description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
696707
default = false
697708
}
698-
699-
variable "workload_vulnerability_mode" {
700-
description = "(beta) Vulnerability mode."
701-
type = string
702-
default = ""
703-
}
704-
705-
variable "workload_config_audit_mode" {
706-
description = "(beta) Worload config audit mode."
707-
type = string
708-
default = "DISABLED"
709-
}

‎modules/beta-public-cluster/variables.tf

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,17 @@ variable "enable_confidential_nodes" {
472472
description = "An optional flag to enable confidential node config."
473473
default = false
474474
}
475+
variable "workload_vulnerability_mode" {
476+
description = "(beta) Vulnerability mode."
477+
type = string
478+
default = ""
479+
}
480+
481+
variable "workload_config_audit_mode" {
482+
description = "(beta) Worload config audit mode."
483+
type = string
484+
default = "DISABLED"
485+
}
475486

476487
variable "disable_default_snat" {
477488
type = bool
@@ -695,15 +706,3 @@ variable "enable_identity_service" {
695706
description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
696707
default = false
697708
}
698-
699-
variable "workload_vulnerability_mode" {
700-
description = "(beta) Vulnerability mode."
701-
type = string
702-
default = ""
703-
}
704-
705-
variable "workload_config_audit_mode" {
706-
description = "(beta) Worload config audit mode."
707-
type = string
708-
default = "DISABLED"
709-
}

0 commit comments

Comments
 (0)