add nil handling fo GcpPublicCidrsAccessEnabled

yuecong · yuecong · commit 4b5ebde033cd · 2023-08-29T10:40:42.000-07:00
diff --git a/cloud/services/container/clusters/reconcile.go b/cloud/services/container/clusters/reconcile.go
@@ -406,7 +406,10 @@ func compareMasterAuthorizedNetworksConfig(a, b *containerpb.MasterAuthorizedNet
 	if a.Enabled != b.Enabled {
 		return false
 	}
-	if *a.GcpPublicCidrsAccessEnabled != *b.GcpPublicCidrsAccessEnabled {
+	if (a.GcpPublicCidrsAccessEnabled == nil && b.GcpPublicCidrsAccessEnabled != nil) || (a.GcpPublicCidrsAccessEnabled != nil && b.GcpPublicCidrsAccessEnabled == nil) {
+		return false
+	}
+	if a.GcpPublicCidrsAccessEnabled != nil && b.GcpPublicCidrsAccessEnabled != nil && *a.GcpPublicCidrsAccessEnabled != *b.GcpPublicCidrsAccessEnabled {
 		return false
 	}
 	// if one cidrBlocks is nil, but the other is empty, they are equal.

Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,10 @@ func compareMasterAuthorizedNetworksConfig(a, b *containerpb.MasterAuthorizedNet`
`406`	`406`	`if a.Enabled != b.Enabled {`
`407`	`407`	`return false`
`408`	`408`	`}`
`409`		`- if a.GcpPublicCidrsAccessEnabled != b.GcpPublicCidrsAccessEnabled {`
	`409`	`+ if (a.GcpPublicCidrsAccessEnabled == nil && b.GcpPublicCidrsAccessEnabled != nil) \|\| (a.GcpPublicCidrsAccessEnabled != nil && b.GcpPublicCidrsAccessEnabled == nil) {`
	`410`	`+ return false`
	`411`	`+ }`
	`412`	`+ if a.GcpPublicCidrsAccessEnabled != nil && b.GcpPublicCidrsAccessEnabled != nil && a.GcpPublicCidrsAccessEnabled != b.GcpPublicCidrsAccessEnabled {`
`410`	`413`	`return false`
`411`	`414`	`}`
`412`	`415`	`// if one cidrBlocks is nil, but the other is empty, they are equal.`