Fixed e2e tests (#863)

voyagermesh · Feb 12, 2018 · 3d8f3c6 · 3d8f3c6
1 parent c18f41e
commit 3d8f3c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/apis/voyager/v1beta1/annotations.go b/apis/voyager/v1beta1/annotations.go
@@ -11,7 +11,6 @@ import (
 )
 
 const (
-	IngressKey = "ingress.kubernetes.io"
 	EngressKey = "ingress.appscode.com"
 
 	APISchema        = EngressKey + "/" + "api-schema" // APISchema = {APIGroup}/{APIVersion}

diff --git a/apis/voyager/v1beta1/diff.go b/apis/voyager/v1beta1/diff.go
@@ -47,13 +47,13 @@ func (r Ingress) HasChanged(o Ingress) (bool, error) {
 
 	ra := map[string]string{}
 	for k, v := range r.Annotations {
-		if strings.HasPrefix(k, EngressKey+"/") || strings.HasPrefix(k, IngressKey+"/") || k == ingressClassAnnotationKey {
+		if strings.HasPrefix(k, EngressKey+"/") || k == ingressClassAnnotationKey {
 			ra[k] = v
 		}
 	}
 	oa := map[string]string{}
 	for k, v := range o.Annotations {
-		if strings.HasPrefix(k, EngressKey+"/") || strings.HasPrefix(k, IngressKey+"/") || k == ingressClassAnnotationKey {
+		if strings.HasPrefix(k, EngressKey+"/") || k == ingressClassAnnotationKey {
 			oa[k] = v
 		}
 	}