From bcec3d4a2ec3e742a7d11fd29598c4d3d48181bf Mon Sep 17 00:00:00 2001 From: Martin Hickey Date: Wed, 17 Jun 2020 17:20:52 +0000 Subject: [PATCH] Update after review Review comment: - https://github.com/helm/helm/pull/8198/files#r435237511 Signed-off-by: Martin Hickey (cherry picked from commit 059aeed8c73b3c026f6b1ff9125304afb23b92bb) --- pkg/kube/client.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/kube/client.go b/pkg/kube/client.go index 988b30be3..ee48a0a31 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -68,6 +68,8 @@ import ( // MissingGetHeader is added to Get's output when a resource is not found. const MissingGetHeader = "==> MISSING\nKIND\t\tNAME\n" +const KubsAPIErrorMsg = "unable to recognize \"\": no matches for kind" + // ErrNoObjectsVisited indicates that during a visit operation, no matching objects were found. var ErrNoObjectsVisited = goerrors.New("no objects visited") @@ -486,7 +488,7 @@ func (c *Client) UpdateWithOptions(namespace string, originalReader, targetReade if err != nil { // Checking for removed Kubernetes API error so can provide a more informative error message to the user // Ref: https://github.com/helm/helm/issues/7219 - if strings.Contains(err.Error(), "unable to recognize \"\": no matches for kind") { + if strings.Contains(err.Error(), KubsAPIErrorMsg) { return fmt.Errorf("current release manifest contains removed kubernetes api(s) for this "+ "kubernetes version and it is therefore unable to build the kubernetes "+ "objects for performing the diff. error from kubernetes: %s", err) @@ -500,7 +502,7 @@ func (c *Client) UpdateWithOptions(namespace string, originalReader, targetReade if err != nil { // Checking for removed Kubernetes API error so can provide a more informative error message to the user // Ref: https://github.com/helm/helm/issues/7219 - if strings.Contains(err.Error(), "unable to recognize \"\": no matches for kind") { + if strings.Contains(err.Error(), KubsAPIErrorMsg) { return fmt.Errorf("new release manifest contains removed kubernetes api(s) for this "+ "kubernetes version and it is therefore unable to build the kubernetes "+ "objects for deployment. error from kubernetes: %s", err)