Merge pull request #11586 from danwinship/annotation-cleanup

OpenShift Bot · web-flow · commit e08d4570b388 · 2016-11-03T15:29:13.000-04:00
Merged by openshift-bot
diff --git a/pkg/sdn/plugin/pod_linux.go b/pkg/sdn/plugin/pod_linux.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 	"syscall"
 
+	sdnapi "github.com/openshift/origin/pkg/sdn/api"
 	"github.com/openshift/origin/pkg/sdn/plugin/cniserver"
 
 	"github.com/golang/glog"
@@ -35,8 +36,6 @@ const (
 	tearDownCmd = "teardown"
 	updateCmd   = "update"
 
-	AssignMacvlanAnnotation string = "pod.network.openshift.io/assign-macvlan"
-
 	podInterfaceName = knetwork.DefaultInterfaceName
 )
 
@@ -71,12 +70,12 @@ func wantsMacvlan(pod *kapi.Pod) (bool, error) {
 		}
 	}
 
-	val, ok := pod.Annotations[AssignMacvlanAnnotation]
+	val, ok := pod.Annotations[sdnapi.AssignMacvlanAnnotation]
 	if !ok || val != "true" {
 		return false, nil
 	}
 	if !privileged {
-		return false, fmt.Errorf("pod has %q annotation but is not privileged", AssignMacvlanAnnotation)
+		return false, fmt.Errorf("pod has %q annotation but is not privileged", sdnapi.AssignMacvlanAnnotation)
 	}
 
 	return true, nil

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import (`
`9`	`9`	`"strings"`
`10`	`10`	`"syscall"`
`11`	`11`
	`12`	`+ sdnapi "github.com/openshift/origin/pkg/sdn/api"`
`12`	`13`	`"github.com/openshift/origin/pkg/sdn/plugin/cniserver"`
`13`	`14`
`14`	`15`	`"github.com/golang/glog"`
`@@ -35,8 +36,6 @@ const (`
`35`	`36`	`tearDownCmd = "teardown"`
`36`	`37`	`updateCmd = "update"`
`37`	`38`
`38`		`- AssignMacvlanAnnotation string = "pod.network.openshift.io/assign-macvlan"`
`39`		`-`
`40`	`39`	`podInterfaceName = knetwork.DefaultInterfaceName`
`41`	`40`	`)`
`42`	`41`
`@@ -71,12 +70,12 @@ func wantsMacvlan(pod *kapi.Pod) (bool, error) {`
`71`	`70`	`}`
`72`	`71`	`}`
`73`	`72`
`74`		`- val, ok := pod.Annotations[AssignMacvlanAnnotation]`
	`73`	`+ val, ok := pod.Annotations[sdnapi.AssignMacvlanAnnotation]`
`75`	`74`	`if !ok \|\| val != "true" {`
`76`	`75`	`return false, nil`
`77`	`76`	`}`
`78`	`77`	`if !privileged {`
`79`		`- return false, fmt.Errorf("pod has %q annotation but is not privileged", AssignMacvlanAnnotation)`
	`78`	`+ return false, fmt.Errorf("pod has %q annotation but is not privileged", sdnapi.AssignMacvlanAnnotation)`
`80`	`79`	`}`
`81`	`80`
`82`	`81`	`return true, nil`