Commit b96f8c0
authored
fix: add --force-conflicts to helm deploy to resolve server-side apply ownership conflicts (#1667)
Helm 4 uses server-side apply which fails when fields were previously
modified by kubectl-edit. Adding --force-conflicts allows Helm to take
ownership of conflicting fields.1 parent bd57777 commit b96f8c0
1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
124 | | - | |
| 124 | + | |
125 | 125 | | |
126 | 126 | | |
127 | 127 | | |
| |||
0 commit comments