Skip to content

H
helm3
Commit b42f0675 authored by Matt Butcher's avatar Matt Butcher Committed by GitHub
Browse files
Options

Merge pull request #1392 from technosophos/fix/1374-accessing-nil-obj-in-error 

fix(tiller): fix nil pointers in error messages
parents d744a3d0 a1f5955a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/storage/driver/cfgmaps.go
View file @ b42f0675
...@@ -100,7 +100,7 @@ func (cfgmaps *ConfigMaps) List(filter func(*rspb.Release) bool) ([]*rspb.Releas ...@@ -100,7 +100,7 @@ func (cfgmaps *ConfigMaps) List(filter func(*rspb.Release) bool) ([]*rspb.Releas
for _, item := range list.Items { for _, item := range list.Items {
rls, err := decodeRelease(item.Data["release"]) rls, err := decodeRelease(item.Data["release"])
if err != nil { if err != nil {
logerrf(err, "list: failed to decode release: %s", rls) logerrf(err, "list: failed to decode release: %v", item)
continue continue
} }
if filter(rls) { if filter(rls) {
...@@ -201,7 +201,7 @@ func (cfgmaps *ConfigMaps) Delete(key string) (rls *rspb.Release, err error) { ...@@ -201,7 +201,7 @@ func (cfgmaps *ConfigMaps) Delete(key string) (rls *rspb.Release, err error) {
return nil, ErrReleaseNotFound return nil, ErrReleaseNotFound
} }
logerrf(err, "delete: failed to get release %q", rls.Name) logerrf(err, "delete: failed to get release %q", key)
return nil, err return nil, err
} }
// delete the release // delete the release
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment