Skip to content

Commit 26ca520

Browse files
authored
[release-1.28] Bump dependencies for 1.28.3 (kubernetes#2647)
* Release 1.28.3 * Bump golangci to 1.61
1 parent a7ff712 commit 26ca520

File tree

8 files changed

+93
-90
lines changed

8 files changed

+93
-90
lines changed

.golangci.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
run:
2+
concurrency: 2
23
timeout: 10m0s
34
linters:
45
enable:
56
- gofmt
67
output:
7-
format: line-number
8+
formats:
9+
 - format: line-number
10+
 path: stdout

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ $(BUILD_CMDS): $(SOURCES)
8181
test: unit functional
8282

8383
check: work
84-
go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.0 run ./...
84+
go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0 run ./...
8585

8686
unit: work
8787
go test -tags=unit $(shell go list ./... | sed -e '/sanity/ { N; d; }' | sed -e '/tests/ {N; d;}') $(TESTARGS)

cmd/manila-csi-plugin/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func main() {
6969
Short: "CSI Manila driver",
7070
Run: func(cmd *cobra.Command, args []string) {
7171
if err := validateShareProtocolSelector(protoSelector); err != nil {
72-
klog.Fatalf(err.Error())
72+
klog.Fatal(err.Error())
7373
}
7474

7575
manilaClientBuilder := &manilaclient.ClientBuilder{UserAgent: "manila-csi-plugin", ExtraUserAgentData: userAgentData}

go.mod

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -20,39 +20,39 @@ require (
2020
github.com/spf13/pflag v1.0.5
2121
github.com/spf13/viper v1.15.0
2222
github.com/stretchr/testify v1.8.2
23-
golang.org/x/net v0.17.0
24-
golang.org/x/sys v0.13.0
25-
golang.org/x/term v0.13.0
23+
golang.org/x/net v0.23.0
24+
golang.org/x/sys v0.18.0
25+
golang.org/x/term v0.18.0
2626
google.golang.org/grpc v1.56.3
27-
google.golang.org/protobuf v1.31.0
27+
google.golang.org/protobuf v1.33.0
2828
gopkg.in/gcfg.v1 v1.2.3
2929
gopkg.in/godo.v2 v2.0.9
3030
gopkg.in/yaml.v2 v2.4.0
31-
k8s.io/api v0.28.4
32-
k8s.io/apimachinery v0.28.4
33-
k8s.io/apiserver v0.28.4
34-
k8s.io/client-go v0.28.4
35-
k8s.io/cloud-provider v0.28.4
36-
k8s.io/component-base v0.28.4
31+
k8s.io/api v0.28.14
32+
k8s.io/apimachinery v0.28.14
33+
k8s.io/apiserver v0.28.14
34+
k8s.io/client-go v0.28.14
35+
k8s.io/cloud-provider v0.28.14
36+
k8s.io/component-base v0.28.14
3737
k8s.io/klog/v2 v2.100.1
38-
k8s.io/kms v0.28.4
39-
k8s.io/kubernetes v1.28.4
40-
k8s.io/mount-utils v0.28.4
38+
k8s.io/kms v0.28.14
39+
k8s.io/kubernetes v1.28.14
40+
k8s.io/mount-utils v0.28.14
4141
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
4242
software.sslmate.com/src/go-pkcs12 v0.2.0
4343
)
4444

4545
// the below fixes the "go list -m all" execution
4646
replace (
47-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.4
48-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.4
49-
k8s.io/endpointslice => k8s.io/endpointslice v0.28.4
50-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.4
51-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.4
52-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.4
53-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.4
54-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.4
55-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.4
47+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.14
48+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.14
49+
k8s.io/endpointslice => k8s.io/endpointslice v0.28.14
50+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.14
51+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.14
52+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.14
53+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.14
54+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.14
55+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.14
5656
)
5757

5858
require (
@@ -81,7 +81,7 @@ require (
8181
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
8282
github.com/gogo/protobuf v1.3.2 // indirect
8383
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
84-
github.com/golang/protobuf v1.5.3 // indirect
84+
github.com/golang/protobuf v1.5.4 // indirect
8585
github.com/google/cel-go v0.16.1 // indirect
8686
github.com/google/gnostic-models v0.6.8 // indirect
8787
github.com/google/go-cmp v0.5.9 // indirect
@@ -136,13 +136,13 @@ require (
136136
go.uber.org/atomic v1.10.0 // indirect
137137
go.uber.org/multierr v1.11.0 // indirect
138138
go.uber.org/zap v1.24.0 // indirect
139-
golang.org/x/crypto v0.14.0 // indirect
139+
golang.org/x/crypto v0.21.0 // indirect
140140
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
141141
golang.org/x/oauth2 v0.8.0 // indirect
142-
golang.org/x/sync v0.2.0 // indirect
143-
golang.org/x/text v0.13.0 // indirect
142+
golang.org/x/sync v0.5.0 // indirect
143+
golang.org/x/text v0.14.0 // indirect
144144
golang.org/x/time v0.3.0 // indirect
145-
golang.org/x/tools v0.8.0 // indirect
145+
golang.org/x/tools v0.16.1 // indirect
146146
google.golang.org/appengine v1.6.7 // indirect
147147
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
148148
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
@@ -152,14 +152,14 @@ require (
152152
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
153153
gopkg.in/warnings.v0 v0.1.2 // indirect
154154
gopkg.in/yaml.v3 v3.0.1 // indirect
155-
k8s.io/apiextensions-apiserver v0.28.4 // indirect
156-
k8s.io/component-helpers v0.28.4 // indirect
157-
k8s.io/controller-manager v0.28.4 // indirect
158-
k8s.io/csi-translation-lib v0.28.4 // indirect
155+
k8s.io/apiextensions-apiserver v0.28.14 // indirect
156+
k8s.io/component-helpers v0.28.14 // indirect
157+
k8s.io/controller-manager v0.28.14 // indirect
158+
k8s.io/csi-translation-lib v0.28.14 // indirect
159159
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
160-
k8s.io/kubectl v0.28.4 // indirect
161-
k8s.io/kubelet v0.28.4 // indirect
162-
k8s.io/pod-security-admission v0.28.4 // indirect
160+
k8s.io/kubectl v0.28.14 // indirect
161+
k8s.io/kubelet v0.28.14 // indirect
162+
k8s.io/pod-security-admission v0.28.14 // indirect
163163
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
164164
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
165165
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect

0 commit comments

Comments
 (0)