File tree Expand file tree Collapse file tree 1 file changed +3
-4
lines changed Expand file tree Collapse file tree 1 file changed +3
-4
lines changed Original file line number Diff line number Diff line change 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"
@@ -36,8 +37,6 @@ const (
36
37
statusCmd = "status"
37
38
updateCmd = "update"
38
39
39
- AssignMacvlanAnnotation string = "pod.network.openshift.io/assign-macvlan"
40
-
41
40
podInterfaceName = knetwork .DefaultInterfaceName
42
41
)
43
42
@@ -72,12 +71,12 @@ func wantsMacvlan(pod *kapi.Pod) (bool, error) {
72
71
}
73
72
}
74
73
75
- val , ok := pod .Annotations [AssignMacvlanAnnotation ]
74
+ val , ok := pod .Annotations [sdnapi . AssignMacvlanAnnotation ]
76
75
if ! ok || val != "true" {
77
76
return false , nil
78
77
}
79
78
if ! privileged {
80
- return false , fmt .Errorf ("pod has %q annotation but is not privileged" , AssignMacvlanAnnotation )
79
+ return false , fmt .Errorf ("pod has %q annotation but is not privileged" , sdnapi . AssignMacvlanAnnotation )
81
80
}
82
81
83
82
return true , nil
You can’t perform that action at this time.
0 commit comments