diff --git a/go.mod b/go.mod index 3d30ed5a36..b3f839f342 100644 --- a/go.mod +++ b/go.mod @@ -60,14 +60,14 @@ require ( github.com/gorilla/websocket v1.5.3 github.com/jinzhu/copier v0.3.5 github.com/kubernetes-csi/csi-lib-utils v0.6.1 - github.com/longhorn/backing-image-manager v1.7.2 + github.com/longhorn/backing-image-manager v1.7.3 github.com/longhorn/backupstore v0.0.0-20250215022153-7ee3a979f2a9 github.com/longhorn/go-common-libs v0.0.0-20250215052214-151615b29f8e github.com/longhorn/go-iscsi-helper v0.0.0-20250111093313-7e1930499625 github.com/longhorn/go-spdk-helper v0.0.0-20241216160651-bcce92add55b - github.com/longhorn/longhorn-engine v1.7.2 - github.com/longhorn/longhorn-instance-manager v1.7.2 - github.com/longhorn/longhorn-share-manager v1.7.2 + github.com/longhorn/longhorn-engine v1.7.3 + github.com/longhorn/longhorn-instance-manager v1.7.3 + github.com/longhorn/longhorn-share-manager v1.7.3 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.19.1 github.com/rancher/dynamiclistener v0.6.1 diff --git a/go.sum b/go.sum index 750d27688c..5dce44d7bf 100644 --- a/go.sum +++ b/go.sum @@ -157,8 +157,8 @@ github.com/kubernetes-csi/csi-lib-utils v0.6.1 h1:+AZ58SRSRWh2vmMoWAAGcv7x6fIyBM github.com/kubernetes-csi/csi-lib-utils v0.6.1/go.mod h1:GVmlUmxZ+SUjVLXicRFjqWUUvWez0g0Y78zNV9t7KfQ= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= -github.com/longhorn/backing-image-manager v1.7.2 h1:yVu03EE3WmkNWMSdS4M8LciLJqya3nvVE7j4qHLzZ10= -github.com/longhorn/backing-image-manager v1.7.2/go.mod h1:hsntkXAMiaThQiPDulAbZCUcxKhaiDBX58HPwxa1wZs= +github.com/longhorn/backing-image-manager v1.7.3 h1:TN4MU6/kwasnZ2Yv7vguQblbos36SjKNmmPOfpSRxH8= +github.com/longhorn/backing-image-manager v1.7.3/go.mod h1:SPIOm3QvNCyeVqdPFftIvqQoIRq1u19uIaWq3GgGUXc= github.com/longhorn/backupstore v0.0.0-20250215022153-7ee3a979f2a9 h1:TDLyWqxfdLOyniw3lQy9oFcX6hVaURRSSmbNfmKGXEY= github.com/longhorn/backupstore v0.0.0-20250215022153-7ee3a979f2a9/go.mod h1:68UurOCxyLbFS/490FPo+q2G/7iJXfPwI33eNm1m3D8= github.com/longhorn/go-common-libs v0.0.0-20250215052214-151615b29f8e h1:QxJaa0Jo3yGWXrxk317mH1KJwgz7SwDldH1ec/yNEss= @@ -167,12 +167,12 @@ github.com/longhorn/go-iscsi-helper v0.0.0-20250111093313-7e1930499625 h1:d39A30 github.com/longhorn/go-iscsi-helper v0.0.0-20250111093313-7e1930499625/go.mod h1:yIm3sGRuYOw/Y3XzRhG5+3FlZBOfrU5EZOavzwL2jVs= github.com/longhorn/go-spdk-helper v0.0.0-20241216160651-bcce92add55b h1:fzyWJOiUPzwkY/VShltuhP6eUpkv6RMFqSVuVFt/Z2M= github.com/longhorn/go-spdk-helper v0.0.0-20241216160651-bcce92add55b/go.mod h1:6AU48wPwQKOJWt0M0k5KYNYH3GRtsckkwjUOASBFsd0= -github.com/longhorn/longhorn-engine v1.7.2 h1:vinyycvF8zfHQitieUZtcMR6bKjC2dPdiwEm0QVn9YM= -github.com/longhorn/longhorn-engine v1.7.2/go.mod h1:WVBJZtUcj3hMoEBJe0PsbdDQ/+9GTu2Tq/mRQc75obQ= -github.com/longhorn/longhorn-instance-manager v1.7.2 h1:tl3xq2eJ/SFNPIRyaAIQisNc46dxoe3IoqaP7nDyUCs= -github.com/longhorn/longhorn-instance-manager v1.7.2/go.mod h1:lt7LzMn3JP2jOlArYN45oeSJCmqne/s/7+goeKCZUIM= -github.com/longhorn/longhorn-share-manager v1.7.2 h1:sqK+HfAdoKiX/8V1LdrwqnTV6GhK8dcJh+vmCBnhMlI= -github.com/longhorn/longhorn-share-manager v1.7.2/go.mod h1:3ww1rB9f8H7yMWqpBOQCJ54pIuTSYMkkHyjUheDhWns= +github.com/longhorn/longhorn-engine v1.7.3 h1:0OeXrZ9T2ZjV+jEoZ91RoZm8S0OvJzGPnMiEEDu+wvc= +github.com/longhorn/longhorn-engine v1.7.3/go.mod h1:OPprXHcQ6hkKg/ea7KwHzCZ8ScI0iUPcoiveqkuh1k4= +github.com/longhorn/longhorn-instance-manager v1.7.3 h1:LrBPpfTDmAOghtqI1RNYE+Sc1f8kC08mlfLqg1NT01U= +github.com/longhorn/longhorn-instance-manager v1.7.3/go.mod h1:fPTcvk6BX2Fa82kkIO+Qt9iWwNXOl4WhkQTi8x8J9wo= +github.com/longhorn/longhorn-share-manager v1.7.3 h1:P3aMB4MMKMmexAuG53oEhkE8NTcKOrPcvTkc4++NkRY= +github.com/longhorn/longhorn-share-manager v1.7.3/go.mod h1:V0+RR1D5iNO/ZVZQWW2QRMsvRiBgcOsT97GYW5lEgfo= github.com/longhorn/types v0.0.0-20250210001806-5ef312749bee h1:Zs5aeND6m29Tr3wfYmioK9ecSJW+L6o1Xhzj7zQQSrg= github.com/longhorn/types v0.0.0-20250210001806-5ef312749bee/go.mod h1:3jHuVDtpkXQzpnp4prguDBskVRric2kmF8aSPkRJ4jw= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= diff --git a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/instance.go b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/instance.go index 6b4f67083f..f4b8105024 100644 --- a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/instance.go +++ b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/instance.go @@ -470,7 +470,7 @@ func (c *InstanceServiceClient) VersionGet() (*meta.VersionOutput, error) { }, nil } -// LogSetLevel sets the log level of the service. +// LogSetLevel sets the log level. func (c *InstanceServiceClient) LogSetLevel(dataEngine, service, level string) error { client := c.getControllerServiceClient() ctx, cancel := context.WithTimeout(context.Background(), types.GRPCServiceTimeout) @@ -488,7 +488,7 @@ func (c *InstanceServiceClient) LogSetLevel(dataEngine, service, level string) e return err } -// LogSetFlags sets the log flags of the service.x +// LogSetFlags sets the log flags. func (c *InstanceServiceClient) LogSetFlags(dataEngine, service, flags string) error { client := c.getControllerServiceClient() ctx, cancel := context.WithTimeout(context.Background(), types.GRPCServiceTimeout) @@ -506,7 +506,7 @@ func (c *InstanceServiceClient) LogSetFlags(dataEngine, service, flags string) e return err } -// LogGetLevel returns the log level of the service. +// LogGetLevel returns the log level. func (c *InstanceServiceClient) LogGetLevel(dataEngine, service string) (string, error) { client := c.getControllerServiceClient() ctx, cancel := context.WithTimeout(context.Background(), types.GRPCServiceTimeout) @@ -526,7 +526,7 @@ func (c *InstanceServiceClient) LogGetLevel(dataEngine, service string) (string, return resp.Level, nil } -// LogGetFlags returns the log flags of the service. +// LogGetFlags returns the log flags. func (c *InstanceServiceClient) LogGetFlags(dataEngine, service string) (string, error) { client := c.getControllerServiceClient() ctx, cancel := context.WithTimeout(context.Background(), types.GRPCServiceTimeout) diff --git a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_backup.go b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_backup.go index 2bb97e53f3..1334e74641 100644 --- a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_backup.go +++ b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_backup.go @@ -182,36 +182,6 @@ func (c *ProxyClient) BackupRestore(dataEngine, engineName, volumeName, serviceA return nil } -func (c *ProxyClient) BackupRestoreFinish(dataEngine, engineName, volumeName, serviceAddress string) error { - input := map[string]string{ - "engineName": engineName, - "volumeName": volumeName, - "serviceAddress": serviceAddress, - } - if err := validateProxyMethodParameters(input); err != nil { - return errors.Wrap(err, "failed to finishing backup restoration") - } - - driver, ok := rpc.DataEngine_value[getDataEngine(dataEngine)] - if !ok { - return fmt.Errorf("failed to finishing backup restoration: invalid data engine %v", dataEngine) - } - - req := &rpc.EngineBackupRestoreFinishRequest{ - ProxyEngineRequest: &rpc.ProxyEngineRequest{ - Address: serviceAddress, - EngineName: engineName, - // nolint:all replaced with DataEngine - BackendStoreDriver: rpc.BackendStoreDriver(driver), - DataEngine: rpc.DataEngine(driver), - // This is the name we will use for validation when communicating with the restoring engine. - VolumeName: volumeName, - }, - } - _, err := c.service.BackupRestoreFinish(getContextWithGRPCTimeout(c.ctx), req) - return err -} - func (c *ProxyClient) BackupRestoreStatus(dataEngine, engineName, volumeName, serviceAddress string) (status map[string]*BackupRestoreStatus, err error) { input := map[string]string{ "engineName": engineName, diff --git a/vendor/modules.txt b/vendor/modules.txt index 823cb7b2de..b6bfff8159 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -228,8 +228,8 @@ github.com/kubernetes-csi/csi-lib-utils/protosanitizer # github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de ## explicit github.com/liggitt/tabwriter -# github.com/longhorn/backing-image-manager v1.7.2 -## explicit; go 1.22.2 +# github.com/longhorn/backing-image-manager v1.7.3 +## explicit; go 1.22.7 github.com/longhorn/backing-image-manager/api github.com/longhorn/backing-image-manager/pkg/client github.com/longhorn/backing-image-manager/pkg/meta @@ -268,22 +268,22 @@ github.com/longhorn/go-iscsi-helper/util # github.com/longhorn/go-spdk-helper v0.0.0-20241216160651-bcce92add55b ## explicit; go 1.22.7 github.com/longhorn/go-spdk-helper/pkg/types -# github.com/longhorn/longhorn-engine v1.7.2 -## explicit; go 1.22.2 +# github.com/longhorn/longhorn-engine v1.7.3 +## explicit; go 1.22.7 github.com/longhorn/longhorn-engine/pkg/interceptor github.com/longhorn/longhorn-engine/pkg/meta github.com/longhorn/longhorn-engine/pkg/replica/client github.com/longhorn/longhorn-engine/pkg/types github.com/longhorn/longhorn-engine/pkg/util -# github.com/longhorn/longhorn-instance-manager v1.7.2 -## explicit; go 1.22.2 +# github.com/longhorn/longhorn-instance-manager v1.7.3 +## explicit; go 1.22.7 github.com/longhorn/longhorn-instance-manager/pkg/api github.com/longhorn/longhorn-instance-manager/pkg/client github.com/longhorn/longhorn-instance-manager/pkg/meta github.com/longhorn/longhorn-instance-manager/pkg/types github.com/longhorn/longhorn-instance-manager/pkg/util -# github.com/longhorn/longhorn-share-manager v1.7.2 -## explicit; go 1.22.2 +# github.com/longhorn/longhorn-share-manager v1.7.3 +## explicit; go 1.22.7 github.com/longhorn/longhorn-share-manager/pkg/client github.com/longhorn/longhorn-share-manager/pkg/types # github.com/longhorn/types v0.0.0-20250210001806-5ef312749bee