Merge pull request #7230 from walidghallab/fix-bugs

k8s-ci-robot · web-flow · commit d3cbc10c6b02 · 2024-09-02T14:20:57.000+01:00
Fix nil pointer check in nodegroup_manager.go
diff --git a/cluster-autoscaler/processors/nodegroups/nodegroup_manager.go b/cluster-autoscaler/processors/nodegroups/nodegroup_manager.go
@@ -74,7 +74,7 @@ type CreateNodeGroupResult struct {
 // AllCreatedNodeGroups returns all created node groups.
 func (r CreateNodeGroupResult) AllCreatedNodeGroups() []cloudprovider.NodeGroup {
 	var result []cloudprovider.NodeGroup
-	if r.MainCreatedNodeGroup != nil || !reflect.ValueOf(r.MainCreatedNodeGroup).IsNil() {
+	if r.MainCreatedNodeGroup != nil && !reflect.ValueOf(r.MainCreatedNodeGroup).IsNil() {
 		result = append(result, r.MainCreatedNodeGroup)
 	}
 	result = append(result, r.ExtraCreatedNodeGroups...)

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ type CreateNodeGroupResult struct {`
`74`	`74`	`// AllCreatedNodeGroups returns all created node groups.`
`75`	`75`	`func (r CreateNodeGroupResult) AllCreatedNodeGroups() []cloudprovider.NodeGroup {`
`76`	`76`	`var result []cloudprovider.NodeGroup`
`77`		`- if r.MainCreatedNodeGroup != nil \|\| !reflect.ValueOf(r.MainCreatedNodeGroup).IsNil() {`
	`77`	`+ if r.MainCreatedNodeGroup != nil && !reflect.ValueOf(r.MainCreatedNodeGroup).IsNil() {`
`78`	`78`	`result = append(result, r.MainCreatedNodeGroup)`
`79`	`79`	`}`
`80`	`80`	`result = append(result, r.ExtraCreatedNodeGroups...)`