Update after review

Review comment:

- https://github.com/helm/helm/pull/8198/files#r435237511

Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
pull/8198/head
Martin Hickey 4 years ago
parent a90182e3b2
commit 059aeed8c7

@ -68,6 +68,8 @@ import (
// MissingGetHeader is added to Get's output when a resource is not found. // MissingGetHeader is added to Get's output when a resource is not found.
const MissingGetHeader = "==> MISSING\nKIND\t\tNAME\n" 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. // ErrNoObjectsVisited indicates that during a visit operation, no matching objects were found.
var ErrNoObjectsVisited = goerrors.New("no objects visited") var ErrNoObjectsVisited = goerrors.New("no objects visited")
@ -486,7 +488,7 @@ func (c *Client) UpdateWithOptions(namespace string, originalReader, targetReade
if err != nil { if err != nil {
// Checking for removed Kubernetes API error so can provide a more informative error message to the user // 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 // 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 "+ return fmt.Errorf("current release manifest contains removed kubernetes api(s) for this "+
"kubernetes version and it is therefore unable to build the kubernetes "+ "kubernetes version and it is therefore unable to build the kubernetes "+
"objects for performing the diff. error from kubernetes: %s", err) "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 { if err != nil {
// Checking for removed Kubernetes API error so can provide a more informative error message to the user // 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 // 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 "+ return fmt.Errorf("new release manifest contains removed kubernetes api(s) for this "+
"kubernetes version and it is therefore unable to build the kubernetes "+ "kubernetes version and it is therefore unable to build the kubernetes "+
"objects for deployment. error from kubernetes: %s", err) "objects for deployment. error from kubernetes: %s", err)

Loading…
Cancel
Save