updated documentation and code to reflect kubebuilder behavior

edmondceausu · edmondceausu · commit ad6a827948b7 · 2025-06-16T10:47:58.000Z
diff --git a/pkg/cloud/services/eks/addons.go b/pkg/cloud/services/eks/addons.go
@@ -235,8 +235,13 @@ func convertConflictResolution(conflict ekscontrolplanev1.AddonResolution) (*str
 	case ekscontrolplanev1.AddonResolutionPreserve:
 		return aws.String(string(ekstypes.ResolveConflictsPreserve)), nil
 
+	// Defaulting to behavior "Overwrite" as documented
 	default:
+<<<<<<< HEAD
 		return aws.String(string(ekstypes.ResolveConflictsOverwrite)), fmt.Errorf("failed to determine adddonResolution; defaulting to Overwrite")
+=======
+		return aws.String(eks.ResolveConflictsOverwrite), fmt.Errorf("failed to determine adddonResolution; defaulting to Overwrite")
+>>>>>>> 820ee8734 (updated documentation and code to reflect kubebuilder behavior)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -235,8 +235,13 @@ func convertConflictResolution(conflict ekscontrolplanev1.AddonResolution) (*str`
`235`	`235`	`case ekscontrolplanev1.AddonResolutionPreserve:`
`236`	`236`	`return aws.String(string(ekstypes.ResolveConflictsPreserve)), nil`
`237`	`237`
	`238`	`+ // Defaulting to behavior "Overwrite" as documented`
`238`	`239`	`default:`
	`240`	`+<<<<<<< HEAD`
`239`	`241`	`return aws.String(string(ekstypes.ResolveConflictsOverwrite)), fmt.Errorf("failed to determine adddonResolution; defaulting to Overwrite")`
	`242`	`+=======`
	`243`	`+ return aws.String(eks.ResolveConflictsOverwrite), fmt.Errorf("failed to determine adddonResolution; defaulting to Overwrite")`
	`244`	`+>>>>>>> 820ee8734 (updated documentation and code to reflect kubebuilder behavior)`
`240`	`245`	`}`
`241`	`246`	`}`
`242`	`247`