Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix panic in helm release update() #1948

Merged
merged 2 commits into from Mar 31, 2022
Merged

Fix panic in helm release update() #1948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45497a6
Fix panic in helm release update()
viveklak Mar 31, 2022
1fb45c1
Changelog
viveklak Mar 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
@@ -1,5 +1,6 @@
## Unreleased
- Pass provider options to helm invokes in Python, Go and TS (https://github.com/pulumi/pulumi-kubernetes/pull/1919)
- Fix panic in helm release update() (https://github.com/pulumi/pulumi-kubernetes/pull/1948)

## 3.17.0 (March 14, 2022)
- Make ConfigMaps mutable unless marked explicitly (enabled with provider config option) (https://github.com/pulumi/pulumi-kubernetes/pull/1926)
Expand Down
15 changes: 9 additions & 6 deletions provider/pkg/provider/helm_release.go
View file
Open in desktop
Expand Up @@ -26,9 +26,6 @@ import (
"strings"
"time"

"helm.sh/helm/v3/pkg/registry"
"helm.sh/helm/v3/pkg/repo"

jsonpatch "github.com/evanphx/json-patch"
"github.com/golang/protobuf/ptypes/empty"
pbempty "github.com/golang/protobuf/ptypes/empty"
Expand All @@ -52,7 +49,10 @@ import (
"helm.sh/helm/v3/pkg/downloader"
"helm.sh/helm/v3/pkg/getter"
"helm.sh/helm/v3/pkg/postrender"
"helm.sh/helm/v3/pkg/registry"
"helm.sh/helm/v3/pkg/release"
"helm.sh/helm/v3/pkg/repo"
"helm.sh/helm/v3/pkg/storage/driver"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/tools/clientcmd/api"
Expand Down Expand Up @@ -580,11 +580,14 @@ func (r *helmReleaseProvider) helmUpdate(newRelease, oldRelease *Release) error
}

rel, err := client.Run(newRelease.Name, chart, values)
if err != nil && strings.Contains(err.Error(), "has no deployed releases") {
if err != nil && rel == nil {
return err
}
if err != nil && errors.Is(err, driver.ErrNoDeployedReleases) {
logger.V(9).Infof("No existing release found.")
return err
} else if err != nil {
// Don't expect this to fail
}
if err != nil {
if err := setReleaseAttributes(newRelease, rel, false); err != nil {
return err
}
Expand Down