Skip to content

Commit

Permalink
docs: add description for --force-conflicts option to upgrade crds (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
kurokobo authored Feb 21, 2024
1 parent fc11db4 commit 7bdf48f
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions .helm/starter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,29 @@ When upgrading to releases with CRD changes use the following command to update
kubectl apply --server-side -k github.com/ansible/awx-operator/config/crd?ref=<VERSION>
```

If running above command results in an error like below:

```text
Apply failed with 1 conflict: conflict with "helm" using apiextensions.k8s.io/v1: .spec.versions
Please review the fields above--they currently have other managers. Here
are the ways you can resolve this warning:
* If you intend to manage all of these fields, please re-run the apply
command with the `--force-conflicts` flag.
* If you do not intend to manage all of the fields, please edit your
manifest to remove references to the fields that should keep their
current managers.
* You may co-own fields by updating your manifest to match the existing
value; in this case, you'll become the manager if the other manager(s)
stop managing the field (remove it from their configuration).
See https://kubernetes.io/docs/reference/using-api/server-side-apply/#conflicts
```

Use `--force-conflicts` flag to resolve the conflict.

```bash
kubectl apply --server-side --force-conflicts -k github.com/ansible/awx-operator/config/crd?ref=<VERSION>
```

## Configuration
The goal of adding helm configurations is to abstract out and simplify the creation of multi-resource configs. The `AWX.spec` field maps directly to the spec configs of the `AWX` resource that the operator provides, which are detailed in the [main README](https://github.com/ansible/awx-operator/blob/devel/README.md). Other sub-config can be added with the goal of simplifying more involved setups that require additional resources to be specified.

Expand Down

0 comments on commit 7bdf48f

Please # to comment.