Merge pull request #2767 from aledbf/fix-regression

Fix regression introduced in #2732
kubernetes · Jul 10, 2018 · bdd2c5e · bdd2c5e
2 parents 2d5b3db + 6013150
commit bdd2c5e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/internal/ingress/controller/store/store.go b/internal/ingress/controller/store/store.go
@@ -667,7 +667,12 @@ func (s k8sStore) ListIngresses() []*extensions.Ingress {
 
 // GetIngressAnnotations returns the parsed annotations of an Ingress matching key.
 func (s k8sStore) GetIngressAnnotations(key string) (*annotations.Ingress, error) {
-	return s.listers.IngressAnnotation.ByKey(key)
+	ia, err := s.listers.IngressAnnotation.ByKey(key)
+	if err != nil {
+		return &annotations.Ingress{}, err
+	}
+
+	return ia, nil
 }
 
 // GetLocalSSLCert returns the local copy of a SSLCert