updated documentation and code to reflect kubebuilder behavior

Author: edmondceausu

docs/book/src/topics/eks/addons.md

@@ -30,8 +30,8 @@ overwrite
 preserve
 ```
 
-_Note_: For `conflictResolution` `none` is the **default** behaviour. That means, if not otherwise specified, it's
-set to `none`. Review [API Documentation](https://docs.aws.amazon.com/eks/latest/APIReference/API_CreateAddon.html#AmazonEKS-CreateAddon-request-resolveConflicts) for detailed behavior.
+_Note_: For `conflictResolution` `overwrite` is the **default** behaviour. That means, if not otherwise specified, it's
+set to `overwrite`. Review [API Documentation](https://docs.aws.amazon.com/eks/latest/APIReference/API_CreateAddon.html#AmazonEKS-CreateAddon-request-resolveConflicts) for detailed behavior.
 
 Additionally, there is a cluster [flavor](https://cluster-api.sigs.k8s.io/clusterctl/commands/generate-cluster.html#flavors)
 called [eks-managedmachinepool-vpccni](https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/templates/cluster-template-eks-managedmachinepool-vpccni.yaml) that you can use with **clusterctl**:

pkg/cloud/services/eks/addons.go

@@ -224,7 +224,8 @@ func convertConflictResolution(conflict ekscontrolplanev1.AddonResolution) (*str
 	case ekscontrolplanev1.AddonResolutionPreserve:
 		return aws.String(eks.ResolveConflictsPreserve), nil
 
+	// Defaulting to behavior "Overwrite" as documented
 	default:
-		return aws.String(eks.ResolveConflictsNone), fmt.Errorf("failed to determine adddonResolution; defaulting to None")
+		return aws.String(eks.ResolveConflictsOverwrite), fmt.Errorf("failed to determine adddonResolution; defaulting to Overwrite")
 	}
 }