upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-04-29 02:01:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(lookup_func): do not return error when object is not found

Browse source 
Signed-off-by: Matthew Fisher <matt.fisher@microsoft.com>
This commit is contained in:
Matthew Fisher 2020-01-27 14:44:12 -08:00
parent 9c680e604b
commit 1b1d6bba9c
No known key found for this signature in database
GPG key ID: 92AA783CBAAE8E3B
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkg/engine/lookup_func.go
View file

@ -21,6 +21,7 @@ import (
"strings"
"github.com/pkg/errors"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/discovery"
@ -30,6 +31,8 @@ import (
type lookupFunc = func(apiversion string, resource string, namespace string, name string) (map[string]interface{}, error)
// NewLookupFunction returns a function for looking up objects in the cluster. If the resource does not exist, no error
// is raised.
func NewLookupFunction(config *rest.Config) lookupFunc {
return func(apiversion string, resource string, namespace string, name string) (map[string]interface{}, error) {
var client dynamic.ResourceInterface
@ -43,9 +46,14 @@ func NewLookupFunction(config *rest.Config) lookupFunc {
client = c
}
if name != "" {
//this will return a single object
// this will return a single object
obj, err := client.Get(name, metav1.GetOptions{})
if err != nil {
if apierrors.IsNotFound(err) {
// Just return an empty interface when the object was not found.
// That way, users can use `if not (lookup ...)` in their templates.
return map[string]interface{}{}, nil
}
return map[string]interface{}{}, err
}
return obj.UnstructuredContent(), nil
@ -53,6 +61,11 @@ func NewLookupFunction(config *rest.Config) lookupFunc {
//this will return a list
obj, err := client.List(metav1.ListOptions{})
if err != nil {
if apierrors.IsNotFound(err) {
// Just return an empty interface when the object was not found.
// That way, users can use `if not (lookup ...)` in their templates.
return map[string]interface{}{}, nil
}
return map[string]interface{}{}, err
}
return obj.UnstructuredContent(), nil