Skip to content

Commit 54bc868

Browse files
committed
fix!: remove istio and kalm
1 parent 823d621 commit 54bc868

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+318
-694
lines changed

autogen/main/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ module "gke" {
9292
enable_private_nodes = true
9393
{% endif %}
9494
{% if beta_cluster and autopilot_cluster != true %}
95-
istio = true
9695
cloudrun = true
9796
{% endif %}
9897
dns_cache = false

autogen/main/cluster.tf.tmpl

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -501,22 +501,13 @@ resource "google_container_cluster" "primary" {
501501
{% endif %}
502502

503503
{% if beta_cluster and autopilot_cluster != true %}
504-
istio_config {
505-
disabled = !var.istio
506-
auth = var.istio_auth
507-
}
508-
509504
dynamic "cloudrun_config" {
510505
for_each = local.cluster_cloudrun_config
511506

512507
content {
513508
disabled = cloudrun_config.value.disabled
514509
}
515510
}
516-
517-
kalm_config {
518-
enabled = var.kalm_config
519-
}
520511
{% endif %}
521512
}
522513
{% if autopilot_cluster %}

autogen/main/main.tf.tmpl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ locals {
176176

177177
{% if beta_cluster %}
178178
# BETA features
179-
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
180179
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
181180

182181
# /BETA features
@@ -239,7 +238,6 @@ locals {
239238

240239
{% if beta_cluster %}
241240
# BETA features
242-
cluster_istio_enabled = !local.cluster_output_istio_disabled
243241
{% if autopilot_cluster != true %}
244242
cluster_telemetry_type_is_set = var.cluster_telemetry_type != null
245243
{% endif %}

autogen/main/outputs.tf.tmpl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,6 @@ output "cloudrun_enabled" {
230230
{% endif %}
231231
}
232232

233-
output "istio_enabled" {
234-
description = "Whether Istio is enabled"
235-
value = local.cluster_istio_enabled
236-
}
237-
238233
output "pod_security_policy_enabled" {
239234
description = "Whether pod security policy is enabled"
240235
value = local.cluster_pod_security_policy_enabled

autogen/main/variables.tf.tmpl

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,24 +1122,6 @@ variable "enable_multi_networking" {
11221122
{% if beta_cluster %}
11231123
{% if autopilot_cluster != true %}
11241124

1125-
variable "istio" {
1126-
description = "(Beta) Enable Istio addon"
1127-
type = bool
1128-
default = false
1129-
}
1130-
1131-
variable "istio_auth" {
1132-
type = string
1133-
description = "(Beta) The authentication type between services in Istio."
1134-
default = "AUTH_MUTUAL_TLS"
1135-
}
1136-
1137-
variable "kalm_config" {
1138-
type = bool
1139-
description = "(Beta) Whether KALM is enabled for this cluster."
1140-
default = false
1141-
}
1142-
11431125
variable "cloudrun" {
11441126
description = "(Beta) Enable CloudRun addon"
11451127
type = bool

autogen/safer-cluster/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ are available for configuration, recommendations on their settings are documente
3131

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

3737
- We suggest to store user or business data persistently in managed storage
3838
services that are inventoried and controlled by centralized teams.

autogen/safer-cluster/main.tf.tmpl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,6 @@ module "gke" {
150150

151151
master_ipv4_cidr_block = var.master_ipv4_cidr_block
152152

153-
// Istio is recommended for pod-to-pod communications.
154-
istio = var.istio
155-
istio_auth = var.istio_auth
156-
157153
cloudrun = var.cloudrun
158154

159155
dns_cache = var.dns_cache

autogen/safer-cluster/variables.tf.tmpl

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -323,18 +323,6 @@ variable "master_ipv4_cidr_block" {
323323
default = "10.0.0.0/28"
324324
}
325325

326-
variable "istio" {
327-
description = "(Beta) Enable Istio addon"
328-
type = bool
329-
default = false
330-
}
331-
332-
variable "istio_auth" {
333-
type = string
334-
description = "(Beta) The authentication type between services in Istio."
335-
default = "AUTH_MUTUAL_TLS"
336-
}
337-
338326
variable "dns_cache" {
339327
type = bool
340328
description = "(Beta) The status of the NodeLocal DNSCache addon."

docs/upgrading_to_v43.0.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Upgrading to v43.0
2+
The v43.0 release of *kubernetes-engine* is a backwards incompatible release.
3+
4+
## Migration Guide
5+
6+
### `kalm_config` Removal
7+
8+
The `kalm_config` variable has been removed.
9+
10+
Users currently including `kalm_config` should remove this variable from their module definition.
11+
12+
### `istio_config` Removal
13+
14+
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.
15+
16+
Users currently using the GKE Istio addon should migrate to Anthos Service Mesh (ASM) or another service mesh solution.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ Then perform the following commands on the root folder:
194194
| identity\_namespace | Workload Identity pool |
195195
| identity\_service\_enabled | Whether Identity Service is enabled |
196196
| intranode\_visibility\_enabled | Whether intra-node visibility is enabled |
197-
| istio\_enabled | Whether Istio is enabled |
198197
| location | Cluster location (region if regional cluster, zone if zonal cluster) |
199198
| logging\_service | Logging service used |
200199
| master\_authorized\_networks\_config | Networks from which access to master is permitted |

0 commit comments

Comments
 (0)