Skip to content

Commit 5897073

Browse files
Sync kctrl CLI module dependencies with main module. (#1687)
* Sync kctrl CLI module dependencies with main module. Signed-off-by: Grigoriy Tchiflidjanov <[email protected]> * Change CLI module name to follow main module. Bumping Go version to 1.23.6 Signed-off-by: Grigoriy Tchiflidjanov <[email protected]> --------- Signed-off-by: Grigoriy Tchiflidjanov <[email protected]> Co-authored-by: Grigoriy Tchiflidjanov <[email protected]>
1 parent d9a094c commit 5897073

File tree

1,656 files changed

+144577
-65823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,656 files changed

+144577
-65823
lines changed

cli/cmd/kctrl/kctrl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ package main
66
import (
77
"os"
88

9+
"carvel.dev/kapp-controller/cli/pkg/kctrl/cmd"
910
"github.com/cppforlife/cobrautil"
1011
uierrs "github.com/cppforlife/go-cli-ui/errors"
1112
"github.com/cppforlife/go-cli-ui/ui"
12-
"github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd"
1313

1414
// Import to initialize client auth plugins.
1515
_ "k8s.io/client-go/plugin/pkg/client/auth"

cli/go.mod

Lines changed: 53 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,91 @@
1-
module github.com/vmware-tanzu/carvel-kapp-controller/cli
1+
module carvel.dev/kapp-controller/cli
22

3-
go 1.21
3+
go 1.23.6
44

55
require (
6+
carvel.dev/kapp-controller v0.55.0
7+
carvel.dev/vendir v0.43.0
68
github.com/cppforlife/cobrautil v0.0.0-20221130162803-acdfead391ef
79
github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835
810
github.com/cppforlife/go-cli-ui v0.0.0-20220520125801-e45d9169a663
911
github.com/getkin/kin-openapi v0.81.0
10-
github.com/google/gnostic v0.5.7-v3refs
11-
github.com/google/go-containerregistry v0.13.0
12+
github.com/google/gnostic-models v0.6.8
13+
github.com/google/go-containerregistry v0.20.2
1214
github.com/k14s/difflib v0.0.0-20201117154628-0c031775bf57
1315
github.com/mitchellh/go-wordwrap v1.0.1
1416
github.com/otiai10/copy v1.2.0
15-
github.com/spf13/cobra v1.6.1
17+
github.com/spf13/cobra v1.8.1
1618
github.com/spf13/pflag v1.0.5
17-
github.com/stretchr/testify v1.8.1
18-
github.com/vmware-tanzu/carvel-kapp-controller v0.46.0
19-
github.com/vmware-tanzu/carvel-vendir v0.33.1
19+
github.com/stretchr/testify v1.10.0
2020
gopkg.in/yaml.v2 v2.4.0
2121
gopkg.in/yaml.v3 v3.0.1
22-
k8s.io/api v0.26.1
23-
k8s.io/apiextensions-apiserver v0.26.1
24-
k8s.io/apimachinery v0.26.1
25-
k8s.io/client-go v0.26.1
26-
sigs.k8s.io/controller-runtime v0.14.5
27-
sigs.k8s.io/yaml v1.3.0
22+
k8s.io/api v0.30.1
23+
k8s.io/apiextensions-apiserver v0.30.1
24+
k8s.io/apimachinery v0.30.1
25+
k8s.io/client-go v0.30.1
26+
sigs.k8s.io/controller-runtime v0.18.5
27+
sigs.k8s.io/yaml v1.4.0
2828
)
2929

3030
require (
3131
github.com/beorn7/perks v1.0.1 // indirect
32-
github.com/carvel-dev/semver/v4 v4.0.1-0.20230221220520-8090ce423695 // indirect
33-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
34-
github.com/creack/pty v1.1.11 // indirect
32+
github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4 // indirect
33+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3534
github.com/davecgh/go-spew v1.1.1 // indirect
36-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
37-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
38-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
39-
github.com/fsnotify/fsnotify v1.6.0 // indirect
35+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
36+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
37+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
38+
github.com/fsnotify/fsnotify v1.7.0 // indirect
4039
github.com/ghodss/yaml v1.0.0 // indirect
41-
github.com/go-logr/logr v1.2.3 // indirect
42-
github.com/go-logr/zapr v1.2.3 // indirect
43-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
44-
github.com/go-openapi/jsonreference v0.20.0 // indirect
45-
github.com/go-openapi/swag v0.19.15 // indirect
40+
github.com/go-logr/logr v1.4.1 // indirect
41+
github.com/go-logr/zapr v1.3.0 // indirect
42+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
43+
github.com/go-openapi/jsonreference v0.20.2 // indirect
44+
github.com/go-openapi/swag v0.22.3 // indirect
4645
github.com/gogo/protobuf v1.3.2 // indirect
4746
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
48-
github.com/golang/protobuf v1.5.2 // indirect
49-
github.com/google/go-cmp v0.5.9 // indirect
47+
github.com/golang/protobuf v1.5.4 // indirect
48+
github.com/google/go-cmp v0.6.0 // indirect
5049
github.com/google/gofuzz v1.2.0 // indirect
51-
github.com/google/uuid v1.2.0 // indirect
52-
github.com/hashicorp/go-version v1.3.0 // indirect
50+
github.com/google/uuid v1.3.0 // indirect
51+
github.com/hashicorp/go-version v1.2.1 // indirect
5352
github.com/imdario/mergo v0.3.12 // indirect
54-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
53+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5554
github.com/josharian/intern v1.0.0 // indirect
5655
github.com/json-iterator/go v1.1.12 // indirect
5756
github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115 // indirect
58-
github.com/mailru/easyjson v0.7.6 // indirect
59-
github.com/mattn/go-colorable v0.1.12 // indirect
60-
github.com/mattn/go-isatty v0.0.17 // indirect
61-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
57+
github.com/mailru/easyjson v0.7.7 // indirect
58+
github.com/mattn/go-colorable v0.1.13 // indirect
59+
github.com/mattn/go-isatty v0.0.20 // indirect
60+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
6261
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6362
github.com/modern-go/reflect2 v1.0.2 // indirect
6463
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6564
github.com/opencontainers/go-digest v1.0.0 // indirect
6665
github.com/pkg/errors v0.9.1 // indirect
6766
github.com/pmezard/go-difflib v1.0.0 // indirect
68-
github.com/prometheus/client_golang v1.14.0 // indirect
69-
github.com/prometheus/client_model v0.3.0 // indirect
70-
github.com/prometheus/common v0.37.0 // indirect
71-
github.com/prometheus/procfs v0.8.0 // indirect
67+
github.com/prometheus/client_golang v1.18.0 // indirect
68+
github.com/prometheus/client_model v0.5.0 // indirect
69+
github.com/prometheus/common v0.45.0 // indirect
70+
github.com/prometheus/procfs v0.12.0 // indirect
7271
github.com/vito/go-interact v1.0.1 // indirect
73-
go.uber.org/atomic v1.7.0 // indirect
74-
go.uber.org/multierr v1.6.0 // indirect
75-
go.uber.org/zap v1.24.0 // indirect
76-
golang.org/x/crypto v0.21.0 // indirect
77-
golang.org/x/net v0.23.0 // indirect
78-
golang.org/x/oauth2 v0.1.0 // indirect
79-
golang.org/x/sys v0.18.0 // indirect
80-
golang.org/x/term v0.18.0 // indirect
81-
golang.org/x/text v0.14.0 // indirect
72+
go.uber.org/multierr v1.11.0 // indirect
73+
go.uber.org/zap v1.26.0 // indirect
74+
golang.org/x/crypto v0.28.0 // indirect
75+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
76+
golang.org/x/net v0.30.0 // indirect
77+
golang.org/x/oauth2 v0.12.0 // indirect
78+
golang.org/x/sys v0.27.0 // indirect
79+
golang.org/x/term v0.25.0 // indirect
80+
golang.org/x/text v0.19.0 // indirect
8281
golang.org/x/time v0.3.0 // indirect
83-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
82+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
8483
google.golang.org/appengine v1.6.7 // indirect
8584
google.golang.org/protobuf v1.33.0 // indirect
8685
gopkg.in/inf.v0 v0.9.1 // indirect
87-
k8s.io/component-base v0.26.1 // indirect
88-
k8s.io/klog/v2 v2.90.1 // indirect
89-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
90-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
91-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
92-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
86+
k8s.io/klog/v2 v2.120.1 // indirect
87+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
88+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
89+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
90+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
9391
)
94-
95-
replace github.com/spf13/cobra => github.com/spf13/cobra v1.1.1

0 commit comments

Comments
 (0)