Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion autogen/main/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ module "gke" {
enable_private_nodes = true
{% endif %}
{% if beta_cluster and autopilot_cluster != true %}
istio = true
cloudrun = true
{% endif %}
dns_cache = false
Expand Down
9 changes: 0 additions & 9 deletions autogen/main/cluster.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -501,22 +501,13 @@ resource "google_container_cluster" "primary" {
{% endif %}

{% if beta_cluster and autopilot_cluster != true %}
istio_config {
disabled = !var.istio
auth = var.istio_auth
}

dynamic "cloudrun_config" {
for_each = local.cluster_cloudrun_config

content {
disabled = cloudrun_config.value.disabled
}
}

kalm_config {
enabled = var.kalm_config
}
{% endif %}
}
{% if autopilot_cluster %}
Expand Down
2 changes: 0 additions & 2 deletions autogen/main/main.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ locals {

{% if beta_cluster %}
# 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
cluster_output_pod_security_policy_enabled = google_container_cluster.primary.pod_security_policy_config != null && length(google_container_cluster.primary.pod_security_policy_config) == 1 ? google_container_cluster.primary.pod_security_policy_config[0].enabled : false

# /BETA features
Expand Down Expand Up @@ -239,7 +238,6 @@ locals {

{% if beta_cluster %}
# BETA features
cluster_istio_enabled = !local.cluster_output_istio_disabled
{% if autopilot_cluster != true %}
cluster_telemetry_type_is_set = var.cluster_telemetry_type != null
{% endif %}
Expand Down
5 changes: 0 additions & 5 deletions autogen/main/outputs.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,6 @@ output "cloudrun_enabled" {
{% endif %}
}

output "istio_enabled" {
description = "Whether Istio is enabled"
value = local.cluster_istio_enabled
}

output "pod_security_policy_enabled" {
description = "Whether pod security policy is enabled"
value = local.cluster_pod_security_policy_enabled
Expand Down
18 changes: 0 additions & 18 deletions autogen/main/variables.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -1122,24 +1122,6 @@ variable "enable_multi_networking" {
{% if beta_cluster %}
{% if autopilot_cluster != true %}

variable "istio" {
description = "(Beta) Enable Istio addon"
type = bool
default = false
}

variable "istio_auth" {
type = string
description = "(Beta) The authentication type between services in Istio."
default = "AUTH_MUTUAL_TLS"
}

variable "kalm_config" {
type = bool
description = "(Beta) Whether KALM is enabled for this cluster."
default = false
}

variable "cloudrun" {
description = "(Beta) Enable CloudRun addon"
type = bool
Expand Down
4 changes: 2 additions & 2 deletions autogen/safer-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ are available for configuration, recommendations on their settings are documente

- Placing them in the same cluster will provide fast network
communication, and the different namespaces will be configured to
provide some administrative isolation. Istio will be used to encrypt and
control communication between applications.
provide some administrative isolation. Cloud Service Mesh can be used to
encrypt and control communication between applications.

- We suggest to store user or business data persistently in managed storage
services that are inventoried and controlled by centralized teams.
Expand Down
4 changes: 0 additions & 4 deletions autogen/safer-cluster/main.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,6 @@ module "gke" {

master_ipv4_cidr_block = var.master_ipv4_cidr_block

// Istio is recommended for pod-to-pod communications.
istio = var.istio
istio_auth = var.istio_auth

cloudrun = var.cloudrun

dns_cache = var.dns_cache
Expand Down
12 changes: 0 additions & 12 deletions autogen/safer-cluster/variables.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -323,18 +323,6 @@ variable "master_ipv4_cidr_block" {
default = "10.0.0.0/28"
}

variable "istio" {
description = "(Beta) Enable Istio addon"
type = bool
default = false
}

variable "istio_auth" {
type = string
description = "(Beta) The authentication type between services in Istio."
default = "AUTH_MUTUAL_TLS"
}

variable "dns_cache" {
type = bool
description = "(Beta) The status of the NodeLocal DNSCache addon."
Expand Down
16 changes: 16 additions & 0 deletions docs/upgrading_to_v43.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Upgrading to v43.0
The v43.0 release of *kubernetes-engine* is a backwards incompatible release.

## Migration Guide

### `kalm_config` Removal

The `kalm_config` variable has been removed.

Users currently including `kalm_config` should remove this variable from their module definition.

### `istio_config` Removal

The `istio` and `istio_auth` variables have been removed. The `istio_enabled` output has also been removed from these modules and the autopilot beta modules.

Users currently using the GKE Istio addon should migrate to Anthos Service Mesh (ASM) or another service mesh solution.
2 changes: 1 addition & 1 deletion examples/acm-terraform-blog-part1/terraform/gke.tf
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module "enabled_google_apis" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google"
version = "~> 41.0"
version = "~> 42.0"
project_id = module.enabled_google_apis.project_id
name = "sfl-acm-part1"
region = var.region
Expand Down
2 changes: 1 addition & 1 deletion examples/acm-terraform-blog-part2/terraform/gke.tf
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module "enabled_google_apis" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google"
version = "~> 41.0"
version = "~> 42.0"
project_id = module.enabled_google_apis.project_id
name = "sfl-acm-part2"
region = var.region
Expand Down
4 changes: 2 additions & 2 deletions examples/acm-terraform-blog-part3/terraform/gke.tf
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module "enabled_google_apis" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster"
version = "~> 41.0"
version = "~> 42.0"
project_id = module.enabled_google_apis.project_id
name = "sfl-acm-part3"
region = var.region
Expand All @@ -48,7 +48,7 @@ module "gke" {

module "wi" {
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
version = "~> 41.0"
version = "~> 42.0"
gcp_sa_name = "cnrmsa"
cluster_name = module.gke.name
name = "cnrm-controller-manager"
Expand Down
2 changes: 1 addition & 1 deletion examples/autopilot_private_firewalls/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ provider "kubernetes" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "${local.cluster_type}-cluster"
Expand Down
2 changes: 1 addition & 1 deletion examples/confidential_autopilot_private/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ resource "google_kms_crypto_key_iam_member" "main" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "${local.cluster_type}-cluster"
Expand Down
2 changes: 1 addition & 1 deletion examples/confidential_safer_cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ resource "google_kms_crypto_key_iam_member" "main" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/safer-cluster"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "${local.cluster_type}-cluster-${random_string.suffix.result}"
Expand Down
2 changes: 1 addition & 1 deletion examples/deploy_service/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ provider "kubernetes" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
Expand Down
2 changes: 1 addition & 1 deletion examples/disable_client_cert/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ provider "kubernetes" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
Expand Down
2 changes: 1 addition & 1 deletion examples/gke_autopilot_cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ provider "kubernetes" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/gke-autopilot-cluster"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "${local.cluster_type}-cluster"
Expand Down
4 changes: 2 additions & 2 deletions examples/gke_standard_cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ data "google_compute_subnetwork" "subnetwork" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/gke-standard-cluster"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
Expand Down Expand Up @@ -85,7 +85,7 @@ module "gke" {

module "node_pool" {
source = "terraform-google-modules/kubernetes-engine/google//modules/gke-node-pool"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
location = var.region
Expand Down
2 changes: 1 addition & 1 deletion examples/island_cluster_anywhere_in_gcp_design/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ resource "google_service_account" "gke-sa" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-private-cluster"
version = "~> 41.0"
version = "~> 42.0"

for_each = { for k, v in var.gke_spokes : k => v }

Expand Down
2 changes: 1 addition & 1 deletion examples/island_cluster_with_vm_router/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ module "net" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-private-cluster"
version = "~> 41.0"
version = "~> 42.0"

depends_on = [google_compute_instance.vm]

Expand Down
2 changes: 1 addition & 1 deletion examples/node_pool/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ resource "google_tags_tag_value" "value" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
Expand Down
2 changes: 1 addition & 1 deletion examples/node_pool_update_variant/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ provider "kubernetes" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster-update-variant"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
Expand Down
2 changes: 1 addition & 1 deletion examples/node_pool_update_variant_beta/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ provider "kubernetes" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-private-cluster-update-variant"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
Expand Down
2 changes: 1 addition & 1 deletion examples/node_pool_update_variant_public_beta/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ provider "kubernetes" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster-update-variant"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
Expand Down
2 changes: 1 addition & 1 deletion examples/private_zonal_with_networking/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ data "google_compute_subnetwork" "subnetwork" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = var.cluster_name
Expand Down
2 changes: 1 addition & 1 deletion examples/regional_private_node_pool_oauth_scopes/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "random-test-cluster"
Expand Down
2 changes: 1 addition & 1 deletion examples/safer_cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ resource "random_shuffle" "version" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/safer-cluster"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "${local.cluster_type}-cluster-${random_string.suffix.result}"
Expand Down
2 changes: 1 addition & 1 deletion examples/safer_cluster_iap_bastion/cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/safer-cluster"
version = "~> 41.0"
version = "~> 42.0"

project_id = module.enabled_google_apis.project_id
name = var.cluster_name
Expand Down
2 changes: 1 addition & 1 deletion examples/shared_vpc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ provider "kubernetes" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_autopilot_private/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ provider "kubernetes" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "${local.cluster_type}-cluster"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_autopilot_private_cmek/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ provider "kubernetes" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "${local.cluster_type}-cluster"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_autopilot_private_non_default_sa/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ provider "kubernetes" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "${local.cluster_type}-cluster"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_autopilot_public/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ provider "kubernetes" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-public-cluster"
version = "~> 41.0"
version = "~> 42.0"

project_id = var.project_id
name = "${local.cluster_type}-cluster"
Expand Down
Loading