Merge pull request #8198 from hickeyma/fix/add-k8s-api-better-err-msg

fix(kube): Backport add more informative error message for removed k8s APIs
pull/8344/head
Martin Hickey 4 years ago committed by GitHub
commit 92470e992a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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")
@ -484,13 +486,30 @@ type UpdateOptions struct {
func (c *Client) UpdateWithOptions(namespace string, originalReader, targetReader io.Reader, opts UpdateOptions) error {
original, err := c.BuildUnstructured(namespace, originalReader)
if err != nil {
return fmt.Errorf("failed decoding reader into objects: %s", err)
// 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(), 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)
} else {
return fmt.Errorf("failed decoding reader into objects: %s", err)
}
}
c.Log("building resources from updated manifest")
target, err := c.BuildUnstructured(namespace, targetReader)
if err != nil {
return fmt.Errorf("failed decoding reader into objects: %s", err)
// 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(), 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)
} else {
return fmt.Errorf("failed decoding reader into objects: %s", err)
}
}
newlyCreatedResources := []*resource.Info{}

Loading…
Cancel
Save