fix(upgrade): pass --server-side flag to install when using upgrade --install

When running `helm upgrade --install` on a non-existent release, the
--server-side flag was not being passed to the install action. This
caused the install to always use server-side apply (the default),
ignoring --server-side=false.

Copy ServerSideApply and ForceConflicts from the upgrade client to the
install client when falling back to install.

Fixes #31627

Signed-off-by: Evans Mungai <mbuevans@gmail.com>
pull/31635/head
Evans Mungai 4 weeks ago
parent 65f46d2298
commit 2dc581dc1c
No known key found for this signature in database
GPG Key ID: BBEB812143DD14E1

@ -153,6 +153,8 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
instClient.EnableDNS = client.EnableDNS
instClient.HideSecret = client.HideSecret
instClient.TakeOwnership = client.TakeOwnership
instClient.ForceConflicts = client.ForceConflicts
instClient.ServerSideApply = client.ServerSideApply != "false"
if isReleaseUninstalled(versions) {
instClient.Replace = true

@ -605,3 +605,58 @@ func TestUpgradeWithDryRun(t *testing.T) {
t.Error("expected error when --hide-secret used without --dry-run")
}
}
func TestUpgradeInstallServerSideApply(t *testing.T) {
_, _, chartPath := prepareMockRelease(t, "ssa-test")
defer resetEnv()()
tests := []struct {
name string
serverSideFlag string
expectedApplyMethod string
}{
{
name: "upgrade --install with --server-side=false uses client-side apply",
serverSideFlag: "--server-side=false",
expectedApplyMethod: "csa",
},
{
name: "upgrade --install with --server-side=true uses server-side apply",
serverSideFlag: "--server-side=true",
expectedApplyMethod: "ssa",
},
{
name: "upgrade --install with --server-side=auto uses server-side apply (default for new install)",
serverSideFlag: "--server-side=auto",
expectedApplyMethod: "ssa",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
store := storageFixture()
releaseName := fmt.Sprintf("ssa-test-%s", tt.expectedApplyMethod)
cmd := fmt.Sprintf("upgrade %s --install %s '%s'", releaseName, tt.serverSideFlag, chartPath)
_, _, err := executeActionCommandC(store, cmd)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
rel, err := store.Get(releaseName, 1)
if err != nil {
t.Fatalf("unexpected error getting release: %v", err)
}
relV1, err := releaserToV1Release(rel)
if err != nil {
t.Fatalf("unexpected error converting release: %v", err)
}
if relV1.ApplyMethod != tt.expectedApplyMethod {
t.Errorf("expected ApplyMethod %q, got %q", tt.expectedApplyMethod, relV1.ApplyMethod)
}
})
}
}

Loading…
Cancel
Save