Skip to content

Commit 17b294d

Browse files
apeabodyapeabody
authored
Merge branch 'master' into ap/kitchen2
2 parents ce4c179 + eb9b0be commit 17b294d

File tree

33 files changed

+106
-114
lines changed

33 files changed

+106
-114
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ Then perform the following commands on the root folder:
166166
| enable\_confidential\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |
167167
| enable\_cost\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |
168168
| enable\_default\_node\_pools\_metadata | Whether to enable the default node pools metadata key-value pairs such as `cluster_name` and `node_pool` | `bool` | `true` | no |
169+
| enable\_gcfs | Enable image streaming on cluster level. | `bool` | `false` | no |
169170
| enable\_identity\_service | (Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API. | `bool` | `false` | no |
170171
| enable\_intranode\_visibility | Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network | `bool` | `false` | no |
171172
| enable\_kubernetes\_alpha | Whether to enable Kubernetes Alpha features for this cluster. Note that when this option is enabled, the cluster cannot be upgraded and will be automatically deleted after 30 days. | `bool` | `false` | no |

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -698,11 +698,9 @@ resource "google_container_cluster" "primary" {
698698
}
699699
{% endif %}
700700
{% if autopilot_cluster != true %}
701-
{% if beta_cluster %}
702701
gcfs_config {
703702
enabled = var.enable_gcfs
704703
}
705-
{% endif %}
706704
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null
707705
{% endif %}
708706
}

‎autogen/main/variables.tf.tmpl‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -614,6 +614,17 @@ variable "enable_confidential_nodes" {
614614
default = false
615615
}
616616

617+
variable "enable_gcfs" {
618+
type = bool
619+
description = "Enable image streaming on cluster level."
620+
{% if autopilot_cluster != true %}
621+
default = false
622+
{% endif %}
623+
{% if autopilot_cluster %}
624+
default = true
625+
{% endif %}
626+
}
627+
617628
variable "enable_secret_manager_addon" {
618629
description = "Enable the Secret Manager add-on for this cluster"
619630
type = bool
@@ -987,17 +998,6 @@ variable "sandbox_enabled" {
987998
default = false
988999
}
9891000
{% endif %}
990-
991-
variable "enable_gcfs" {
992-
type = bool
993-
description = "(Beta) Enable image streaming on cluster level."
994-
{% if autopilot_cluster != true %}
995-
default = false
996-
{% endif %}
997-
{% if autopilot_cluster %}
998-
default = true
999-
{% endif %}
1000-
}
10011001
{% endif %}
10021002

10031003
{% if autopilot_cluster != true %}

‎autogen/main/versions.tf.tmpl‎

Lines changed: 8 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -24,70 +24,35 @@ terraform {
2424
required_providers {
2525
google = {
2626
source = "hashicorp/google"
27-
version = ">= 6.7.0, < 7"
27+
version = ">= 6.7.0, < 6.10.0"
2828
}
2929
google-beta = {
3030
source = "hashicorp/google-beta"
31-
version = ">= 6.7.0, < 7"
31+
version = ">= 6.7.0, < 6.10.0"
3232
}
33-
kubernetes = {
34-
source = "hashicorp/kubernetes"
35-
version = "~> 2.10"
36-
}
37-
random = {
38-
source = "hashicorp/random"
39-
version = ">= 2.1"
40-
}
41-
}
42-
provider_meta "google-beta" {
43-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0"
44-
}
4533
{% elif beta_cluster and autopilot_cluster %}
4634
required_providers {
4735
google = {
4836
source = "hashicorp/google"
49-
version = ">= 6.5.0, < 7"
37+
version = ">= 6.5.0, < 6.10.0"
5038
}
5139
google-beta = {
5240
source = "hashicorp/google-beta"
53-
version = ">= 6.5.0, < 7"
41+
version = ">= 6.5.0, < 6.10.0"
5442
}
55-
kubernetes = {
56-
source = "hashicorp/kubernetes"
57-
version = "~> 2.10"
58-
}
59-
random = {
60-
source = "hashicorp/random"
61-
version = ">= 2.1"
62-
}
63-
}
64-
provider_meta "google-beta" {
65-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0"
66-
}
6743
{% elif autopilot_cluster %}
6844
required_providers {
6945
google = {
7046
source = "hashicorp/google"
71-
version = ">= 6.5.0, < 7"
47+
version = ">= 6.5.0, < 6.10.0"
7248
}
73-
kubernetes = {
74-
source = "hashicorp/kubernetes"
75-
version = "~> 2.10"
76-
}
77-
random = {
78-
source = "hashicorp/random"
79-
version = ">= 2.1"
80-
}
81-
}
82-
provider_meta "google" {
83-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0"
84-
}
8549
{% else %}
8650
required_providers {
8751
google = {
8852
source = "hashicorp/google"
89-
version = ">= 6.7.0, < 7"
53+
version = ">= 6.7.0, < 6.10.0"
9054
}
55+
{% endif %}
9156
kubernetes = {
9257
source = "hashicorp/kubernetes"
9358
version = "~> 2.10"
@@ -97,8 +62,7 @@ terraform {
9762
version = ">= 2.1"
9863
}
9964
}
100-
provider_meta "google" {
65+
provider_meta "{% if beta_cluster %}google-beta{% else %}google{% endif %}" {
10166
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0"
10267
}
103-
{% endif %}
10468
}

‎cluster.tf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,9 @@ resource "google_container_cluster" "primary" {
528528

529529
node_pool_defaults {
530530
node_config_defaults {
531+
gcfs_config {
532+
enabled = var.enable_gcfs
533+
}
531534
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null
532535
}
533536
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Then perform the following commands on the root folder:
9393
| enable\_confidential\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |
9494
| enable\_cost\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |
9595
| enable\_fqdn\_network\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |
96-
| enable\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `true` | no |
96+
| enable\_gcfs | Enable image streaming on cluster level. | `bool` | `true` | no |
9797
| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |
9898
| enable\_network\_egress\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |
9999
| enable\_private\_endpoint | Whether the master's internal IP address is used as the cluster endpoint | `bool` | `false` | no |

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,12 @@ variable "enable_confidential_nodes" {
382382
default = false
383383
}
384384

385+
variable "enable_gcfs" {
386+
type = bool
387+
description = "Enable image streaming on cluster level."
388+
default = true
389+
}
390+
385391
variable "enable_secret_manager_addon" {
386392
description = "Enable the Secret Manager add-on for this cluster"
387393
type = bool
@@ -572,12 +578,6 @@ variable "enable_l4_ilb_subsetting" {
572578
default = false
573579
}
574580

575-
variable "enable_gcfs" {
576-
type = bool
577-
description = "(Beta) Enable image streaming on cluster level."
578-
default = true
579-
}
580-
581581
variable "allow_net_admin" {
582582
description = "(Optional) Enable NET_ADMIN for the cluster."
583583
type = bool

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ terraform {
2121
required_providers {
2222
google = {
2323
source = "hashicorp/google"
24-
version = ">= 6.5.0, < 7"
24+
version = ">= 6.5.0, < 6.10.0"
2525
}
2626
google-beta = {
2727
source = "hashicorp/google-beta"
28-
version = ">= 6.5.0, < 7"
28+
version = ">= 6.5.0, < 6.10.0"
2929
}
3030
kubernetes = {
3131
source = "hashicorp/kubernetes"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Then perform the following commands on the root folder:
8686
| enable\_confidential\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |
8787
| enable\_cost\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |
8888
| enable\_fqdn\_network\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |
89-
| enable\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `true` | no |
89+
| enable\_gcfs | Enable image streaming on cluster level. | `bool` | `true` | no |
9090
| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |
9191
| enable\_network\_egress\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |
9292
| enable\_resource\_consumption\_export | Whether to enable resource consumption metering on this cluster. When enabled, a table will be created in the resource export BigQuery dataset to store resource consumption data. The resulting table can be joined with the resource usage table or with BigQuery billing export. | `bool` | `true` | no |

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,12 @@ variable "enable_confidential_nodes" {
346346
default = false
347347
}
348348

349+
variable "enable_gcfs" {
350+
type = bool
351+
description = "Enable image streaming on cluster level."
352+
default = true
353+
}
354+
349355
variable "enable_secret_manager_addon" {
350356
description = "Enable the Secret Manager add-on for this cluster"
351357
type = bool
@@ -536,12 +542,6 @@ variable "enable_l4_ilb_subsetting" {
536542
default = false
537543
}
538544

539-
variable "enable_gcfs" {
540-
type = bool
541-
description = "(Beta) Enable image streaming on cluster level."
542-
default = true
543-
}
544-
545545
variable "allow_net_admin" {
546546
description = "(Optional) Enable NET_ADMIN for the cluster."
547547
type = bool

0 commit comments

Comments
 (0)