Delete redundance package for apiserver storage code.

Signed-off-by: yanggang <[email protected]>
projectcalico · Oct 15, 2023 · d0c0830 · d0c0830
1 parent 431967c
commit d0c0830
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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