Skip to content

Commit 9bee31b

Browse files
authored
Update to latest version of cli-utils (#2796)
1 parent 1c9af4e commit 9bee31b

File tree

22 files changed

+436
-228
lines changed

22 files changed

+436
-228
lines changed

commands/livecmd.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
"k8s.io/klog/v2"
3434
cluster "k8s.io/kubectl/pkg/cmd/util"
3535
"sigs.k8s.io/cli-utils/pkg/manifestreader"
36-
"sigs.k8s.io/cli-utils/pkg/util/factory"
3736
)
3837

3938
func GetLiveCommand(ctx context.Context, _, version string) *cobra.Command {
@@ -77,14 +76,8 @@ func newFactory(cmd *cobra.Command, version string) cluster.Factory {
7776
flags := cmd.PersistentFlags()
7877
kubeConfigFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag()
7978
kubeConfigFlags.AddFlags(flags)
80-
// Use the CachingRESTClientGetter to make sure the same RESTMapper is shared
81-
// across all kpt live functionality. This is needed to properly invalidate the
82-
// RESTMapper cache when CRDs have been installed in the cluster.
83-
cachingConfigFlags := &factory.CachingRESTClientGetter{
84-
Delegate: kubeConfigFlags,
85-
}
8679
userAgentKubeConfigFlags := &cfgflags.UserAgentKubeConfigFlags{
87-
Delegate: cachingConfigFlags,
80+
Delegate: kubeConfigFlags,
8881
UserAgent: fmt.Sprintf("kpt/%s", version),
8982
}
9083
cmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)

e2e/testdata/live-apply/json-output/resources/dep.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ metadata:
1818
name: nginx
1919
namespace: json-output
2020
annotations:
21-
config.kubernetes.io/depends-on: apps/namespaces/json-output/ConfigMap/cm
21+
config.kubernetes.io/depends-on: /namespaces/json-output/ConfigMap/cm
2222
spec:
2323
replicas: 1
2424
selector:

go.mod

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,34 @@ module github.com/GoogleContainerTools/kpt
33
go 1.17
44

55
require (
6-
github.com/cpuguy83/go-md2man/v2 v2.0.0
6+
github.com/cpuguy83/go-md2man/v2 v2.0.1
77
github.com/go-errors/errors v1.4.0
88
github.com/google/go-cmp v0.5.6
99
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
1010
github.com/igorsobreira/titlecase v0.0.0-20140109233139-4156b5b858ac
1111
github.com/otiai10/copy v1.6.0
1212
github.com/philopon/go-toposort v0.0.0-20170620085441-9be86dbd762f
13-
github.com/spf13/cobra v1.2.1
13+
github.com/spf13/cobra v1.3.0
1414
github.com/stretchr/testify v1.7.0
1515
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca
1616
golang.org/x/mod v0.5.1
1717
gotest.tools v2.2.0+incompatible
18-
k8s.io/api v0.22.3
19-
k8s.io/apiextensions-apiserver v0.22.2
20-
k8s.io/apimachinery v0.22.3
21-
k8s.io/cli-runtime v0.22.2
22-
k8s.io/client-go v0.22.2
23-
k8s.io/klog/v2 v2.10.0
24-
k8s.io/kubectl v0.22.2
25-
sigs.k8s.io/cli-utils v0.27.0
26-
sigs.k8s.io/controller-runtime v0.10.1
18+
k8s.io/api v0.23.2
19+
k8s.io/apiextensions-apiserver v0.23.2
20+
k8s.io/apimachinery v0.23.2
21+
k8s.io/cli-runtime v0.23.2
22+
k8s.io/client-go v0.23.2
23+
k8s.io/component-base v0.23.2
24+
k8s.io/klog/v2 v2.30.0
25+
k8s.io/kubectl v0.23.2
26+
sigs.k8s.io/cli-utils v0.28.1
27+
sigs.k8s.io/controller-runtime v0.11.0
2728
sigs.k8s.io/kustomize/api v0.11.1
2829
sigs.k8s.io/kustomize/kyaml v0.13.3
2930
)
3031

3132
require (
32-
cloud.google.com/go v0.81.0 // indirect
33+
cloud.google.com/go v0.99.0 // indirect
3334
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
3435
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
3536
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
@@ -43,11 +44,11 @@ require (
4344
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
4445
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
4546
github.com/davecgh/go-spew v1.1.1 // indirect
46-
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
47+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
4748
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
4849
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
4950
github.com/fvbommel/sortorder v1.0.1 // indirect
50-
github.com/go-logr/logr v0.4.0 // indirect
51+
github.com/go-logr/logr v1.2.0 // indirect
5152
github.com/go-openapi/jsonpointer v0.19.5 // indirect
5253
github.com/go-openapi/jsonreference v0.19.5 // indirect
5354
github.com/go-openapi/swag v0.19.14 // indirect
@@ -62,43 +63,42 @@ require (
6263
github.com/inconshreveable/mousetrap v1.0.0 // indirect
6364
github.com/jonboulle/clockwork v0.2.2 // indirect
6465
github.com/josharian/intern v1.0.0 // indirect
65-
github.com/json-iterator/go v1.1.11 // indirect
66+
github.com/json-iterator/go v1.1.12 // indirect
6667
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
6768
github.com/mailru/easyjson v0.7.6 // indirect
6869
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
69-
github.com/mitchellh/mapstructure v1.4.1 // indirect
70+
github.com/mitchellh/mapstructure v1.4.3 // indirect
7071
github.com/moby/spdystream v0.2.0 // indirect
7172
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
7273
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
73-
github.com/modern-go/reflect2 v1.0.1 // indirect
74+
github.com/modern-go/reflect2 v1.0.2 // indirect
7475
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
75-
github.com/onsi/gomega v1.16.0 // indirect
76+
github.com/onsi/gomega v1.17.0 // indirect
7677
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7778
github.com/pkg/errors v0.9.1 // indirect
7879
github.com/pmezard/go-difflib v1.0.0 // indirect
7980
github.com/russross/blackfriday v1.5.2 // indirect
80-
github.com/russross/blackfriday/v2 v2.0.1 // indirect
81+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
8182
github.com/sergi/go-diff v1.1.0 // indirect
82-
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
8383
github.com/spf13/pflag v1.0.5 // indirect
8484
github.com/spyzhov/ajson v0.4.2 // indirect
8585
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
86-
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
87-
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
88-
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect
89-
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 // indirect
90-
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
91-
golang.org/x/text v0.3.6 // indirect
86+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
87+
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
88+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
89+
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
90+
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
91+
golang.org/x/text v0.3.7 // indirect
9292
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
9393
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
9494
google.golang.org/appengine v1.6.7 // indirect
95-
google.golang.org/protobuf v1.26.0 // indirect
95+
google.golang.org/protobuf v1.27.1 // indirect
9696
gopkg.in/inf.v0 v0.9.1 // indirect
9797
gopkg.in/yaml.v2 v2.4.0 // indirect
9898
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
99-
k8s.io/component-base v0.22.2 // indirect
100-
k8s.io/kube-openapi v0.0.0-20211109043139-026bd182f079 // indirect
101-
k8s.io/utils v0.0.0-20210820185131-d34e5cb4466e // indirect
102-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
103-
sigs.k8s.io/yaml v1.2.0 // indirect
99+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
100+
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 // indirect
101+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
102+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
103+
sigs.k8s.io/yaml v1.3.0 // indirect
104104
)

0 commit comments

Comments
 (0)