Skip to content

Commit f8a5cca

Browse files
wyardleywyardley
authored
fix: resolve deprecation warning for binary authorization (terraform-google-modules#1332)
enable_binary_authorization is now deprecated in favor of the binary_authorization block. This preserves the module's interface, but updates the underlying behavior Fixes terraform-google-modules#1331
1 parent 4bf0011 commit f8a5cca

File tree

11 files changed

+81
-25
lines changed

11 files changed

+81
-25
lines changed

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,14 @@ resource "google_container_cluster" "primary" {
151151
{% if autopilot_cluster != true %}
152152
default_max_pods_per_node = var.default_max_pods_per_node
153153
enable_shielded_nodes = var.enable_shielded_nodes
154-
enable_binary_authorization = var.enable_binary_authorization
154+
155+
dynamic "binary_authorization" {
156+
for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []
157+
content {
158+
evaluation_mode = "PROJECT_SINGLETON_POLICY_ENFORCE"
159+
}
160+
}
161+
155162
{% if beta_cluster %}
156163
enable_intranode_visibility = var.enable_intranode_visibility
157164
enable_kubernetes_alpha = var.enable_kubernetes_alpha

‎cluster.tf‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,16 @@ resource "google_container_cluster" "primary" {
7676
vertical_pod_autoscaling {
7777
enabled = var.enable_vertical_pod_autoscaling
7878
}
79-
default_max_pods_per_node = var.default_max_pods_per_node
80-
enable_shielded_nodes = var.enable_shielded_nodes
81-
enable_binary_authorization = var.enable_binary_authorization
79+
default_max_pods_per_node = var.default_max_pods_per_node
80+
enable_shielded_nodes = var.enable_shielded_nodes
81+
82+
dynamic "binary_authorization" {
83+
for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []
84+
content {
85+
evaluation_mode = "PROJECT_SINGLETON_POLICY_ENFORCE"
86+
}
87+
}
88+
8289
dynamic "master_authorized_networks_config" {
8390
for_each = local.master_authorized_networks_config
8491
content {

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,16 @@ resource "google_container_cluster" "primary" {
116116
vertical_pod_autoscaling {
117117
enabled = var.enable_vertical_pod_autoscaling
118118
}
119-
default_max_pods_per_node = var.default_max_pods_per_node
120-
enable_shielded_nodes = var.enable_shielded_nodes
121-
enable_binary_authorization = var.enable_binary_authorization
119+
default_max_pods_per_node = var.default_max_pods_per_node
120+
enable_shielded_nodes = var.enable_shielded_nodes
121+
122+
dynamic "binary_authorization" {
123+
for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []
124+
content {
125+
evaluation_mode = "PROJECT_SINGLETON_POLICY_ENFORCE"
126+
}
127+
}
128+
122129
enable_intranode_visibility = var.enable_intranode_visibility
123130
enable_kubernetes_alpha = var.enable_kubernetes_alpha
124131
enable_tpu = var.enable_tpu

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,16 @@ resource "google_container_cluster" "primary" {
116116
vertical_pod_autoscaling {
117117
enabled = var.enable_vertical_pod_autoscaling
118118
}
119-
default_max_pods_per_node = var.default_max_pods_per_node
120-
enable_shielded_nodes = var.enable_shielded_nodes
121-
enable_binary_authorization = var.enable_binary_authorization
119+
default_max_pods_per_node = var.default_max_pods_per_node
120+
enable_shielded_nodes = var.enable_shielded_nodes
121+
122+
dynamic "binary_authorization" {
123+
for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []
124+
content {
125+
evaluation_mode = "PROJECT_SINGLETON_POLICY_ENFORCE"
126+
}
127+
}
128+
122129
enable_intranode_visibility = var.enable_intranode_visibility
123130
enable_kubernetes_alpha = var.enable_kubernetes_alpha
124131
enable_tpu = var.enable_tpu

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,16 @@ resource "google_container_cluster" "primary" {
116116
vertical_pod_autoscaling {
117117
enabled = var.enable_vertical_pod_autoscaling
118118
}
119-
default_max_pods_per_node = var.default_max_pods_per_node
120-
enable_shielded_nodes = var.enable_shielded_nodes
121-
enable_binary_authorization = var.enable_binary_authorization
119+
default_max_pods_per_node = var.default_max_pods_per_node
120+
enable_shielded_nodes = var.enable_shielded_nodes
121+
122+
dynamic "binary_authorization" {
123+
for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []
124+
content {
125+
evaluation_mode = "PROJECT_SINGLETON_POLICY_ENFORCE"
126+
}
127+
}
128+
122129
enable_intranode_visibility = var.enable_intranode_visibility
123130
enable_kubernetes_alpha = var.enable_kubernetes_alpha
124131
enable_tpu = var.enable_tpu

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,16 @@ resource "google_container_cluster" "primary" {
116116
vertical_pod_autoscaling {
117117
enabled = var.enable_vertical_pod_autoscaling
118118
}
119-
default_max_pods_per_node = var.default_max_pods_per_node
120-
enable_shielded_nodes = var.enable_shielded_nodes
121-
enable_binary_authorization = var.enable_binary_authorization
119+
default_max_pods_per_node = var.default_max_pods_per_node
120+
enable_shielded_nodes = var.enable_shielded_nodes
121+
122+
dynamic "binary_authorization" {
123+
for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []
124+
content {
125+
evaluation_mode = "PROJECT_SINGLETON_POLICY_ENFORCE"
126+
}
127+
}
128+
122129
enable_intranode_visibility = var.enable_intranode_visibility
123130
enable_kubernetes_alpha = var.enable_kubernetes_alpha
124131
enable_tpu = var.enable_tpu

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,16 @@ resource "google_container_cluster" "primary" {
7676
vertical_pod_autoscaling {
7777
enabled = var.enable_vertical_pod_autoscaling
7878
}
79-
default_max_pods_per_node = var.default_max_pods_per_node
80-
enable_shielded_nodes = var.enable_shielded_nodes
81-
enable_binary_authorization = var.enable_binary_authorization
79+
default_max_pods_per_node = var.default_max_pods_per_node
80+
enable_shielded_nodes = var.enable_shielded_nodes
81+
82+
dynamic "binary_authorization" {
83+
for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []
84+
content {
85+
evaluation_mode = "PROJECT_SINGLETON_POLICY_ENFORCE"
86+
}
87+
}
88+
8289
dynamic "master_authorized_networks_config" {
8390
for_each = local.master_authorized_networks_config
8491
content {

‎modules/private-cluster/cluster.tf‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,16 @@ resource "google_container_cluster" "primary" {
7676
vertical_pod_autoscaling {
7777
enabled = var.enable_vertical_pod_autoscaling
7878
}
79-
default_max_pods_per_node = var.default_max_pods_per_node
80-
enable_shielded_nodes = var.enable_shielded_nodes
81-
enable_binary_authorization = var.enable_binary_authorization
79+
default_max_pods_per_node = var.default_max_pods_per_node
80+
enable_shielded_nodes = var.enable_shielded_nodes
81+
82+
dynamic "binary_authorization" {
83+
for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []
84+
content {
85+
evaluation_mode = "PROJECT_SINGLETON_POLICY_ENFORCE"
86+
}
87+
}
88+
8289
dynamic "master_authorized_networks_config" {
8390
for_each = local.master_authorized_networks_config
8491
content {

‎test/integration/beta_cluster/controls/gcloud.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181

8282
it "has the expected binaryAuthorization config" do
8383
expect(data['binaryAuthorization']).to eq({
84-
"enabled" => true,
84+
"evaluationMode" => "PROJECT_SINGLETON_POLICY_ENFORCE",
8585
})
8686
end
8787

‎test/integration/safer_cluster/controls/gcloud.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676

7777
it "has binary authorization" do
7878
expect(data['binaryAuthorization']).to eq({
79-
"enabled" => true,
79+
"evaluationMode" => "PROJECT_SINGLETON_POLICY_ENFORCE",
8080
})
8181
end
8282

0 commit comments

Comments
 (0)