Remove dependency on deprecated client-pkg (#1990)

* Remove dependencie on deprecated client-pkg * Commit go.work.sum update
knative · Jan 20, 2025 · 8d10f67 · 8d10f67
1 parent 5f15fd3
commit 8d10f67
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 20 deletions.
diff --git a/go.mod b/go.mod
@@ -128,7 +128,6 @@ require (
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 // indirect
 	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
-	knative.dev/client-pkg v0.0.0-20250109131824-afd7c8d9de7b // indirect
 	knative.dev/eventing v0.43.1-0.20250113175801-cd7c1c09ec9d // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect

diff --git a/go.sum b/go.sum
@@ -858,8 +858,6 @@ k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 h1:1Wof1cGQgA5pqgo8MxKPtf
 k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8/go.mod h1:Os6V6dZwLNii3vxFpxcNaTmH8LJJBkOTg1N0tOA0fvA=
 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-knative.dev/client-pkg v0.0.0-20250109131824-afd7c8d9de7b h1:LqysBUe0hLjZhVNFRlSaOjQ8SRJs2K+eMt6YlTvIJJw=
-knative.dev/client-pkg v0.0.0-20250109131824-afd7c8d9de7b/go.mod h1:1Wp8+rz7JT3c17r0+2IdxWjkNvEZ/4/AHywaV12nq3I=
 knative.dev/eventing v0.43.1-0.20250113175801-cd7c1c09ec9d h1:H6TfOTcG/81nciBfim8+16cxSMFjqchG65yDYuW2RqE=
 knative.dev/eventing v0.43.1-0.20250113175801-cd7c1c09ec9d/go.mod h1:mDuDRRofBF46zRsZq3lyChuMTE+qqcrIqGHP4E09wtY=
 knative.dev/hack v0.0.0-20250109131303-f8be0ccdff36 h1:iZ6CwYLo+y82MXlK7PoG/cnFEB0tRdw8elBXj6c6ezE=

diff --git a/go.work.sum b/go.work.sum
@@ -252,8 +252,6 @@ github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
-github.com/maxbrunsfeld/counterfeiter/v6 v6.5.0 h1:rBhB9Rls+yb8kA4x5a/cWxOufWfXt24E+kq4YlbGj3g=
-github.com/maxbrunsfeld/counterfeiter/v6 v6.5.0/go.mod h1:fJ0UAZc1fx3xZhU4eSHQDJ1ApFmTVhp5VTpV9tm2ogg=
 github.com/moby/spdystream v0.4.0 h1:Vy79D6mHeJJjiPdFEL2yku1kl0chZpJfZcPpb16BRl8=
 github.com/moby/spdystream v0.4.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
@@ -265,8 +263,6 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWb
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034=
 github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
-github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
-github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc=
 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
 github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=

diff --git a/pkg/go.mod b/pkg/go.mod
@@ -27,7 +27,6 @@ require (
 	k8s.io/cli-runtime v0.29.2
 	k8s.io/client-go v0.31.4
 	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
-	knative.dev/client-pkg v0.0.0-20250109131824-afd7c8d9de7b
 	knative.dev/eventing v0.43.1-0.20250113175801-cd7c1c09ec9d
 	knative.dev/networking v0.0.0-20250113195501-679796878afc
 	knative.dev/pkg v0.0.0-20250113161000-0c2a238a16ed

diff --git a/pkg/go.sum b/pkg/go.sum
@@ -884,8 +884,6 @@ k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 h1:1Wof1cGQgA5pqgo8MxKPtf
 k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8/go.mod h1:Os6V6dZwLNii3vxFpxcNaTmH8LJJBkOTg1N0tOA0fvA=
 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-knative.dev/client-pkg v0.0.0-20250109131824-afd7c8d9de7b h1:LqysBUe0hLjZhVNFRlSaOjQ8SRJs2K+eMt6YlTvIJJw=
-knative.dev/client-pkg v0.0.0-20250109131824-afd7c8d9de7b/go.mod h1:1Wp8+rz7JT3c17r0+2IdxWjkNvEZ/4/AHywaV12nq3I=
 knative.dev/eventing v0.43.1-0.20250113175801-cd7c1c09ec9d h1:H6TfOTcG/81nciBfim8+16cxSMFjqchG65yDYuW2RqE=
 knative.dev/eventing v0.43.1-0.20250113175801-cd7c1c09ec9d/go.mod h1:mDuDRRofBF46zRsZq3lyChuMTE+qqcrIqGHP4E09wtY=
 knative.dev/networking v0.0.0-20250113195501-679796878afc h1:bzQlBSOXd7Uz+/ugX8bed6I6pbbWNgAuax1NT6DHqaU=

diff --git a/pkg/plugin/manager.go b/pkg/plugin/manager.go
@@ -25,17 +25,13 @@ import (
 	"strings"
 	"text/template"
 
-	pkgplugin "knative.dev/client-pkg/pkg/plugin"
-
 	"github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 )
 
 // InternalPlugins allow plugins to register to this slice for inlining
 var InternalPlugins PluginList
 
-var synced bool
-
 // Plugin describes a plugin
 type Plugin interface {
 	// Name of the plugin (the file name without extensions)
@@ -92,12 +88,6 @@ func NewManager(pluginDir string, lookupInPath bool) *Manager {
 		pluginsDir:   pluginDir,
 		lookupInPath: lookupInPath,
 	}
-	if !synced {
-		for _, p := range pkgplugin.InternalPlugins {
-			m.AppendPlugin(p)
-		}
-		synced = true
-	}
 	return m
 }