Skip to content

Commit 8a135fe

Browse files
author
Aaron Lane
authored
Merge branch 'master' into feature/gke-safe-cluster
2 parents 0468ec7 + 63c8b6f commit 8a135fe

36 files changed

+5
-138
lines changed

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ Extending the adopted spec, each change should have a link to its corresponding
1717
* Support for `local_ssd_count` in node pool configuration. [#244]
1818
* Wait for cluster to be ready before returning endpoint. [#340]
1919

20+
### Removed
21+
22+
* **Breaking**: Removed support for enabling the Kubernetes dashboard, as this is deprecated on GKE. [#337]
23+
2024
## [v5.1.1] - 2019-10-25
2125

2226
### Fixed
@@ -230,6 +234,7 @@ In either case, upgrading to module version `v1.0.0` will trigger a recreation o
230234
[v0.3.0]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v0.2.0...v0.3.0
231235
[v0.2.0]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v0.1.0...v0.2.0
232236

237+
[#337]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/337
233238
[#340]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/340
234239
[#268]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/268
235240
[#311]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/311

‎README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ module "gke" {
3434
ip_range_services = "us-central1-01-gke-01-services"
3535
http_load_balancing = false
3636
horizontal_pod_autoscaling = true
37-
kubernetes_dashboard = true
3837
network_policy = true
3938
4039
node_pools = [
@@ -147,7 +146,6 @@ In either case, upgrading to module version `v1.0.0` will trigger a recreation o
147146
| ip\_range\_pods | The _name_ of the secondary subnet ip range to use for pods | string | n/a | yes |
148147
| ip\_range\_services | The _name_ of the secondary subnet range to use for services | string | n/a | yes |
149148
| issue\_client\_certificate | Issues a client certificate to authenticate to the cluster endpoint. To maximize the security of your cluster, leave this option disabled. Client certificates don't automatically rotate and aren't easily revocable. WARNING: changing this after cluster creation is destructive! | bool | `"false"` | no |
150-
| kubernetes\_dashboard | Enable kubernetes dashboard addon | bool | `"false"` | no |
151149
| kubernetes\_version | The Kubernetes version of the masters. If set to 'latest' it will pull latest available version in the selected region. | string | `"latest"` | no |
152150
| logging\_service | The logging service that the cluster should write logs to. Available options include logging.googleapis.com, logging.googleapis.com/kubernetes (beta), and none | string | `"logging.googleapis.com"` | no |
153151
| maintenance\_start\_time | Time window specified for daily maintenance operations in RFC3339 format | string | `"05:00"` | no |
@@ -185,7 +183,6 @@ In either case, upgrading to module version `v1.0.0` will trigger a recreation o
185183
| endpoint | Cluster endpoint |
186184
| horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled |
187185
| http\_load\_balancing\_enabled | Whether http load balancing enabled |
188-
| kubernetes\_dashboard\_enabled | Whether kubernetes dashboard enabled |
189186
| location | Cluster location (region if regional cluster, zone if zonal cluster) |
190187
| logging\_service | Logging service used |
191188
| master\_authorized\_networks\_config | Networks from which access to master is permitted |

‎autogen/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ module "gke" {
3939
ip_range_services = "us-central1-01-gke-01-services"
4040
http_load_balancing = false
4141
horizontal_pod_autoscaling = true
42-
kubernetes_dashboard = true
4342
network_policy = true
4443
{% if private_cluster %}
4544
enable_private_endpoint = true

‎autogen/cluster.tf.tmpl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,6 @@ resource "google_container_cluster" "primary" {
119119
disabled = ! var.horizontal_pod_autoscaling
120120
}
121121

122-
kubernetes_dashboard {
123-
disabled = ! var.kubernetes_dashboard
124-
}
125-
126122
network_policy_config {
127123
disabled = ! var.network_policy
128124
}

‎autogen/main.tf.tmpl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ locals {
105105
cluster_output_network_policy_enabled = google_container_cluster.primary.addons_config.0.network_policy_config.0.disabled
106106
cluster_output_http_load_balancing_enabled = google_container_cluster.primary.addons_config.0.http_load_balancing.0.disabled
107107
cluster_output_horizontal_pod_autoscaling_enabled = google_container_cluster.primary.addons_config.0.horizontal_pod_autoscaling.0.disabled
108-
cluster_output_kubernetes_dashboard_enabled = google_container_cluster.primary.addons_config.0.kubernetes_dashboard.0.disabled
109108

110109
{% if beta_cluster %}
111110
# BETA features
@@ -139,7 +138,6 @@ locals {
139138
cluster_network_policy_enabled = ! local.cluster_output_network_policy_enabled
140139
cluster_http_load_balancing_enabled = ! local.cluster_output_http_load_balancing_enabled
141140
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_output_horizontal_pod_autoscaling_enabled
142-
cluster_kubernetes_dashboard_enabled = ! local.cluster_output_kubernetes_dashboard_enabled
143141
{% if beta_cluster %}
144142
# BETA features
145143
cluster_istio_enabled = ! local.cluster_output_istio_disabled

‎autogen/outputs.tf.tmpl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,6 @@ output "horizontal_pod_autoscaling_enabled" {
104104
value = local.cluster_horizontal_pod_autoscaling_enabled
105105
}
106106

107-
output "kubernetes_dashboard_enabled" {
108-
description = "Whether kubernetes dashboard enabled"
109-
value = local.cluster_kubernetes_dashboard_enabled
110-
}
111-
112107
output "node_pools_names" {
113108
description = "List of node pools names"
114109
value = local.cluster_node_pools_names

‎autogen/variables.tf.tmpl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,6 @@ variable "http_load_balancing" {
9696
default = true
9797
}
9898

99-
variable "kubernetes_dashboard" {
100-
type = bool
101-
description = "Enable kubernetes dashboard addon"
102-
default = false
103-
}
104-
10599
variable "network_policy" {
106100
type = bool
107101
description = "Enable network policy addon"

‎cluster.tf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,6 @@ resource "google_container_cluster" "primary" {
7979
disabled = ! var.horizontal_pod_autoscaling
8080
}
8181

82-
kubernetes_dashboard {
83-
disabled = ! var.kubernetes_dashboard
84-
}
85-
8682
network_policy_config {
8783
disabled = ! var.network_policy
8884
}

‎main.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ locals {
8080
cluster_output_network_policy_enabled = google_container_cluster.primary.addons_config.0.network_policy_config.0.disabled
8181
cluster_output_http_load_balancing_enabled = google_container_cluster.primary.addons_config.0.http_load_balancing.0.disabled
8282
cluster_output_horizontal_pod_autoscaling_enabled = google_container_cluster.primary.addons_config.0.horizontal_pod_autoscaling.0.disabled
83-
cluster_output_kubernetes_dashboard_enabled = google_container_cluster.primary.addons_config.0.kubernetes_dashboard.0.disabled
8483

8584

8685
cluster_output_node_pools_names = concat(google_container_node_pool.pools.*.name, [""])
@@ -105,7 +104,6 @@ locals {
105104
cluster_network_policy_enabled = ! local.cluster_output_network_policy_enabled
106105
cluster_http_load_balancing_enabled = ! local.cluster_output_http_load_balancing_enabled
107106
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_output_horizontal_pod_autoscaling_enabled
108-
cluster_kubernetes_dashboard_enabled = ! local.cluster_output_kubernetes_dashboard_enabled
109107
}
110108

111109
/******************************************

‎modules/beta-private-cluster-update-variant/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ module "gke" {
3636
ip_range_services = "us-central1-01-gke-01-services"
3737
http_load_balancing = false
3838
horizontal_pod_autoscaling = true
39-
kubernetes_dashboard = true
4039
network_policy = true
4140
enable_private_endpoint = true
4241
enable_private_nodes = true
@@ -168,7 +167,6 @@ In either case, upgrading to module version `v1.0.0` will trigger a recreation o
168167
| ip\_range\_services | The _name_ of the secondary subnet range to use for services | string | n/a | yes |
169168
| issue\_client\_certificate | Issues a client certificate to authenticate to the cluster endpoint. To maximize the security of your cluster, leave this option disabled. Client certificates don't automatically rotate and aren't easily revocable. WARNING: changing this after cluster creation is destructive! | bool | `"false"` | no |
170169
| istio | (Beta) Enable Istio addon | string | `"false"` | no |
171-
| kubernetes\_dashboard | Enable kubernetes dashboard addon | bool | `"false"` | no |
172170
| kubernetes\_version | The Kubernetes version of the masters. If set to 'latest' it will pull latest available version in the selected region. | string | `"latest"` | no |
173171
| logging\_service | The logging service that the cluster should write logs to. Available options include logging.googleapis.com, logging.googleapis.com/kubernetes (beta), and none | string | `"logging.googleapis.com"` | no |
174172
| maintenance\_start\_time | Time window specified for daily maintenance operations in RFC3339 format | string | `"05:00"` | no |
@@ -217,7 +215,6 @@ In either case, upgrading to module version `v1.0.0` will trigger a recreation o
217215
| identity\_namespace | Workload Identity namespace |
218216
| intranode\_visibility\_enabled | Whether intra-node visibility is enabled |
219217
| istio\_enabled | Whether Istio is enabled |
220-
| kubernetes\_dashboard\_enabled | Whether kubernetes dashboard enabled |
221218
| location | Cluster location (region if regional cluster, zone if zonal cluster) |
222219
| logging\_service | Logging service used |
223220
| master\_authorized\_networks\_config | Networks from which access to master is permitted |

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ resource "google_container_cluster" "primary" {
111111
disabled = ! var.horizontal_pod_autoscaling
112112
}
113113

114-
kubernetes_dashboard {
115-
disabled = ! var.kubernetes_dashboard
116-
}
117-
118114
network_policy_config {
119115
disabled = ! var.network_policy
120116
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ locals {
9393
cluster_output_network_policy_enabled = google_container_cluster.primary.addons_config.0.network_policy_config.0.disabled
9494
cluster_output_http_load_balancing_enabled = google_container_cluster.primary.addons_config.0.http_load_balancing.0.disabled
9595
cluster_output_horizontal_pod_autoscaling_enabled = google_container_cluster.primary.addons_config.0.horizontal_pod_autoscaling.0.disabled
96-
cluster_output_kubernetes_dashboard_enabled = google_container_cluster.primary.addons_config.0.kubernetes_dashboard.0.disabled
9796

9897
# BETA features
9998
cluster_output_istio_disabled = google_container_cluster.primary.addons_config.0.istio_config != null && length(google_container_cluster.primary.addons_config.0.istio_config) == 1 ? google_container_cluster.primary.addons_config.0.istio_config.0.disabled : false
@@ -125,7 +124,6 @@ locals {
125124
cluster_network_policy_enabled = ! local.cluster_output_network_policy_enabled
126125
cluster_http_load_balancing_enabled = ! local.cluster_output_http_load_balancing_enabled
127126
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_output_horizontal_pod_autoscaling_enabled
128-
cluster_kubernetes_dashboard_enabled = ! local.cluster_output_kubernetes_dashboard_enabled
129127
# BETA features
130128
cluster_istio_enabled = ! local.cluster_output_istio_disabled
131129
cluster_cloudrun_enabled = var.cloudrun

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,6 @@ output "horizontal_pod_autoscaling_enabled" {
104104
value = local.cluster_horizontal_pod_autoscaling_enabled
105105
}
106106

107-
output "kubernetes_dashboard_enabled" {
108-
description = "Whether kubernetes dashboard enabled"
109-
value = local.cluster_kubernetes_dashboard_enabled
110-
}
111-
112107
output "node_pools_names" {
113108
description = "List of node pools names"
114109
value = local.cluster_node_pools_names

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,6 @@ variable "http_load_balancing" {
9696
default = true
9797
}
9898

99-
variable "kubernetes_dashboard" {
100-
type = bool
101-
description = "Enable kubernetes dashboard addon"
102-
default = false
103-
}
104-
10599
variable "network_policy" {
106100
type = bool
107101
description = "Enable network policy addon"

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ module "gke" {
3636
ip_range_services = "us-central1-01-gke-01-services"
3737
http_load_balancing = false
3838
horizontal_pod_autoscaling = true
39-
kubernetes_dashboard = true
4039
network_policy = true
4140
enable_private_endpoint = true
4241
enable_private_nodes = true
@@ -168,7 +167,6 @@ In either case, upgrading to module version `v1.0.0` will trigger a recreation o
168167
| ip\_range\_services | The _name_ of the secondary subnet range to use for services | string | n/a | yes |
169168
| issue\_client\_certificate | Issues a client certificate to authenticate to the cluster endpoint. To maximize the security of your cluster, leave this option disabled. Client certificates don't automatically rotate and aren't easily revocable. WARNING: changing this after cluster creation is destructive! | bool | `"false"` | no |
170169
| istio | (Beta) Enable Istio addon | string | `"false"` | no |
171-
| kubernetes\_dashboard | Enable kubernetes dashboard addon | bool | `"false"` | no |
172170
| kubernetes\_version | The Kubernetes version of the masters. If set to 'latest' it will pull latest available version in the selected region. | string | `"latest"` | no |
173171
| logging\_service | The logging service that the cluster should write logs to. Available options include logging.googleapis.com, logging.googleapis.com/kubernetes (beta), and none | string | `"logging.googleapis.com"` | no |
174172
| maintenance\_start\_time | Time window specified for daily maintenance operations in RFC3339 format | string | `"05:00"` | no |
@@ -217,7 +215,6 @@ In either case, upgrading to module version `v1.0.0` will trigger a recreation o
217215
| identity\_namespace | Workload Identity namespace |
218216
| intranode\_visibility\_enabled | Whether intra-node visibility is enabled |
219217
| istio\_enabled | Whether Istio is enabled |
220-
| kubernetes\_dashboard\_enabled | Whether kubernetes dashboard enabled |
221218
| location | Cluster location (region if regional cluster, zone if zonal cluster) |
222219
| logging\_service | Logging service used |
223220
| master\_authorized\_networks\_config | Networks from which access to master is permitted |

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ resource "google_container_cluster" "primary" {
111111
disabled = ! var.horizontal_pod_autoscaling
112112
}
113113

114-
kubernetes_dashboard {
115-
disabled = ! var.kubernetes_dashboard
116-
}
117-
118114
network_policy_config {
119115
disabled = ! var.network_policy
120116
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ locals {
9393
cluster_output_network_policy_enabled = google_container_cluster.primary.addons_config.0.network_policy_config.0.disabled
9494
cluster_output_http_load_balancing_enabled = google_container_cluster.primary.addons_config.0.http_load_balancing.0.disabled
9595
cluster_output_horizontal_pod_autoscaling_enabled = google_container_cluster.primary.addons_config.0.horizontal_pod_autoscaling.0.disabled
96-
cluster_output_kubernetes_dashboard_enabled = google_container_cluster.primary.addons_config.0.kubernetes_dashboard.0.disabled
9796

9897
# BETA features
9998
cluster_output_istio_disabled = google_container_cluster.primary.addons_config.0.istio_config != null && length(google_container_cluster.primary.addons_config.0.istio_config) == 1 ? google_container_cluster.primary.addons_config.0.istio_config.0.disabled : false
@@ -125,7 +124,6 @@ locals {
125124
cluster_network_policy_enabled = ! local.cluster_output_network_policy_enabled
126125
cluster_http_load_balancing_enabled = ! local.cluster_output_http_load_balancing_enabled
127126
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_output_horizontal_pod_autoscaling_enabled
128-
cluster_kubernetes_dashboard_enabled = ! local.cluster_output_kubernetes_dashboard_enabled
129127
# BETA features
130128
cluster_istio_enabled = ! local.cluster_output_istio_disabled
131129
cluster_cloudrun_enabled = var.cloudrun

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,6 @@ output "horizontal_pod_autoscaling_enabled" {
104104
value = local.cluster_horizontal_pod_autoscaling_enabled
105105
}
106106

107-
output "kubernetes_dashboard_enabled" {
108-
description = "Whether kubernetes dashboard enabled"
109-
value = local.cluster_kubernetes_dashboard_enabled
110-
}
111-
112107
output "node_pools_names" {
113108
description = "List of node pools names"
114109
value = local.cluster_node_pools_names

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,6 @@ variable "http_load_balancing" {
9696
default = true
9797
}
9898

99-
variable "kubernetes_dashboard" {
100-
type = bool
101-
description = "Enable kubernetes dashboard addon"
102-
default = false
103-
}
104-
10599
variable "network_policy" {
106100
type = bool
107101
description = "Enable network policy addon"

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ module "gke" {
3434
ip_range_services = "us-central1-01-gke-01-services"
3535
http_load_balancing = false
3636
horizontal_pod_autoscaling = true
37-
kubernetes_dashboard = true
3837
network_policy = true
3938
istio = true
4039
cloudrun = true
@@ -160,7 +159,6 @@ In either case, upgrading to module version `v1.0.0` will trigger a recreation o
160159
| ip\_range\_services | The _name_ of the secondary subnet range to use for services | string | n/a | yes |
161160
| issue\_client\_certificate | Issues a client certificate to authenticate to the cluster endpoint. To maximize the security of your cluster, leave this option disabled. Client certificates don't automatically rotate and aren't easily revocable. WARNING: changing this after cluster creation is destructive! | bool | `"false"` | no |
162161
| istio | (Beta) Enable Istio addon | string | `"false"` | no |
163-
| kubernetes\_dashboard | Enable kubernetes dashboard addon | bool | `"false"` | no |
164162
| kubernetes\_version | The Kubernetes version of the masters. If set to 'latest' it will pull latest available version in the selected region. | string | `"latest"` | no |
165163
| logging\_service | The logging service that the cluster should write logs to. Available options include logging.googleapis.com, logging.googleapis.com/kubernetes (beta), and none | string | `"logging.googleapis.com"` | no |
166164
| maintenance\_start\_time | Time window specified for daily maintenance operations in RFC3339 format | string | `"05:00"` | no |
@@ -208,7 +206,6 @@ In either case, upgrading to module version `v1.0.0` will trigger a recreation o
208206
| identity\_namespace | Workload Identity namespace |
209207
| intranode\_visibility\_enabled | Whether intra-node visibility is enabled |
210208
| istio\_enabled | Whether Istio is enabled |
211-
| kubernetes\_dashboard\_enabled | Whether kubernetes dashboard enabled |
212209
| location | Cluster location (region if regional cluster, zone if zonal cluster) |
213210
| logging\_service | Logging service used |
214211
| master\_authorized\_networks\_config | Networks from which access to master is permitted |

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ resource "google_container_cluster" "primary" {
111111
disabled = ! var.horizontal_pod_autoscaling
112112
}
113113

114-
kubernetes_dashboard {
115-
disabled = ! var.kubernetes_dashboard
116-
}
117-
118114
network_policy_config {
119115
disabled = ! var.network_policy
120116
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ locals {
9393
cluster_output_network_policy_enabled = google_container_cluster.primary.addons_config.0.network_policy_config.0.disabled
9494
cluster_output_http_load_balancing_enabled = google_container_cluster.primary.addons_config.0.http_load_balancing.0.disabled
9595
cluster_output_horizontal_pod_autoscaling_enabled = google_container_cluster.primary.addons_config.0.horizontal_pod_autoscaling.0.disabled
96-
cluster_output_kubernetes_dashboard_enabled = google_container_cluster.primary.addons_config.0.kubernetes_dashboard.0.disabled
9796

9897
# BETA features
9998
cluster_output_istio_disabled = google_container_cluster.primary.addons_config.0.istio_config != null && length(google_container_cluster.primary.addons_config.0.istio_config) == 1 ? google_container_cluster.primary.addons_config.0.istio_config.0.disabled : false
@@ -125,7 +124,6 @@ locals {
125124
cluster_network_policy_enabled = ! local.cluster_output_network_policy_enabled
126125
cluster_http_load_balancing_enabled = ! local.cluster_output_http_load_balancing_enabled
127126
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_output_horizontal_pod_autoscaling_enabled
128-
cluster_kubernetes_dashboard_enabled = ! local.cluster_output_kubernetes_dashboard_enabled
129127
# BETA features
130128
cluster_istio_enabled = ! local.cluster_output_istio_disabled
131129
cluster_cloudrun_enabled = var.cloudrun

0 commit comments

Comments
 (0)