Skip to content

Commit 0b156cb

Browse files
authored
Merge pull request #629 from ash2k/update-dependencies
Update k8s.io dependencies to v0.27.2
2 parents 68ab772 + 8964a66 commit 0b156cb

File tree

11 files changed

+159
-495
lines changed

11 files changed

+159
-495
lines changed

.golangci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
run:
5-
deadline: 5m
5+
deadline: 30m
66

77
linters:
88
# please, do not use `enable-all`: it's deprecated and will be removed soon.
99
# inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
1010
disable-all: true
1111
enable:
1212
- bodyclose
13-
- depguard
13+
# - depguard
1414
- dogsled
1515
- dupl
1616
- errcheck
@@ -53,4 +53,5 @@ issues:
5353
# it can be disabled by `exclude-use-default: false`. To list all
5454
# excluded by default patterns execute `golangci-lint run --help`
5555
exclude:
56-
- Using the variable on range scope `tc` in function literal
56+
- "Using the variable on range scope `tc` in function literal"
57+
- "unused-parameter: parameter"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ all: generate license fix vet fmt test lint tidy
1616
go install github.com/google/[email protected]
1717

1818
"$(MYGOBIN)/golangci-lint":
19-
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50.0
19+
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.3
2020

2121
"$(MYGOBIN)/deepcopy-gen":
2222
go install k8s.io/code-generator/cmd/[email protected]

cmd/diff/cmddiff.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88

99
"github.com/spf13/cobra"
1010
"k8s.io/cli-runtime/pkg/genericclioptions"
11-
"k8s.io/cli-runtime/pkg/resource"
1211
"k8s.io/klog/v2"
1312
"k8s.io/kubectl/pkg/cmd/diff"
1413
"k8s.io/kubectl/pkg/cmd/util"
@@ -84,8 +83,6 @@ func Initialize(o *diff.DiffOptions, f util.Factory, args []string) (func(), err
8483
return cleanupFunc, err
8584
}
8685

87-
o.DryRunVerifier = resource.NewQueryParamVerifier(o.DynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
88-
8986
o.CmdNamespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace()
9087
if err != nil {
9188
return cleanupFunc, err

go.mod

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ go 1.18
55
require (
66
github.com/google/go-cmp v0.5.9
77
github.com/google/uuid v1.3.0
8-
github.com/onsi/ginkgo/v2 v2.7.0
9-
github.com/onsi/gomega v1.24.2
10-
github.com/spf13/cobra v1.6.1
11-
github.com/spyzhov/ajson v0.7.2
12-
github.com/stretchr/testify v1.8.1
8+
github.com/onsi/ginkgo/v2 v2.11.0
9+
github.com/onsi/gomega v1.27.10
10+
github.com/spf13/cobra v1.7.0
11+
github.com/spyzhov/ajson v0.9.0
12+
github.com/stretchr/testify v1.8.4
1313
gopkg.in/yaml.v3 v3.0.1
14-
k8s.io/api v0.26.0
15-
k8s.io/apiextensions-apiserver v0.26.0
16-
k8s.io/apimachinery v0.26.0
17-
k8s.io/cli-runtime v0.26.0
18-
k8s.io/client-go v0.26.0
19-
k8s.io/component-base v0.26.0
20-
k8s.io/klog/v2 v2.80.1
21-
k8s.io/kubectl v0.26.0
22-
k8s.io/utils v0.0.0-20230115233650-391b47cb4029
23-
sigs.k8s.io/controller-runtime v0.14.1
24-
sigs.k8s.io/kustomize/kyaml v0.13.9
14+
k8s.io/api v0.27.2
15+
k8s.io/apiextensions-apiserver v0.27.2
16+
k8s.io/apimachinery v0.27.2
17+
k8s.io/cli-runtime v0.27.2
18+
k8s.io/client-go v0.27.2
19+
k8s.io/component-base v0.27.2
20+
k8s.io/klog/v2 v2.90.1
21+
k8s.io/kubectl v0.27.2
22+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
23+
sigs.k8s.io/controller-runtime v0.15.0
24+
sigs.k8s.io/kustomize/kyaml v0.14.1
2525
sigs.k8s.io/yaml v1.3.0
2626
)
2727

@@ -30,7 +30,7 @@ require (
3030
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3131
github.com/beorn7/perks v1.0.1 // indirect
3232
github.com/blang/semver/v4 v4.0.0 // indirect
33-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
33+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3434
github.com/chai2010/gettext-go v1.0.2 // indirect
3535
github.com/davecgh/go-spew v1.1.1 // indirect
3636
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
@@ -41,57 +41,60 @@ require (
4141
github.com/fsnotify/fsnotify v1.6.0 // indirect
4242
github.com/fvbommel/sortorder v1.0.1 // indirect
4343
github.com/go-errors/errors v1.4.2 // indirect
44-
github.com/go-logr/logr v1.2.3 // indirect
45-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
46-
github.com/go-openapi/jsonreference v0.20.0 // indirect
44+
github.com/go-logr/logr v1.2.4 // indirect
45+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
46+
github.com/go-openapi/jsonreference v0.20.1 // indirect
4747
github.com/go-openapi/swag v0.22.3 // indirect
48+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
4849
github.com/gogo/protobuf v1.3.2 // indirect
4950
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
50-
github.com/golang/protobuf v1.5.2 // indirect
51+
github.com/golang/protobuf v1.5.3 // indirect
5152
github.com/google/btree v1.0.1 // indirect
5253
github.com/google/gnostic v0.5.7-v3refs // indirect
5354
github.com/google/gofuzz v1.1.0 // indirect
55+
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
5456
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
5557
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
5658
github.com/imdario/mergo v0.3.12 // indirect
57-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
59+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5860
github.com/jonboulle/clockwork v0.2.2 // indirect
5961
github.com/josharian/intern v1.0.0 // indirect
6062
github.com/json-iterator/go v1.1.12 // indirect
6163
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
6264
github.com/mailru/easyjson v0.7.7 // indirect
63-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
65+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
6466
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
6567
github.com/moby/spdystream v0.2.0 // indirect
66-
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
68+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
6769
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6870
github.com/modern-go/reflect2 v1.0.2 // indirect
6971
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
7072
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7173
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7274
github.com/pkg/errors v0.9.1 // indirect
7375
github.com/pmezard/go-difflib v1.0.0 // indirect
74-
github.com/prometheus/client_golang v1.14.0 // indirect
75-
github.com/prometheus/client_model v0.3.0 // indirect
76-
github.com/prometheus/common v0.37.0 // indirect
77-
github.com/prometheus/procfs v0.8.0 // indirect
76+
github.com/prometheus/client_golang v1.15.1 // indirect
77+
github.com/prometheus/client_model v0.4.0 // indirect
78+
github.com/prometheus/common v0.42.0 // indirect
79+
github.com/prometheus/procfs v0.9.0 // indirect
7880
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7981
github.com/spf13/pflag v1.0.5 // indirect
8082
github.com/xlab/treeprint v1.1.0 // indirect
8183
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
82-
golang.org/x/net v0.4.0 // indirect
83-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
84-
golang.org/x/sys v0.3.0 // indirect
85-
golang.org/x/term v0.3.0 // indirect
86-
golang.org/x/text v0.5.0 // indirect
84+
golang.org/x/net v0.12.0 // indirect
85+
golang.org/x/oauth2 v0.5.0 // indirect
86+
golang.org/x/sys v0.10.0 // indirect
87+
golang.org/x/term v0.10.0 // indirect
88+
golang.org/x/text v0.11.0 // indirect
8789
golang.org/x/time v0.3.0 // indirect
88-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
90+
golang.org/x/tools v0.9.3 // indirect
91+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
8992
google.golang.org/appengine v1.6.7 // indirect
90-
google.golang.org/protobuf v1.28.1 // indirect
93+
google.golang.org/protobuf v1.30.0 // indirect
9194
gopkg.in/inf.v0 v0.9.1 // indirect
9295
gopkg.in/yaml.v2 v2.4.0 // indirect
93-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
94-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
95-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
96+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
97+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
98+
sigs.k8s.io/kustomize/api v0.13.2 // indirect
9699
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
97100
)

0 commit comments

Comments
 (0)