Skip to content

Commit b599143

Browse files
committed
updated documentation to reflect openAPIV3Schema default behavior
1 parent ae8174e commit b599143

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

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

+11-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,15 @@ spec:
2323
conflictResolution: "overwrite"
2424
```
2525
26-
_Note_: For `conflictResolution` `overwrite` is the **default** behaviour. That means, if not otherwise specified, it's
27-
set to `overwrite`.
26+
Valid values are:
27+
```
28+
none
29+
overwrite
30+
preserve
31+
```
32+
33+
_Note_: For `conflictResolution` `none` is the **default** behaviour. That means, if not otherwise specified, it's
34+
set to `none`. Review [API Documentation](https://docs.aws.amazon.com/eks/latest/APIReference/API_CreateAddon.html#AmazonEKS-CreateAddon-request-resolveConflicts) for detailed behavior.
2835

2936
Additionally, there is a cluster [flavor](https://cluster-api.sigs.k8s.io/clusterctl/commands/generate-cluster.html#flavors)
3037
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**:
@@ -46,6 +53,8 @@ To update the version of an addon you need to edit the `AWSManagedControlPlane`
4653
...
4754
```
4855

56+
_Note_: For `conflictResolution` `none`, updating may fail if a change was made to the addon that is unexpected by EKS. Review [API Documentation](https://docs.aws.amazon.com/eks/latest/APIReference/API_UpdateAddon.html#AmazonEKS-UpdateAddon-request-resolveConflicts) for detailed behavior on conflict resolution.
57+
4958
## Deleting Addons
5059

5160
To delete an addon from a cluster you need to edit the `AWSManagedControlPlane` instance and remove the entry for the addon you want to delete.

0 commit comments

Comments
 (0)