Skip to content

Commit d2f7586

Browse files
Add error checking to calls of nodePoolNodeConfigUpdate (#14706) (#23842)
[upstream:cb455a91dce164900a792e90db99c7033c38b0e7] Signed-off-by: Modular Magician <[email protected]>
1 parent aa4bb93 commit d2f7586

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

.changelog/14706.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
container: fixed an issue causing errors during updates to `node_config` to be suppressed in `google_container_cluster` and `google_container_node_pool`
3+
```

google/services/container/resource_container_cluster.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4167,7 +4167,9 @@ func resourceContainerClusterUpdate(d *schema.ResourceData, meta interface{}) er
41674167
return err
41684168
}
41694169

4170-
nodePoolNodeConfigUpdate(d, config, nodePoolInfo, "", defaultPool, d.Timeout(schema.TimeoutUpdate))
4170+
if err = nodePoolNodeConfigUpdate(d, config, nodePoolInfo, "", defaultPool, d.Timeout(schema.TimeoutUpdate)); err != nil {
4171+
return err
4172+
}
41714173
}
41724174

41734175
if d.HasChange("notification_config") {

google/services/container/resource_container_node_pool.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1428,7 +1428,9 @@ func nodePoolUpdate(d *schema.ResourceData, meta interface{}, nodePoolInfo *Node
14281428
}
14291429

14301430
if d.HasChange(prefix + "node_config") {
1431-
nodePoolNodeConfigUpdate(d, config, nodePoolInfo, prefix, name, timeout)
1431+
if err := nodePoolNodeConfigUpdate(d, config, nodePoolInfo, prefix, name, timeout); err != nil {
1432+
return err
1433+
}
14321434
}
14331435

14341436
if d.HasChange(prefix + "node_count") {

0 commit comments

Comments
 (0)