Skip to content

Commit 47c6ea0

Browse files
author
Ariel Kass
committed
another update of 3rd party dependencies
1 parent 924245f commit 47c6ea0

File tree

62 files changed

+3792
-715
lines changed

Some content is hidden

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

62 files changed

+3792
-715
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@ dockerx-build-and-push-multi-arch: test
112112
# Download controller-gen locally if necessary
113113
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
114114
controller-gen:
115-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.10.0)
115+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.2)
116116

117117
# Download kustomize locally if necessary
118118
KUSTOMIZE = $(shell pwd)/bin/kustomize
119119
kustomize:
120-
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])
120+
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])
121121

122122
# go-get-tool will 'go get' any package $2 and install it to $1.
123123
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))

‎controllers/replication/replication.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ limitations under the License.
1717
package replication
1818

1919
import (
20-
"github.com/csi-addons/volume-replication-operator/pkg/client"
2120
replicationlib "github.com/csi-addons/spec/lib/go/replication"
21+
"github.com/csi-addons/volume-replication-operator/pkg/client"
2222
"google.golang.org/grpc/codes"
2323
"google.golang.org/grpc/status"
2424
)
@@ -37,11 +37,11 @@ type Response struct {
3737

3838
// CommonRequestParameters holds the common parameters across replication operations.
3939
type CommonRequestParameters struct {
40-
ReplicationSource *replicationlib.ReplicationSource
41-
ReplicationID string
42-
Parameters map[string]string
43-
Secrets map[string]string
44-
Replication client.VolumeReplication
40+
ReplicationSource *replicationlib.ReplicationSource
41+
ReplicationID string
42+
Parameters map[string]string
43+
Secrets map[string]string
44+
Replication client.VolumeReplication
4545
}
4646

4747
func (r *Replication) Enable() *Response {

‎controllers/suite_test.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ import (
2020
"path/filepath"
2121
"testing"
2222

23-
. "github.com/onsi/ginkgo"
23+
. "github.com/onsi/ginkgo/v2"
2424
. "github.com/onsi/gomega"
2525
"k8s.io/client-go/kubernetes/scheme"
2626
"sigs.k8s.io/controller-runtime/pkg/client"
2727
"sigs.k8s.io/controller-runtime/pkg/envtest"
28-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2928
logf "sigs.k8s.io/controller-runtime/pkg/log"
3029
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3130

@@ -45,9 +44,7 @@ func TestAPIs(t *testing.T) {
4544
t.Parallel()
4645
RegisterFailHandler(Fail)
4746

48-
RunSpecsWithDefaultAndCustomReporters(t,
49-
"Controller Suite",
50-
[]Reporter{printer.NewlineReporter{}})
47+
RunSpecs(t, "Controller Suite")
5148
}
5249

5350
var _ = BeforeSuite(func() {

‎go.mod‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/csi-addons/volume-replication-operator
22

3-
go 1.23
3+
go 1.23.0
4+
5+
toolchain go1.23.5
46

57
require (
68
github.com/IBM/csi-volume-group-operator v0.9.1
@@ -15,7 +17,7 @@ require (
1517
k8s.io/api v0.32.2
1618
k8s.io/apimachinery v0.32.2
1719
k8s.io/client-go v0.32.2
18-
sigs.k8s.io/controller-runtime v0.19.0
20+
sigs.k8s.io/controller-runtime v0.20.2
1921
)
2022

2123
require (
@@ -36,6 +38,7 @@ require (
3638
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3739
github.com/gogo/protobuf v1.3.2 // indirect
3840
github.com/golang/protobuf v1.5.4 // indirect
41+
github.com/google/btree v1.1.3 // indirect
3942
github.com/google/gnostic-models v0.6.8 // indirect
4043
github.com/google/go-cmp v0.6.0 // indirect
4144
github.com/google/gofuzz v1.2.0 // indirect
@@ -60,9 +63,9 @@ require (
6063
go.opentelemetry.io/otel/metric v1.32.0 // indirect
6164
go.opentelemetry.io/otel/trace v1.32.0 // indirect
6265
go.uber.org/multierr v1.11.0 // indirect
63-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
6466
golang.org/x/net v0.33.0 // indirect
6567
golang.org/x/oauth2 v0.24.0 // indirect
68+
golang.org/x/sync v0.10.0 // indirect
6669
golang.org/x/sys v0.28.0 // indirect
6770
golang.org/x/term v0.27.0 // indirect
6871
golang.org/x/text v0.21.0 // indirect

‎go.sum‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
4646
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
4747
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
4848
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
49+
github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
50+
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
4951
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
5052
github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
5153
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -137,8 +139,6 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
137139
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
138140
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
139141
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
140-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
141-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
142142
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
143143
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
144144
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -152,6 +152,8 @@ golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbht
152152
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
153153
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
154154
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
155+
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
156+
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
155157
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
156158
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
157159
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -209,8 +211,8 @@ k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJ
209211
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
210212
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
211213
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
212-
sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q=
213-
sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
214+
sigs.k8s.io/controller-runtime v0.20.2 h1:/439OZVxoEc02psi1h4QO3bHzTgu49bb347Xp4gW1pc=
215+
sigs.k8s.io/controller-runtime v0.20.2/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
214216
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
215217
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
216218
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=

‎main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
ctrl "sigs.k8s.io/controller-runtime"
3636
"sigs.k8s.io/controller-runtime/pkg/healthz"
3737
"sigs.k8s.io/controller-runtime/pkg/log/zap"
38+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
3839

3940
replicationv1alpha1 "github.com/csi-addons/volume-replication-operator/api/v1alpha1"
4041
"github.com/csi-addons/volume-replication-operator/controllers"
@@ -124,8 +125,7 @@ func main() {
124125

125126
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
126127
Scheme: scheme,
127-
MetricsBindAddress: metricsAddr,
128-
Port: 9443,
128+
Metrics: metricsserver.Options{BindAddress: metricsAddr},
129129
HealthProbeBindAddress: probeAddr,
130130
LeaderElectionResourceLock: "leases",
131131
LeaderElection: enableLeaderElection,

‎pkg/client/client.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,16 @@ type Client struct {
3333
}
3434

3535
// Connect to the GRPC client.
36-
func connect(address string) (*grpc.ClientConn, error) {
37-
return connection.Connect(address, metrics.NewCSIMetricsManager(""), connection.OnConnectionLoss(connection.ExitOnConnectionLoss()))
36+
func connect(address string, timeout time.Duration) (*grpc.ClientConn, error) {
37+
ctx, cancel := context.WithTimeout(context.Background(), timeout)
38+
defer cancel()
39+
return connection.Connect(ctx, address, metrics.NewCSIMetricsManager(""), connection.OnConnectionLoss(connection.ExitOnConnectionLoss()))
3840
}
3941

4042
// New creates and returns the GRPC client.
4143
func New(address string, timeout time.Duration) (*Client, error) {
4244
c := &Client{}
43-
cc, err := connect(address)
45+
cc, err := connect(address, timeout)
4446
if err != nil {
4547
return c, err
4648
}
@@ -52,7 +54,9 @@ func New(address string, timeout time.Duration) (*Client, error) {
5254

5355
// Probe the GRPC client once.
5456
func (c *Client) Probe() error {
55-
return rpc.ProbeForever(c.Client, c.Timeout)
57+
ctx, cancel := context.WithTimeout(context.Background(), c.Timeout)
58+
defer cancel()
59+
return rpc.ProbeForever(ctx, c.Client, c.Timeout)
5660
}
5761

5862
// GetDriverName gets the driver name from the driver.

‎pkg/client/replication-client.go‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ func NewReplicationClient(cc *grpc.ClientConn, timeout time.Duration) VolumeRepl
5656
func (rc *replicationClient) EnableVolumeReplication(replicationSource *replicationlib.ReplicationSource, replicationID string,
5757
secrets, parameters map[string]string) (*replicationlib.EnableVolumeReplicationResponse, error) {
5858
req := &replicationlib.EnableVolumeReplicationRequest{
59-
ReplicationSource: replicationSource,
60-
ReplicationId: replicationID,
61-
Parameters: parameters,
62-
Secrets: secrets,
59+
ReplicationSource: replicationSource,
60+
ReplicationId: replicationID,
61+
Parameters: parameters,
62+
Secrets: secrets,
6363
}
6464

6565
createCtx, cancel := context.WithTimeout(context.Background(), rc.timeout)
@@ -73,10 +73,10 @@ func (rc *replicationClient) EnableVolumeReplication(replicationSource *replicat
7373
func (rc *replicationClient) DisableVolumeReplication(replicationSource *replicationlib.ReplicationSource, replicationID string,
7474
secrets, parameters map[string]string) (*replicationlib.DisableVolumeReplicationResponse, error) {
7575
req := &replicationlib.DisableVolumeReplicationRequest{
76-
ReplicationSource: replicationSource,
77-
ReplicationId: replicationID,
78-
Parameters: parameters,
79-
Secrets: secrets,
76+
ReplicationSource: replicationSource,
77+
ReplicationId: replicationID,
78+
Parameters: parameters,
79+
Secrets: secrets,
8080
}
8181

8282
createCtx, cancel := context.WithTimeout(context.Background(), rc.timeout)
@@ -90,11 +90,11 @@ func (rc *replicationClient) DisableVolumeReplication(replicationSource *replica
9090
func (rc *replicationClient) PromoteVolume(replicationSource *replicationlib.ReplicationSource, replicationID string,
9191
force bool, secrets, parameters map[string]string) (*replicationlib.PromoteVolumeResponse, error) {
9292
req := &replicationlib.PromoteVolumeRequest{
93-
ReplicationSource: replicationSource,
94-
ReplicationId: replicationID,
95-
Force: force,
96-
Parameters: parameters,
97-
Secrets: secrets,
93+
ReplicationSource: replicationSource,
94+
ReplicationId: replicationID,
95+
Force: force,
96+
Parameters: parameters,
97+
Secrets: secrets,
9898
}
9999

100100
createCtx, cancel := context.WithTimeout(context.Background(), rc.timeout)
@@ -108,10 +108,10 @@ func (rc *replicationClient) PromoteVolume(replicationSource *replicationlib.Rep
108108
func (rc *replicationClient) DemoteVolume(replicationSource *replicationlib.ReplicationSource, replicationID string,
109109
secrets, parameters map[string]string) (*replicationlib.DemoteVolumeResponse, error) {
110110
req := &replicationlib.DemoteVolumeRequest{
111-
ReplicationSource: replicationSource,
112-
ReplicationId: replicationID,
113-
Parameters: parameters,
114-
Secrets: secrets,
111+
ReplicationSource: replicationSource,
112+
ReplicationId: replicationID,
113+
Parameters: parameters,
114+
Secrets: secrets,
115115
}
116116
createCtx, cancel := context.WithTimeout(context.Background(), rc.timeout)
117117
defer cancel()
@@ -124,11 +124,11 @@ func (rc *replicationClient) DemoteVolume(replicationSource *replicationlib.Repl
124124
func (rc *replicationClient) ResyncVolume(replicationSource *replicationlib.ReplicationSource, replicationID string, force bool,
125125
secrets, parameters map[string]string) (*replicationlib.ResyncVolumeResponse, error) {
126126
req := &replicationlib.ResyncVolumeRequest{
127-
ReplicationSource: replicationSource,
128-
ReplicationId: replicationID,
129-
Parameters: parameters,
130-
Force: force,
131-
Secrets: secrets,
127+
ReplicationSource: replicationSource,
128+
ReplicationId: replicationID,
129+
Parameters: parameters,
130+
Force: force,
131+
Secrets: secrets,
132132
}
133133

134134
createCtx, cancel := context.WithTimeout(context.Background(), rc.timeout)

0 commit comments

Comments
 (0)