Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove kubernetes dashboard addon #337

Merged
merged 9 commits into from
Nov 21, 2019
Merged

Remove kubernetes dashboard addon #337

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
03ed750
Removed kubernetes dashboard add config.
Shashindran Nov 20, 2019
86b3dd6
Merge pull request #1 from Shashindran/Shashindran-patch-1
Shashindran Nov 20, 2019
c7ec3a9
Update outputs.tf
Shashindran Nov 20, 2019
465b7c7
Update main.tf
Shashindran Nov 20, 2019
591b9a9
Updated autogen to remove the inclusion of kubernetes dashboard addon.
Nov 20, 2019
034d7e8
Removed kubernets dashboard addon from all modules.
Nov 20, 2019
5fca169
Fixed the files and updated README.
Shashindran Nov 21, 2019
566648c
Merge remote-tracking branch 'upstream/master'
Shashindran Nov 21, 2019
6fc8854
Updated README and variables.tf
Shashindran Nov 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions autogen/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,6 @@ resource "google_container_cluster" "primary" {
disabled = ! var.horizontal_pod_autoscaling
}

kubernetes_dashboard {
disabled = ! var.kubernetes_dashboard
}

network_policy_config {
disabled = ! var.network_policy
}
Expand Down
2 changes: 0 additions & 2 deletions autogen/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ locals {
cluster_output_network_policy_enabled = google_container_cluster.primary.addons_config.0.network_policy_config.0.disabled
cluster_output_http_load_balancing_enabled = google_container_cluster.primary.addons_config.0.http_load_balancing.0.disabled
cluster_output_horizontal_pod_autoscaling_enabled = google_container_cluster.primary.addons_config.0.horizontal_pod_autoscaling.0.disabled
cluster_output_kubernetes_dashboard_enabled = google_container_cluster.primary.addons_config.0.kubernetes_dashboard.0.disabled

{% if beta_cluster %}
# BETA features
Expand Down Expand Up @@ -139,7 +138,6 @@ locals {
cluster_network_policy_enabled = ! local.cluster_output_network_policy_enabled
cluster_http_load_balancing_enabled = ! local.cluster_output_http_load_balancing_enabled
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_output_horizontal_pod_autoscaling_enabled
cluster_kubernetes_dashboard_enabled = ! local.cluster_output_kubernetes_dashboard_enabled
{% if beta_cluster %}
# BETA features
cluster_istio_enabled = ! local.cluster_output_istio_disabled
Expand Down
5 changes: 0 additions & 5 deletions autogen/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,6 @@ output "horizontal_pod_autoscaling_enabled" {
value = local.cluster_horizontal_pod_autoscaling_enabled
}

output "kubernetes_dashboard_enabled" {
description = "Whether kubernetes dashboard enabled"
value = local.cluster_kubernetes_dashboard_enabled
}

output "node_pools_names" {
description = "List of node pools names"
value = local.cluster_node_pools_names
Expand Down
4 changes: 0 additions & 4 deletions modules/beta-private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,6 @@ resource "google_container_cluster" "primary" {
disabled = ! var.horizontal_pod_autoscaling
}

kubernetes_dashboard {
disabled = ! var.kubernetes_dashboard
}

network_policy_config {
disabled = ! var.network_policy
}
Expand Down
2 changes: 0 additions & 2 deletions modules/beta-private-cluster-update-variant/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ locals {
cluster_output_network_policy_enabled = google_container_cluster.primary.addons_config.0.network_policy_config.0.disabled
cluster_output_http_load_balancing_enabled = google_container_cluster.primary.addons_config.0.http_load_balancing.0.disabled
cluster_output_horizontal_pod_autoscaling_enabled = google_container_cluster.primary.addons_config.0.horizontal_pod_autoscaling.0.disabled
cluster_output_kubernetes_dashboard_enabled = google_container_cluster.primary.addons_config.0.kubernetes_dashboard.0.disabled

# BETA features
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
Expand Down Expand Up @@ -125,7 +124,6 @@ locals {
cluster_network_policy_enabled = ! local.cluster_output_network_policy_enabled
cluster_http_load_balancing_enabled = ! local.cluster_output_http_load_balancing_enabled
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_output_horizontal_pod_autoscaling_enabled
cluster_kubernetes_dashboard_enabled = ! local.cluster_output_kubernetes_dashboard_enabled
# BETA features
cluster_istio_enabled = ! local.cluster_output_istio_disabled
cluster_cloudrun_enabled = var.cloudrun
Expand Down
5 changes: 0 additions & 5 deletions modules/beta-private-cluster-update-variant/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,6 @@ output "horizontal_pod_autoscaling_enabled" {
value = local.cluster_horizontal_pod_autoscaling_enabled
}

output "kubernetes_dashboard_enabled" {
description = "Whether kubernetes dashboard enabled"
value = local.cluster_kubernetes_dashboard_enabled
}

output "node_pools_names" {
description = "List of node pools names"
value = local.cluster_node_pools_names
Expand Down
4 changes: 0 additions & 4 deletions modules/beta-private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,6 @@ resource "google_container_cluster" "primary" {
disabled = ! var.horizontal_pod_autoscaling
}

kubernetes_dashboard {
disabled = ! var.kubernetes_dashboard
}

network_policy_config {
disabled = ! var.network_policy
}
Expand Down
2 changes: 0 additions & 2 deletions modules/beta-private-cluster/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ locals {
cluster_output_network_policy_enabled = google_container_cluster.primary.addons_config.0.network_policy_config.0.disabled
cluster_output_http_load_balancing_enabled = google_container_cluster.primary.addons_config.0.http_load_balancing.0.disabled
cluster_output_horizontal_pod_autoscaling_enabled = google_container_cluster.primary.addons_config.0.horizontal_pod_autoscaling.0.disabled
cluster_output_kubernetes_dashboard_enabled = google_container_cluster.primary.addons_config.0.kubernetes_dashboard.0.disabled

# BETA features
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
Expand Down Expand Up @@ -125,7 +124,6 @@ locals {
cluster_network_policy_enabled = ! local.cluster_output_network_policy_enabled
cluster_http_load_balancing_enabled = ! local.cluster_output_http_load_balancing_enabled
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_output_horizontal_pod_autoscaling_enabled
cluster_kubernetes_dashboard_enabled = ! local.cluster_output_kubernetes_dashboard_enabled
# BETA features
cluster_istio_enabled = ! local.cluster_output_istio_disabled
cluster_cloudrun_enabled = var.cloudrun
Expand Down
5 changes: 0 additions & 5 deletions modules/beta-private-cluster/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,6 @@ output "horizontal_pod_autoscaling_enabled" {
value = local.cluster_horizontal_pod_autoscaling_enabled
}

output "kubernetes_dashboard_enabled" {
description = "Whether kubernetes dashboard enabled"
value = local.cluster_kubernetes_dashboard_enabled
}

output "node_pools_names" {
description = "List of node pools names"
value = local.cluster_node_pools_names
Expand Down
4 changes: 0 additions & 4 deletions modules/beta-public-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,6 @@ resource "google_container_cluster" "primary" {
disabled = ! var.horizontal_pod_autoscaling
}

kubernetes_dashboard {
disabled = ! var.kubernetes_dashboard
}

network_policy_config {
disabled = ! var.network_policy
}
Expand Down
2 changes: 0 additions & 2 deletions modules/beta-public-cluster/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ locals {
cluster_output_network_policy_enabled = google_container_cluster.primary.addons_config.0.network_policy_config.0.disabled
cluster_output_http_load_balancing_enabled = google_container_cluster.primary.addons_config.0.http_load_balancing.0.disabled
cluster_output_horizontal_pod_autoscaling_enabled = google_container_cluster.primary.addons_config.0.horizontal_pod_autoscaling.0.disabled
cluster_output_kubernetes_dashboard_enabled = google_container_cluster.primary.addons_config.0.kubernetes_dashboard.0.disabled

# BETA features
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
Expand Down Expand Up @@ -125,7 +124,6 @@ locals {
cluster_network_policy_enabled = ! local.cluster_output_network_policy_enabled
cluster_http_load_balancing_enabled = ! local.cluster_output_http_load_balancing_enabled
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_output_horizontal_pod_autoscaling_enabled
cluster_kubernetes_dashboard_enabled = ! local.cluster_output_kubernetes_dashboard_enabled
# BETA features
cluster_istio_enabled = ! local.cluster_output_istio_disabled
cluster_cloudrun_enabled = var.cloudrun
Expand Down
5 changes: 0 additions & 5 deletions modules/beta-public-cluster/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,6 @@ output "horizontal_pod_autoscaling_enabled" {
value = local.cluster_horizontal_pod_autoscaling_enabled
}

output "kubernetes_dashboard_enabled" {
description = "Whether kubernetes dashboard enabled"
value = local.cluster_kubernetes_dashboard_enabled
}

output "node_pools_names" {
description = "List of node pools names"
value = local.cluster_node_pools_names
Expand Down
4 changes: 0 additions & 4 deletions modules/private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@ resource "google_container_cluster" "primary" {
disabled = ! var.horizontal_pod_autoscaling
}

kubernetes_dashboard {
disabled = ! var.kubernetes_dashboard
}

network_policy_config {
disabled = ! var.network_policy
}
Expand Down
2 changes: 0 additions & 2 deletions modules/private-cluster-update-variant/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ locals {
cluster_output_network_policy_enabled = google_container_cluster.primary.addons_config.0.network_policy_config.0.disabled
cluster_output_http_load_balancing_enabled = google_container_cluster.primary.addons_config.0.http_load_balancing.0.disabled
cluster_output_horizontal_pod_autoscaling_enabled = google_container_cluster.primary.addons_config.0.horizontal_pod_autoscaling.0.disabled
cluster_output_kubernetes_dashboard_enabled = google_container_cluster.primary.addons_config.0.kubernetes_dashboard.0.disabled


cluster_output_node_pools_names = concat(google_container_node_pool.pools.*.name, [""])
Expand All @@ -105,7 +104,6 @@ locals {
cluster_network_policy_enabled = ! local.cluster_output_network_policy_enabled
cluster_http_load_balancing_enabled = ! local.cluster_output_http_load_balancing_enabled
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_output_horizontal_pod_autoscaling_enabled
cluster_kubernetes_dashboard_enabled = ! local.cluster_output_kubernetes_dashboard_enabled
}

/******************************************
Expand Down
5 changes: 0 additions & 5 deletions modules/private-cluster-update-variant/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,6 @@ output "horizontal_pod_autoscaling_enabled" {
value = local.cluster_horizontal_pod_autoscaling_enabled
}

output "kubernetes_dashboard_enabled" {
description = "Whether kubernetes dashboard enabled"
value = local.cluster_kubernetes_dashboard_enabled
}

output "node_pools_names" {
description = "List of node pools names"
value = local.cluster_node_pools_names
Expand Down
4 changes: 0 additions & 4 deletions modules/private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@ resource "google_container_cluster" "primary" {
disabled = ! var.horizontal_pod_autoscaling
}

kubernetes_dashboard {
disabled = ! var.kubernetes_dashboard
}

network_policy_config {
disabled = ! var.network_policy
}
Expand Down
4 changes: 1 addition & 3 deletions modules/private-cluster/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ locals {
cluster_output_network_policy_enabled = google_container_cluster.primary.addons_config.0.network_policy_config.0.disabled
cluster_output_http_load_balancing_enabled = google_container_cluster.primary.addons_config.0.http_load_balancing.0.disabled
cluster_output_horizontal_pod_autoscaling_enabled = google_container_cluster.primary.addons_config.0.horizontal_pod_autoscaling.0.disabled
cluster_output_kubernetes_dashboard_enabled = google_container_cluster.primary.addons_config.0.kubernetes_dashboard.0.disabled



cluster_output_node_pools_names = concat(google_container_node_pool.pools.*.name, [""])
cluster_output_node_pools_versions = concat(google_container_node_pool.pools.*.version, [""])
Expand All @@ -105,7 +104,6 @@ locals {
cluster_network_policy_enabled = ! local.cluster_output_network_policy_enabled
cluster_http_load_balancing_enabled = ! local.cluster_output_http_load_balancing_enabled
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_output_horizontal_pod_autoscaling_enabled
cluster_kubernetes_dashboard_enabled = ! local.cluster_output_kubernetes_dashboard_enabled
}

/******************************************
Expand Down
5 changes: 0 additions & 5 deletions modules/private-cluster/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,6 @@ output "horizontal_pod_autoscaling_enabled" {
value = local.cluster_horizontal_pod_autoscaling_enabled
}

output "kubernetes_dashboard_enabled" {
description = "Whether kubernetes dashboard enabled"
value = local.cluster_kubernetes_dashboard_enabled
}

output "node_pools_names" {
description = "List of node pools names"
value = local.cluster_node_pools_names
Expand Down