Skip to content

Commit

Permalink
[release-1.28] Bump dependencies for 1.28.3 (#2647)
Browse files Browse the repository at this point in the history
* Release 1.28.3

* Bump golangci to 1.61
  • Loading branch information
kayrus authored Sep 17, 2024
1 parent a7ff712 commit 26ca520
Show file tree
Hide file tree
Showing 8 changed files with 93 additions and 90 deletions.
5 changes: 4 additions & 1 deletion .golangci.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
run:
concurrency: 2
timeout: 10m0s
linters:
enable:
- gofmt
output:
format: line-number
formats:
 - format: line-number
 path: stdout
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ $(BUILD_CMDS): $(SOURCES)
test: unit functional

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

unit: work
go test -tags=unit $(shell go list ./... | sed -e '/sanity/ { N; d; }' | sed -e '/tests/ {N; d;}') $(TESTARGS)
Expand Down
2 changes: 1 addition & 1 deletion cmd/manila-csi-plugin/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func main() {
Short: "CSI Manila driver",
Run: func(cmd *cobra.Command, args []string) {
if err := validateShareProtocolSelector(protoSelector); err != nil {
klog.Fatalf(err.Error())
klog.Fatal(err.Error())
}

manilaClientBuilder := &manilaclient.ClientBuilder{UserAgent: "manila-csi-plugin", ExtraUserAgentData: userAgentData}
Expand Down
68 changes: 34 additions & 34 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,39 +20,39 @@ require (
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.15.0
github.com/stretchr/testify v1.8.2
golang.org/x/net v0.17.0
golang.org/x/sys v0.13.0
golang.org/x/term v0.13.0
golang.org/x/net v0.23.0
golang.org/x/sys v0.18.0
golang.org/x/term v0.18.0
google.golang.org/grpc v1.56.3
google.golang.org/protobuf v1.31.0
google.golang.org/protobuf v1.33.0
gopkg.in/gcfg.v1 v1.2.3
gopkg.in/godo.v2 v2.0.9
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.28.4
k8s.io/apimachinery v0.28.4
k8s.io/apiserver v0.28.4
k8s.io/client-go v0.28.4
k8s.io/cloud-provider v0.28.4
k8s.io/component-base v0.28.4
k8s.io/api v0.28.14
k8s.io/apimachinery v0.28.14
k8s.io/apiserver v0.28.14
k8s.io/client-go v0.28.14
k8s.io/cloud-provider v0.28.14
k8s.io/component-base v0.28.14
k8s.io/klog/v2 v2.100.1
k8s.io/kms v0.28.4
k8s.io/kubernetes v1.28.4
k8s.io/mount-utils v0.28.4
k8s.io/kms v0.28.14
k8s.io/kubernetes v1.28.14
k8s.io/mount-utils v0.28.14
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
software.sslmate.com/src/go-pkcs12 v0.2.0
)

// the below fixes the "go list -m all" execution
replace (
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.4
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.4
k8s.io/endpointslice => k8s.io/endpointslice v0.28.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.14
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.14
k8s.io/endpointslice => k8s.io/endpointslice v0.28.14
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.14
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.14
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.14
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.14
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.14
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.14
)

require (
Expand Down Expand Up @@ -81,7 +81,7 @@ require (
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/cel-go v0.16.1 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
Expand Down Expand Up @@ -136,13 +136,13 @@ require (
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.8.0 // indirect
golang.org/x/tools v0.16.1 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
Expand All @@ -152,14 +152,14 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.28.4 // indirect
k8s.io/component-helpers v0.28.4 // indirect
k8s.io/controller-manager v0.28.4 // indirect
k8s.io/csi-translation-lib v0.28.4 // indirect
k8s.io/apiextensions-apiserver v0.28.14 // indirect
k8s.io/component-helpers v0.28.14 // indirect
k8s.io/controller-manager v0.28.14 // indirect
k8s.io/csi-translation-lib v0.28.14 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/kubectl v0.28.4 // indirect
k8s.io/kubelet v0.28.4 // indirect
k8s.io/pod-security-admission v0.28.4 // indirect
k8s.io/kubectl v0.28.14 // indirect
k8s.io/kubelet v0.28.14 // indirect
k8s.io/pod-security-admission v0.28.14 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
Expand Down
Loading

0 comments on commit 26ca520

Please sign in to comment.