From dc5852448e1f0b429610bfaf31d83ff602652c25 Mon Sep 17 00:00:00 2001 From: Ferran Rodenas Date: Mon, 23 Oct 2017 12:42:29 +0200 Subject: [PATCH] Fix kubectl Pod Disruption Budget assertion error messages Signed-off-by: Ferran Rodenas --- pkg/kubectl/pdb.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/kubectl/pdb.go b/pkg/kubectl/pdb.go index 07b8e3331ae..9a9586f2a45 100644 --- a/pkg/kubectl/pdb.go +++ b/pkg/kubectl/pdb.go @@ -50,15 +50,15 @@ func (s PodDisruptionBudgetV1Generator) Generate(params map[string]interface{}) } name, isString := params["name"].(string) if !isString { - return nil, fmt.Errorf("expected string, saw %v for 'name'", name) + return nil, fmt.Errorf("expected string, found %v for 'name'", params["name"]) } minAvailable, isString := params["min-available"].(string) if !isString { - return nil, fmt.Errorf("expected string, found %v", minAvailable) + return nil, fmt.Errorf("expected string, found %v for 'min-available'", params["min-available"]) } selector, isString := params["selector"].(string) if !isString { - return nil, fmt.Errorf("expected string, found %v", selector) + return nil, fmt.Errorf("expected string, found %v for 'selector'", params["selector"]) } delegate := &PodDisruptionBudgetV1Generator{Name: name, MinAvailable: minAvailable, Selector: selector} return delegate.StructuredGenerate() @@ -134,22 +134,22 @@ func (s PodDisruptionBudgetV2Generator) Generate(params map[string]interface{}) name, isString := params["name"].(string) if !isString { - return nil, fmt.Errorf("expected string, saw %v for 'name'", name) + return nil, fmt.Errorf("expected string, found %v for 'name'", params["name"]) } minAvailable, isString := params["min-available"].(string) if !isString { - return nil, fmt.Errorf("expected string, found %v", minAvailable) + return nil, fmt.Errorf("expected string, found %v for 'min-available'", params["min-available"]) } maxUnavailable, isString := params["max-unavailable"].(string) if !isString { - return nil, fmt.Errorf("expected string, found %v", maxUnavailable) + return nil, fmt.Errorf("expected string, found %v for 'max-unavailable'", params["max-unavailable"]) } selector, isString := params["selector"].(string) if !isString { - return nil, fmt.Errorf("expected string, found %v", selector) + return nil, fmt.Errorf("expected string, found %v for 'selector'", params["selector"]) } delegate := &PodDisruptionBudgetV2Generator{Name: name, MinAvailable: minAvailable, MaxUnavailable: maxUnavailable, Selector: selector} return delegate.StructuredGenerate()