Merge pull request #390 from MrHohn/cherrypick-383

Cherrypick #383: Unmask get backend config errors
kubernetes · Jul 9, 2018 · 3593ccb · 3593ccb
2 parents bf3b6fd + 992238e
commit 3593ccb
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/pkg/backendconfig/backendconfig.go b/pkg/backendconfig/backendconfig.go
@@ -32,10 +32,9 @@ import (
 )
 
 var (
-	ErrBackendConfigsFromAnnotation = errors.New("error getting BackendConfig's from annotation")
-	ErrBackendConfigDoesNotExist    = errors.New("no BackendConfig for service port exists.")
-	ErrBackendConfigFailedToGet     = errors.New("client had error getting BackendConfig for service port.")
-	ErrNoBackendConfigForPort       = errors.New("no BackendConfig name found for service port.")
+	ErrBackendConfigDoesNotExist = errors.New("no BackendConfig for service port exists.")
+	ErrBackendConfigFailedToGet  = errors.New("client had error getting BackendConfig for service port.")
+	ErrNoBackendConfigForPort    = errors.New("no BackendConfig name found for service port.")
 )
 
 func CRDMeta() *crd.CRDMeta {
@@ -95,7 +94,7 @@ func GetBackendConfigForServicePort(backendConfigLister cache.Store, svc *apiv1.
 		if err == annotations.ErrBackendConfigAnnotationMissing {
 			return nil, nil
 		}
-		return nil, ErrBackendConfigsFromAnnotation
+		return nil, err
 	}
 
 	configName := BackendConfigName(*backendConfigs, *svcPort)