From 713ed84dcbce0abfe751a41dcf3e78655d6b93cd Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Tue, 17 Dec 2019 10:33:16 -0700 Subject: [PATCH] fix: backport #6901 to Helm 2 (#7196) Signed-off-by: Matt Butcher (cherry picked from commit ab797325c6363afae3e238c17a7992a84c9802f4) --- pkg/tiller/release_server.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/tiller/release_server.go b/pkg/tiller/release_server.go index b174a32cf16..68169fe899e 100644 --- a/pkg/tiller/release_server.go +++ b/pkg/tiller/release_server.go @@ -270,7 +270,9 @@ func capabilities(disc discovery.DiscoveryInterface) (*chartutil.Capabilities, e // TODO(mattfarina): In Helm v3 merge with GetVersionSet func GetAllVersionSet(client discovery.ServerResourcesInterface) (chartutil.VersionSet, error) { groups, resources, err := client.ServerGroupsAndResources() - if err != nil { + // It is okay to silently swallow a GroupDiscoveryFailedError, which is actually just + // a warning. The 'groups' will still have all of the valid data. + if err != nil && !discovery.IsGroupDiscoveryFailedError(err) { return chartutil.DefaultVersionSet, err } @@ -318,7 +320,9 @@ func GetAllVersionSet(client discovery.ServerResourcesInterface) (chartutil.Vers // GetVersionSet retrieves a set of available k8s API versions func GetVersionSet(client discovery.ServerGroupsInterface) (chartutil.VersionSet, error) { groups, err := client.ServerGroups() - if err != nil { + // It is okay to silently swallow a GroupDiscoveryFailedError, which is actually just + // a warning. The 'groups' will still have all of the valid data. + if err != nil && !discovery.IsGroupDiscoveryFailedError(err) { return chartutil.DefaultVersionSet, err }