Merge pull request #21 from ONE7live/fix_netdr_vendor

fix: add vendor after version update

.github/workflows/ci.yml

@@ -8,15 +8,16 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.22'
       - name: golint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.54.1
+          version: v1.54
+          args: --timeout 5m
   verify:
     name: verify
     runs-on: ubuntu-22.04
@@ -28,27 +29,27 @@ jobs:
         working-directory: ${{ env.WORKSPACE }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: ${{ env.WORKSPACE }}
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.22'
   build:
     name: build
     needs: verify
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # https://github.com/actions/checkout#fetch-all-history-for-all-tags-and-branches
           fetch-depth: 0
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.22'
       - name: Compile
         run: make netctl
 

go.mod

@@ -1,6 +1,8 @@
 module github.com/kosmos.io/netdoctor
 
-go 1.22.9
+go 1.22.0
+
+toolchain go1.22.9
 
 require (
 	github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213

pkg/utils/verify.go

@@ -38,10 +38,24 @@ func WaitPodReady(c kubernetes.Interface, namespace, selector string, timeout in
 
 // waitPodReady  Poll up to timeout seconds for pod to enter running state.
 // Returns an error if the pod never enters the running state.
-func waitPodReady(c kubernetes.Interface, namespaces, podName string, timeout time.Duration) error {
-	return wait.PollImmediate(time.Second, timeout, isPodReady(c, namespaces, podName))
+func waitPodReady(c kubernetes.Interface, namespace string, podName string, timeout time.Duration) error {
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+
+	err := wait.PollUntilContextTimeout(ctx, time.Second, timeout, false, func(ctx context.Context) (bool, error) {
+		return isPodReady(c, namespace, podName)()
+	})
+	if err != nil {
+		return err
+	}
+
+	return nil
 }
 
+//func waitPodReady(c kubernetes.Interface, namespaces, podName string, timeout time.Duration) error {
+//	return wait.PollImmediate(time.Second, timeout, isPodReady(c, namespaces, podName))
+//}
+
 func podStatus(pod *corev1.Pod) string {
 	for _, value := range pod.Status.ContainerStatuses {
 		if pod.Status.Phase == corev1.PodRunning {