diff --git a/apiserver/pkg/storage/calico/watcher.go b/apiserver/pkg/storage/calico/watcher.go index 38f46afa496..7d95a7a9a49 100644 --- a/apiserver/pkg/storage/calico/watcher.go +++ b/apiserver/pkg/storage/calico/watcher.go @@ -8,7 +8,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" - k8swatch "k8s.io/apimachinery/pkg/watch" "k8s.io/apiserver/pkg/storage" "github.com/projectcalico/calico/libcalico-go/lib/options" @@ -25,7 +24,7 @@ type watchChan struct { } func (rs *resourceStore) watchResource(ctx context.Context, resourceVersion string, - p storage.SelectionPredicate, name, namespace string) (k8swatch.Interface, error) { + p storage.SelectionPredicate, name, namespace string) (watch.Interface, error) { opts := options.ListOptions{Name: name, Namespace: namespace, ResourceVersion: resourceVersion} ctx, cancel := context.WithCancel(ctx) lWatch, err := rs.watch(ctx, rs.client, opts) diff --git a/metadata.mk b/metadata.mk index d3e58f9e5f8..65869a87a89 100644 --- a/metadata.mk +++ b/metadata.mk @@ -45,4 +45,4 @@ WINDOWS_DIST = dist/windows # The Windows HPC container version used as base for Calico Windows images WINDOWS_HPC_VERSION ?= v1.0.0 # The Windows versions used as base for Calico Windows images -WINDOWS_VERSIONS ?= 1809 ltsc2022 +WINDOWS_VERSIONS ?= 1809 ltsc2022 \ No newline at end of file