Skip to content

Remove release channel UNSPECIFIED diff suppress #4554

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

Merged
c2thorn merged 2 commits into from
Mar 3, 2021
Merged

Remove release channel UNSPECIFIED diff suppress #4554

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e13a241
Remove release channel UNSPECIFIED diff suppress
c2thorn Mar 2, 2021
37b5d50
Fix TestAccContainerNodePool_withManagement
c2thorn Mar 2, 2021
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
5 changes: 2 additions & 3 deletions mmv1/third_party/terraform/resources/resource_container_cluster.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,6 @@ func resourceContainerCluster() *schema.Resource {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{"UNSPECIFIED", "RAPID", "REGULAR", "STABLE"}, false),
DiffSuppressFunc: emptyOrDefaultStringSuppress("UNSPECIFIED"),
Description: `The selected release channel. Accepted values are:
* UNSPECIFIED: Not set.
* RAPID: Weekly upgrade cadence; Early testers and developers who requires new features.
Expand Down Expand Up @@ -3514,12 +3513,12 @@ func flattenVerticalPodAutoscaling(c *containerBeta.VerticalPodAutoscaling) []ma

func flattenReleaseChannel(c *containerBeta.ReleaseChannel) []map[string]interface{} {
result := []map[string]interface{}{}
if c != nil {
if c != nil && c.Channel != "" {
result = append(result, map[string]interface{}{
"channel": c.Channel,
})
} else {
// Explicitly set the release channel to the default.
// Explicitly set the release channel to the UNSPECIFIED.
result = append(result, map[string]interface{}{
"channel": "UNSPECIFIED",
})
Expand Down