Fix go mods and update cri-tools

Fix kubelet util calls Update cri-dockerd Signed-off-by: galal-hussein <[email protected]>
k3s-io · Aug 14, 2024 · 9c08a27 · 9c08a27
1 parent 649678b
commit 9c08a27
Show file tree

Hide file tree

Showing 11 changed files with 431 additions and 316 deletions.
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -22,9 +22,9 @@ import (
 	"github.com/k3s-io/k3s/pkg/containerd"
 	ctr2 "github.com/k3s-io/k3s/pkg/ctr"
 	kubectl2 "github.com/k3s-io/k3s/pkg/kubectl"
-	crictl2 "github.com/kubernetes-sigs/cri-tools/cmd/crictl"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
+	crictl2 "sigs.k8s.io/cri-tools/cmd/crictl"
 )
 
 func init() {

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/agent/containerd/config_linux.go b/pkg/agent/containerd/config_linux.go
@@ -19,7 +19,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
-	"k8s.io/kubernetes/pkg/kubelet/util"
+	"k8s.io/cri-client/pkg/util"
 )
 
 const (

diff --git a/pkg/agent/cri/cri_linux.go b/pkg/agent/cri/cri_linux.go
@@ -9,7 +9,7 @@ import (
 
 	"google.golang.org/grpc"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
-	k8sutil "k8s.io/kubernetes/pkg/kubelet/util"
+	k8sutil "k8s.io/cri-client/pkg/util"
 )
 
 const socketPrefix = "unix://"

diff --git a/pkg/agent/https/https.go b/pkg/agent/https/https.go
@@ -11,6 +11,7 @@ import (
 	"github.com/k3s-io/k3s/pkg/generated/clientset/versioned/scheme"
 	"github.com/k3s-io/k3s/pkg/util"
 	"github.com/k3s-io/k3s/pkg/version"
+	"k8s.io/apiserver/pkg/apis/apiserver"
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
 	genericapifilters "k8s.io/apiserver/pkg/endpoints/filters"
@@ -63,7 +64,9 @@ func Start(ctx context.Context, nodeConfig *config.Node, runtime *config.Control
 		}
 
 		authn := options.NewDelegatingAuthenticationOptions()
-		authn.DisableAnonymous = true
+		authn.Anonymous = &apiserver.AnonymousAuthConfig{
+			Enabled: false,
+		}
 		authn.SkipInClusterLookup = true
 		authn.ClientCert = options.ClientCertAuthenticationOptions{
 			ClientCA: nodeConfig.AgentConfig.ClientCA,

diff --git a/pkg/agent/run_test.go b/pkg/agent/run_test.go
@@ -23,8 +23,8 @@ func Test_UnitGetConntrackConfig(t *testing.T) {
 	}
 
 	customConfig := defaultConfig.DeepCopy()
-	customConfig.Conntrack.Min = utilsptr.To(int32(100))
-	customConfig.Conntrack.TCPCloseWaitTimeout.Duration = 42 * time.Second
+	customConfig.Linux.Conntrack.Min = utilsptr.To(int32(100))
+	customConfig.Linux.Conntrack.TCPCloseWaitTimeout.Duration = 42 * time.Second
 
 	type args struct {
 		nodeConfig *daemonconfig.Node
@@ -44,7 +44,7 @@ func Test_UnitGetConntrackConfig(t *testing.T) {
 					},
 				},
 			},
-			want:    &defaultConfig.Conntrack,
+			want:    &defaultConfig.Linux.Conntrack,
 			wantErr: false,
 		},
 		{
@@ -56,7 +56,7 @@ func Test_UnitGetConntrackConfig(t *testing.T) {
 					},
 				},
 			},
-			want:    &defaultConfig.Conntrack,
+			want:    &defaultConfig.Linux.Conntrack,
 			wantErr: false,
 		},
 		{
@@ -80,7 +80,7 @@ func Test_UnitGetConntrackConfig(t *testing.T) {
 					},
 				},
 			},
-			want:    &customConfig.Conntrack,
+			want:    &customConfig.Linux.Conntrack,
 			wantErr: false,
 		},
 	}

diff --git a/pkg/cli/crictl/crictl.go b/pkg/cli/crictl/crictl.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/kubernetes-sigs/cri-tools/cmd/crictl"
 	"github.com/urfave/cli"
+	"sigs.k8s.io/cri-tools/cmd/crictl"
 )
 
 func Run(ctx *cli.Context) error {

diff --git a/scripts/build b/scripts/build
@@ -9,7 +9,7 @@ GO=${GO-go}
 
 PKG="github.com/k3s-io/k3s"
 PKG_CONTAINERD="github.com/containerd/containerd"
-PKG_CRICTL="github.com/kubernetes-sigs/cri-tools/pkg"
+PKG_CRICTL="sigs.k8s.io/cri-tools/pkg"
 PKG_K8S_BASE="k8s.io/component-base"
 PKG_K8S_CLIENT="k8s.io/client-go/pkg"
 PKG_CNI_PLUGINS="github.com/containernetworking/plugins"

diff --git a/scripts/validate-cross-compilation b/scripts/validate-cross-compilation
@@ -10,7 +10,7 @@ GO=${GO-go}
 PKG="github.com/k3s-io/k3s"
 PKG_CONTAINERD="github.com/containerd/containerd"
 PKG_K3S_CONTAINERD="github.com/k3s-io/containerd"
-PKG_CRICTL="github.com/kubernetes-sigs/cri-tools/pkg"
+PKG_CRICTL="sigs.k8s.io/cri-tools/pkg"
 PKG_K8S_BASE="k8s.io/component-base"
 PKG_K8S_CLIENT="k8s.io/client-go/pkg"
 

diff --git a/scripts/version.sh b/scripts/version.sh
@@ -37,7 +37,7 @@ if [ -z "$VERSION_CONTAINERD" ]; then
     VERSION_CONTAINERD="v0.0.0"
 fi
 
-VERSION_CRICTL=$(get-module-version github.com/kubernetes-sigs/cri-tools)
+VERSION_CRICTL=$(get-module-version sigs.k8s.io/cri-tools)
 if [ -z "$VERSION_CRICTL" ]; then
     VERSION_CRICTL="v0.0.0"
 fi