Skip to content

Commit 52fedf6

Browse files
modular-magicianc2thorn
authored andcommitted
Container wording tweaks (#9135) (#6412)
Signed-off-by: Modular Magician <[email protected]>
1 parent 73b296f commit 52fedf6

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

.changelog/9135.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google-beta/services/container/resource_container_cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4029,7 +4029,7 @@ func resourceContainerClusterUpdate(d *schema.ResourceData, meta interface{}) er
40294029

40304030
func resourceContainerClusterDelete(d *schema.ResourceData, meta interface{}) error {
40314031
if d.Get("deletion_protection").(bool) {
4032-
return fmt.Errorf("Cannot destroy cluster because deletion_protection is set to true. Set it to false to proceed with instance deletion.")
4032+
return fmt.Errorf("Cannot destroy cluster because deletion_protection is set to true. Set it to false to proceed with cluster deletion.")
40334033
}
40344034
config := meta.(*transport_tpg.Config)
40354035
userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent)

website/docs/guides/version_5_upgrade.html.markdown

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -491,13 +491,15 @@ has a default value.
491491

492492
## Resource: `google_container_node_pool`
493493

494-
### `logging_variant` no longer has a provider default value
494+
### `management.auto_repair` and `management.auto_upgrade` now default to true
495495

496-
Previously `logging_variant` defaulted to "DEFAULT". It no longer has a default value.
496+
Previously both fields defaulted to false if `management` was set as an empty block.
497+
They now default to true.
497498

498-
### `management.auto_repair` and `management.auto_upgrade` now default to true
499+
### `logging_variant` no longer has a provider default value
499500

500-
Previously both fields defaulted to false. They now default to true.
501+
The provider no longer shows a default value at plan-time, and defers to the
502+
API server default.
501503

502504
### `node_config.0.taint` field change
503505

0 commit comments

Comments
 (0)