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

Only set enabled bool if evaluation mode is unspecified #9629

Merged
merged 14 commits into from
Dec 20, 2023
Merged

Only set enabled bool if evaluation mode is unspecified #9629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2e1cf05
Only set enabled bool if evaluation mode is unspecified
rmoriar1 Dec 12, 2023
9cbb549
Only trigger one cluster update event if both both legacy and struc…
rmoriar1 Dec 12, 2023
12b3093
remove inadvertant modifications
rmoriar1 Dec 12, 2023
de2042f
Pass legacy bool to expandBinaryAuthorization fn
rmoriar1 Dec 12, 2023
2e806b9
move fn for diff readability
rmoriar1 Dec 12, 2023
2eacf68
reformat
rmoriar1 Dec 13, 2023
abf4033
reformat
rmoriar1 Dec 13, 2023
338a685
Only get enable_binary_authorization if its been changed
rmoriar1 Dec 13, 2023
823c25f
remove commas
rmoriar1 Dec 13, 2023
0d3ec84
fix logic
rmoriar1 Dec 13, 2023
e956c8a
Remove enable_binary_authorization condition
rmoriar1 Dec 18, 2023
d7d0d80
Add upgrade path docs
rmoriar1 Dec 18, 2023
a0bd234
Add comma
rmoriar1 Dec 18, 2023
ff5ebb8
Update mmv1/third_party/terraform/website/docs/guides/version_5_upgra…
melinath Dec 18, 2023
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
22 changes: 1 addition & 21 deletions mmv1/third_party/terraform/services/container/resource_container_cluster.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2988,26 +2988,6 @@ func resourceContainerClusterUpdate(d *schema.ResourceData, meta interface{}) er
log.Printf("[INFO] GKE cluster %s's autopilot workload policy config allow_net_admin has been set to %v", d.Id(), allowed)
}

if d.HasChange("enable_binary_authorization") {
enabled := d.Get("enable_binary_authorization").(bool)
req := &container.UpdateClusterRequest{
Update: &container.ClusterUpdate{
DesiredBinaryAuthorization: &container.BinaryAuthorization{
Enabled: enabled,
ForceSendFields: []string{"Enabled"},
},
},
}

updateF := updateFunc(req, "updating GKE binary authorization")
// Call update serially.
if err := transport_tpg.LockedCall(lockKey, updateF); err != nil {
return err
}

log.Printf("[INFO] GKE cluster %s's binary authorization has been updated to %v", d.Id(), enabled)
}

if d.HasChange("private_cluster_config.0.enable_private_endpoint") {
enabled := d.Get("private_cluster_config.0.enable_private_endpoint").(bool)
req := &container.UpdateClusterRequest{
Expand Down Expand Up @@ -3046,7 +3026,7 @@ func resourceContainerClusterUpdate(d *schema.ResourceData, meta interface{}) er
log.Printf("[INFO] GKE cluster %s's master global access config has been updated to %v", d.Id(), config)
}

if d.HasChange("binary_authorization") {
if d.HasChange("binary_authorization") {
req := &container.UpdateClusterRequest{
Update: &container.ClusterUpdate{
DesiredBinaryAuthorization: expandBinaryAuthorization(d.Get("binary_authorization")),
Expand Down
10 changes: 9 additions & 1 deletion mmv1/third_party/terraform/website/docs/guides/version_5_upgrade.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,15 @@ resource "google_container_cluster" "primary" {

### `enable_binary_authorization` is now removed

`enable_binary_authorization` has been removed in favor of `binary_authorization.enabled`.
`enable_binary_authorization` has been removed in favor of `binary_authorization.evaluation_mode`.
To enable Binary Authorization, set evaluation mode to "PROJECT_SINGLETON_POLICY_ENFORCE"
as shown in the example below. To disable it, set evaluation mode to "DISABLED".

```
binary_authorization {
evaluation_mode = "PROJECT_SINGLETON_POLICY_ENFORCE"
}
```

### Default value of `network_policy.provider` is now removed

Expand Down