From a90aa1cecf951103f7e738bcaf1a82a9c3f03e39 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Thu, 28 Mar 2024 11:02:39 -0700 Subject: [PATCH] Remove old pinned dependencies Signed-off-by: Derek Nola --- go.mod | 7 +------ go.sum | 2 +- pkg/agent/run.go | 2 +- pkg/cli/cmds/log_linux.go | 2 +- pkg/cli/server/server.go | 2 +- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index d37594638c17..6417e6fac76e 100644 --- a/go.mod +++ b/go.mod @@ -7,14 +7,11 @@ replace ( github.com/Mirantis/cri-dockerd => github.com/k3s-io/cri-dockerd v0.3.9-k3s1 // k3s/release-1.27 github.com/cloudnativelabs/kube-router/v2 => github.com/k3s-io/kube-router/v2 v2.0.1 github.com/containerd/containerd => github.com/k3s-io/containerd v1.7.11-k3s2.27 - github.com/coreos/go-systemd => github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e github.com/docker/distribution => github.com/docker/distribution v2.8.2+incompatible github.com/docker/docker => github.com/docker/docker v24.0.0-rc.2.0.20230801142700-69c9adb7d386+incompatible - github.com/docker/libnetwork => github.com/docker/libnetwork v0.8.0-dev.2.0.20190624125649-f0e46a78ea34 github.com/emicklei/go-restful/v3 => github.com/emicklei/go-restful/v3 v3.9.0 github.com/golang/protobuf => github.com/golang/protobuf v1.5.4 github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.1.1 - github.com/juju/errors => github.com/k3s-io/nocode v0.0.0-20200630202308-cb097102c09f github.com/kubernetes-sigs/cri-tools => github.com/k3s-io/cri-tools v1.26.0-rc.0-k3s1 github.com/open-policy-agent/opa => github.com/open-policy-agent/opa v0.59.0 // github.com/Microsoft/hcsshim using bad version v0.42.2 github.com/opencontainers/runc => github.com/k3s-io/runc v1.1.12-k3s1 @@ -90,7 +87,6 @@ replace ( k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.27.12-k3s1 k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.27.12-k3s1 k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.27.12-k3s1 - mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 ) require ( @@ -104,7 +100,7 @@ require ( github.com/containerd/stargz-snapshotter v0.14.4-0.20230913082252-7275d45b185c github.com/containerd/zfs v1.1.0 github.com/coreos/go-iptables v0.7.0 - github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf + github.com/coreos/go-systemd/v22 v22.5.0 github.com/docker/docker v24.0.7+incompatible github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83 github.com/flannel-io/flannel v0.24.2 @@ -241,7 +237,6 @@ require ( github.com/containers/ocicrypt v1.1.6 // indirect github.com/coreos/go-oidc v2.1.0+incompatible // indirect github.com/coreos/go-semver v0.3.0 // indirect - github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect diff --git a/go.sum b/go.sum index b090f9bb0f4a..23b5b334a677 100644 --- a/go.sum +++ b/go.sum @@ -302,7 +302,7 @@ github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHo github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8= +github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= diff --git a/pkg/agent/run.go b/pkg/agent/run.go index 7ef100bf997f..f0b5cf914fe1 100644 --- a/pkg/agent/run.go +++ b/pkg/agent/run.go @@ -11,7 +11,7 @@ import ( "strings" "time" - systemd "github.com/coreos/go-systemd/daemon" + systemd "github.com/coreos/go-systemd/v22/daemon" "github.com/k3s-io/k3s/pkg/agent/config" "github.com/k3s-io/k3s/pkg/agent/containerd" "github.com/k3s-io/k3s/pkg/agent/flannel" diff --git a/pkg/cli/cmds/log_linux.go b/pkg/cli/cmds/log_linux.go index 29329408d323..5b836d9740d3 100644 --- a/pkg/cli/cmds/log_linux.go +++ b/pkg/cli/cmds/log_linux.go @@ -10,7 +10,7 @@ import ( "os/signal" "syscall" - systemd "github.com/coreos/go-systemd/daemon" + systemd "github.com/coreos/go-systemd/v22/daemon" "github.com/erikdubbelboer/gspt" "github.com/k3s-io/k3s/pkg/version" "github.com/natefinch/lumberjack" diff --git a/pkg/cli/server/server.go b/pkg/cli/server/server.go index 865a3115dd30..e8a4b7022383 100644 --- a/pkg/cli/server/server.go +++ b/pkg/cli/server/server.go @@ -9,7 +9,7 @@ import ( "strings" "time" - systemd "github.com/coreos/go-systemd/daemon" + systemd "github.com/coreos/go-systemd/v22/daemon" "github.com/erikdubbelboer/gspt" "github.com/gorilla/mux" "github.com/k3s-io/k3s/pkg/agent"