Merge pull request #932 from amacaskill/break-dep

Break dependency on k/k and remove replace statements in go.mod file

go.mod

@@ -32,7 +32,6 @@ require (
 	k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
 	k8s.io/component-base v0.26.0
 	k8s.io/klog/v2 v2.110.1
-	k8s.io/kubernetes v1.29.4
 	k8s.io/mount-utils v0.24.1
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 	sigs.k8s.io/boskos v0.0.0-20201002225104-ae3497d24cd7
@@ -73,7 +72,6 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/moby/sys/mountinfo v0.6.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -93,6 +91,8 @@ require (
 	go.opentelemetry.io/otel v1.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.25.0 // indirect
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
 	golang.org/x/sync v0.8.0 // indirect
@@ -113,33 +113,4 @@ require (
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
-replace (
-	k8s.io/api => k8s.io/api v0.26.0
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.0
-	k8s.io/apimachinery => k8s.io/apimachinery v0.26.0
-	k8s.io/apiserver => k8s.io/apiserver v0.26.0
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.0
-	k8s.io/client-go => k8s.io/client-go v0.26.0
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.0
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.0
-	k8s.io/code-generator => k8s.io/code-generator v0.26.0
-	k8s.io/component-base => k8s.io/component-base v0.26.0
-	k8s.io/component-helpers => k8s.io/component-helpers v0.26.0
-	k8s.io/controller-manager => k8s.io/controller-manager v0.26.0
-	k8s.io/cri-api => k8s.io/cri-api v0.26.0
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.0
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.0
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.0
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.0
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.0
-	k8s.io/kubectl => k8s.io/kubectl v0.26.0
-	k8s.io/kubelet => k8s.io/kubelet v0.26.0
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.0
-	k8s.io/metrics => k8s.io/metrics v0.26.0
-	k8s.io/mount-utils => k8s.io/mount-utils v0.26.0
-	k8s.io/node-api => k8s.io/node-api v0.26.0
-	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.0
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.0
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.0
-	k8s.io/sample-controller => k8s.io/sample-controller v0.26.0
-)
+replace k8s.io/client-go => k8s.io/client-go v0.26.0

test/k8s-integration/driver.go

@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 
 	"k8s.io/klog/v2"
-	"k8s.io/kubernetes/test/e2e/storage/podlogs"
+	"sigs.k8s.io/gcp-filestore-csi-driver/test/k8s-integration/podlogs"
 )
 
 func getOverlayDir(pkgDir, deployOverlayName string) string {

vendor/k8s.io/kubernetes/test/e2e/storage/podlogs/podlogs.go → test/k8s-integration/podlogs/podlogs.go

@@ -24,7 +24,6 @@ package podlogs
 
 import (
 	"bufio"
-	"bytes"
 	"context"
 	"fmt"
 	"io"
@@ -33,7 +32,6 @@ import (
 	"regexp"
 	"strings"
 	"sync"
-	"time"
 
 	v1 "k8s.io/api/core/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -265,108 +263,3 @@ func CopyPodLogs(ctx context.Context, cs clientset.Interface, ns, podName string
 func logsForPod(ctx context.Context, cs clientset.Interface, ns, pod string, opts *v1.PodLogOptions) (io.ReadCloser, error) {
 	return cs.CoreV1().Pods(ns).GetLogs(pod, opts).Stream(ctx)
 }
-
-// WatchPods prints pod status events for a certain namespace or all namespaces
-// when namespace name is empty. The closer can be nil if the caller doesn't want
-// the file to be closed when watching stops.
-func WatchPods(ctx context.Context, cs clientset.Interface, ns string, to io.Writer, toCloser io.Closer) (finalErr error) {
-	defer func() {
-		if finalErr != nil && toCloser != nil {
-			toCloser.Close()
-		}
-	}()
-
-	pods, err := cs.CoreV1().Pods(ns).Watch(context.Background(), meta.ListOptions{})
-	if err != nil {
-		return fmt.Errorf("cannot create Pod watcher: %w", err)
-	}
-	defer func() {
-		if finalErr != nil {
-			pods.Stop()
-		}
-	}()
-
-	events, err := cs.CoreV1().Events(ns).Watch(context.Background(), meta.ListOptions{})
-	if err != nil {
-		return fmt.Errorf("cannot create Event watcher: %w", err)
-	}
-
-	go func() {
-		defer func() {
-			pods.Stop()
-			events.Stop()
-			if toCloser != nil {
-				toCloser.Close()
-			}
-		}()
-		timeFormat := "15:04:05.000"
-		for {
-			select {
-			case e := <-pods.ResultChan():
-				if e.Object == nil {
-					continue
-				}
-
-				pod, ok := e.Object.(*v1.Pod)
-				if !ok {
-					continue
-				}
-				buffer := new(bytes.Buffer)
-				fmt.Fprintf(buffer,
-					"%s pod: %s: %s/%s %s: %s %s\n",
-					time.Now().Format(timeFormat),
-					e.Type,
-					pod.Namespace,
-					pod.Name,
-					pod.Status.Phase,
-					pod.Status.Reason,
-					pod.Status.Conditions,
-				)
-				for _, cst := range pod.Status.ContainerStatuses {
-					fmt.Fprintf(buffer, "   %s: ", cst.Name)
-					if cst.State.Waiting != nil {
-						fmt.Fprintf(buffer, "WAITING: %s - %s",
-							cst.State.Waiting.Reason,
-							cst.State.Waiting.Message,
-						)
-					} else if cst.State.Running != nil {
-						fmt.Fprintf(buffer, "RUNNING")
-					} else if cst.State.Terminated != nil {
-						fmt.Fprintf(buffer, "TERMINATED: %s - %s",
-							cst.State.Terminated.Reason,
-							cst.State.Terminated.Message,
-						)
-					}
-					fmt.Fprintf(buffer, "\n")
-				}
-				to.Write(buffer.Bytes())
-			case e := <-events.ResultChan():
-				if e.Object == nil {
-					continue
-				}
-
-				event, ok := e.Object.(*v1.Event)
-				if !ok {
-					continue
-				}
-				to.Write([]byte(fmt.Sprintf("%s event: %s/%s %s: %s %s: %s (%v - %v)\n",
-					time.Now().Format(timeFormat),
-					event.InvolvedObject.APIVersion,
-					event.InvolvedObject.Kind,
-					event.InvolvedObject.Name,
-					event.Source.Component,
-					event.Type,
-					event.Message,
-					event.FirstTimestamp,
-					event.LastTimestamp,
-				)))
-			case <-ctx.Done():
-				to.Write([]byte(fmt.Sprintf("%s ==== stopping pod watch ====\n",
-					time.Now().Format(timeFormat))))
-				return
-			}
-		}
-	}()
-
-	return nil
-}