msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

fix: use forceConflict field in install cmd

Browse Source 
Signed-off-by: Tarun Gupta Akirala <tarun.akirala@nutanix.com>
pull/32070/head
Tarun Gupta Akirala 6 months ago
parent 8f56f24d63
commit 95670111b3
No known key found for this signature in database
GPG Key ID: 7243E08CBD6DDF45
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File

2
pkg/action/install.go
Unescape View File

@ -518,7 +518,7 @@ func (i *Install) performInstall(rel *release.Release, toBeAdopted kube.Resource
if len(toBeAdopted) == 0 && len(resources) > 0 { if len(toBeAdopted) == 0 && len(resources) > 0 {
_, err = i.cfg.KubeClient.Create( _, err = i.cfg.KubeClient.Create(
resources, resources,
kube.ClientCreateOptionServerSideApply(i.ServerSideApply, false)) kube.ClientCreateOptionServerSideApply(i.ServerSideApply, i.ForceConflicts))
} else if len(resources) > 0 { } else if len(resources) > 0 {
updateThreeWayMergeForUnstructured := i.TakeOwnership && !i.ServerSideApply // Use three-way merge when taking ownership (and not using server-side apply) updateThreeWayMergeForUnstructured := i.TakeOwnership && !i.ServerSideApply // Use three-way merge when taking ownership (and not using server-side apply)
_, err = i.cfg.KubeClient.Update( _, err = i.cfg.KubeClient.Update(

Write Preview
Loading…
Cancel
Save