Merge pull request #72 from pedro-r-marques/api_update

Upstream API changes on master branch.
Juniper · Nov 3, 2015 · 8ef216c · 8ef216c
2 parents 2d23850 + 628316d
commit 8ef216c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pkg/network/opencontrail/controller_dispatch.go b/pkg/network/opencontrail/controller_dispatch.go
@@ -46,7 +46,7 @@ func IgnorePod(pod *api.Pod) bool {
 		return true
 	}
 
-	if value, ok := pod.Annotations[kubetypes.ConfigMirrorAnnotationKey]; ok && value == kubetypes.MirrorType {
+	if _, ok := pod.Annotations[kubetypes.ConfigMirrorAnnotationKey]; ok {
 		return true
 	}
 	return false

diff --git a/pkg/network/opencontrail/mocks/KubePodInterface.go b/pkg/network/opencontrail/mocks/KubePodInterface.go
@@ -62,8 +62,8 @@ func (m *KubePodInterface) Update(pod *api.Pod) (*api.Pod, error) {
 
 	return r0, r1
 }
-func (m *KubePodInterface) Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {
-	ret := m.Called(label, field, resourceVersion)
+func (m *KubePodInterface) Watch(label labels.Selector, field fields.Selector, opts api.ListOptions) (watch.Interface, error) {
+	ret := m.Called(label, field, opts)
 
 	r0 := ret.Get(0).(watch.Interface)
 	r1 := ret.Error(1)

diff --git a/pkg/network/opencontrail/mocks/KubeServiceInterface.go b/pkg/network/opencontrail/mocks/KubeServiceInterface.go
@@ -65,8 +65,8 @@ func (m *KubeServiceInterface) Delete(name string) error {
 
 	return r0
 }
-func (m *KubeServiceInterface) Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {
-	ret := m.Called(label, field, resourceVersion)
+func (m *KubeServiceInterface) Watch(label labels.Selector, field fields.Selector, opts api.ListOptions) (watch.Interface, error) {
+	ret := m.Called(label, field, opts)
 
 	r0 := ret.Get(0).(watch.Interface)
 	r1 := ret.Error(1)