diff --git a/go.mod b/go.mod index 466cc6a53..1d46fee74 100644 --- a/go.mod +++ b/go.mod @@ -31,12 +31,12 @@ require ( github.com/stretchr/testify v1.7.0 golang.org/x/sys v0.0.0-20220209214540-3681064d5158 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0-20220319170349-0f1a9d7727b7 + k8s.io/api v0.0.0-20220324090946-b14ef0668e67 k8s.io/apimachinery v0.0.0-20220317021027-c68a4df61d4d k8s.io/cli-runtime v0.0.0-20220319184351-8dd57697301b - k8s.io/client-go v0.0.0-20220319171434-3ac142e26bc6 + k8s.io/client-go v0.0.0-20220324012159-c012194d06e2 k8s.io/component-base v0.0.0-20220317023659-c5dae0cde26e - k8s.io/component-helpers v0.0.0-20220317024050-85dd3119a14e + k8s.io/component-helpers v0.0.0-20220324013354-ccd82d682788 k8s.io/klog/v2 v2.40.1 k8s.io/kube-openapi v0.0.0-20220316025549-ddc66922ab18 k8s.io/metrics v0.0.0-20220319183730-ef2da6b32ee7 @@ -48,12 +48,12 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20220319170349-0f1a9d7727b7 + k8s.io/api => k8s.io/api v0.0.0-20220324090946-b14ef0668e67 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220317021027-c68a4df61d4d k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220319184351-8dd57697301b - k8s.io/client-go => k8s.io/client-go v0.0.0-20220319171434-3ac142e26bc6 + k8s.io/client-go => k8s.io/client-go v0.0.0-20220324012159-c012194d06e2 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220318020739-3e006776d5ff k8s.io/component-base => k8s.io/component-base v0.0.0-20220317023659-c5dae0cde26e - k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220317024050-85dd3119a14e + k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220324013354-ccd82d682788 k8s.io/metrics => k8s.io/metrics v0.0.0-20220319183730-ef2da6b32ee7 ) diff --git a/go.sum b/go.sum index 6d53275bd..42f2766d3 100644 --- a/go.sum +++ b/go.sum @@ -848,19 +848,19 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20220319170349-0f1a9d7727b7 h1:mZ+ypm/uYY8RMzg27GxqdV7qZMIc8MhucmkPshG4RGs= -k8s.io/api v0.0.0-20220319170349-0f1a9d7727b7/go.mod h1:RvsmB1DuKSEVw+3ZZ6fseROF1PYQkewMo0uNNvIcXKs= +k8s.io/api v0.0.0-20220324090946-b14ef0668e67 h1:ZDu3Mx45i5JacKJYS1mp1FVLEHV8IOqABYOlmviE3bw= +k8s.io/api v0.0.0-20220324090946-b14ef0668e67/go.mod h1:RvsmB1DuKSEVw+3ZZ6fseROF1PYQkewMo0uNNvIcXKs= k8s.io/apimachinery v0.0.0-20220317021027-c68a4df61d4d h1:X97IrPL+mdzFxeVmVkbtko19rowdqorN20036BKf+qQ= k8s.io/apimachinery v0.0.0-20220317021027-c68a4df61d4d/go.mod h1:Xig8YiaWvp151KCOs9q3j/mLnW/ooZAR6EtxqHwhtD0= k8s.io/cli-runtime v0.0.0-20220319184351-8dd57697301b h1:W+IfaoVJ7qTkfWbW8wQ/XBtYM0ArVa2/goZxF2mq38s= k8s.io/cli-runtime v0.0.0-20220319184351-8dd57697301b/go.mod h1:wed/MDb+CPaezj4DJvafsK6lPdJc6lA2yv7ncI9ehXA= -k8s.io/client-go v0.0.0-20220319171434-3ac142e26bc6 h1:Pf/ZQURzw386tRATyEOJtXlVxN8WB+k8YHW9nZhdTFo= -k8s.io/client-go v0.0.0-20220319171434-3ac142e26bc6/go.mod h1:jtN3PxR5PkSth3KEUE6KOc3My8JCjLNpmn9jze8Jo/M= +k8s.io/client-go v0.0.0-20220324012159-c012194d06e2 h1:2BB6kJiBHLHJUV7JdzqmTT9WwCmcw6Mj5bCPLmE42KU= +k8s.io/client-go v0.0.0-20220324012159-c012194d06e2/go.mod h1:BO5g66iBHISh9HBDGE+xrQ2P+6+i/94v/5WDGEqSa1I= k8s.io/code-generator v0.0.0-20220318020739-3e006776d5ff/go.mod h1:f6E+BgTk8onkBfwvIkiR0bo407Qt+HzXQThjtFQtW5M= k8s.io/component-base v0.0.0-20220317023659-c5dae0cde26e h1:n/o6H3aUL5zCceACfq4tu5ogq86BLfrTPc/ZZr4KzbY= k8s.io/component-base v0.0.0-20220317023659-c5dae0cde26e/go.mod h1:NLi1Z0XVyd14kA5naS5PvPwSONj7gRtkwuF2oMI7t0s= -k8s.io/component-helpers v0.0.0-20220317024050-85dd3119a14e h1:8zahGgD+EvdEFDKgcjm6Hc9O6YnbgPUKIwVgxxrpnog= -k8s.io/component-helpers v0.0.0-20220317024050-85dd3119a14e/go.mod h1:1m08OHQ9rbiTiaxjbLv3jJM8nzxe7S5XUXl3wjrlpM0= +k8s.io/component-helpers v0.0.0-20220324013354-ccd82d682788 h1:aamz8JgR/oLUidpYMqOs9hajzSENFatc+dZyDrif2ds= +k8s.io/component-helpers v0.0.0-20220324013354-ccd82d682788/go.mod h1:tXWT1b1GulRdOBFtm9ZLjHJtgRw+C+H9ebzOSZPogEI= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/pkg/cmd/diff/diff.go b/pkg/cmd/diff/diff.go index 15aef59ed..6953251f2 100644 --- a/pkg/cmd/diff/diff.go +++ b/pkg/cmd/diff/diff.go @@ -35,7 +35,6 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" - "k8s.io/client-go/discovery" "k8s.io/client-go/dynamic" "k8s.io/klog/v2" "k8s.io/kubectl/pkg/cmd/apply" @@ -110,7 +109,6 @@ type DiffOptions struct { Selector string OpenAPISchema openapi.Resources - DiscoveryClient discovery.DiscoveryInterface DynamicClient dynamic.Interface DryRunVerifier *resource.QueryParamVerifier CmdNamespace string @@ -629,11 +627,6 @@ func (o *DiffOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) error { } } - o.DiscoveryClient, err = f.ToDiscoveryClient() - if err != nil { - return err - } - o.DynamicClient, err = f.DynamicClient() if err != nil { return err