Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade packages version #2323

Merged
merged 2 commits into from
Jan 2, 2024
Merged

Upgrade packages version #2323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81ed3f9
feat: upgrade packages version
FrankYang0529 Dec 1, 2023
336d77f
feat: add DataSourceTypeExportFromVolumeParameterFileSyncHTTPClientTi…
FrankYang0529 Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions controller/backing_image_data_source_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,12 @@ func (c *BackingImageDataSourceController) prepareRunningParameters(bids *longho
return fmt.Errorf("failed to get an available replica from volume %v during backing image %v exporting", v.Name, bids.Name)
}

fileSyncHTTPClientTimeout, err := c.ds.GetSettingAsInt(types.SettingNameReplicaFileSyncHTTPClientTimeout)
if err != nil {
return err
}
bids.Status.RunningParameters[longhorn.DataSourceTypeExportFromVolumeParameterFileSyncHTTPClientTimeout] = strconv.FormatInt(fileSyncHTTPClientTimeout, 10)

return nil
}

Expand Down
7 changes: 3 additions & 4 deletions csi/controller_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ import (
"time"

"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/golang/protobuf/ptypes"
"github.com/golang/protobuf/ptypes/timestamp"
"github.com/sirupsen/logrus"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/types/known/timestamppb"

"github.com/longhorn/longhorn-manager/datastore"
"github.com/longhorn/longhorn-manager/types"
Expand Down Expand Up @@ -1286,13 +1285,13 @@ func getVolumeCapabilityAccessModes(vc []csi.VolumeCapability_AccessMode_Mode) [
return vca
}

func toProtoTimestamp(s string) (*timestamp.Timestamp, error) {
func toProtoTimestamp(s string) (*timestamppb.Timestamp, error) {
t, err := util.ParseTimeZ(s)
if err != nil {
return nil, err
}

return ptypes.TimestampProto(t)
return timestamppb.New(t), nil
}

func (cs *ControllerServer) waitForSnapshotToBeReady(snapshotName, volumeName string) (*longhornclient.SnapshotCR, error) {
Expand Down
10 changes: 5 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,20 @@ replace (
require (
github.com/container-storage-interface/spec v1.8.0
github.com/docker/go-connections v0.4.0
github.com/golang/protobuf v1.5.3
github.com/google/uuid v1.3.0
github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket v1.5.0
github.com/jinzhu/copier v0.3.5
github.com/kubernetes-csi/csi-lib-utils v0.6.1
github.com/longhorn/backing-image-manager v1.4.0-rc1.0.20230521151917-38ff27cc2cbb
github.com/longhorn/backing-image-manager v1.4.0-rc1.0.20231226061407-a8bf86a98a90
github.com/longhorn/backupstore v0.0.0-20231229024807-ccb82ae17a0e
github.com/longhorn/go-common-libs v0.0.0-20231228082901-99ebd3318e18
github.com/longhorn/go-iscsi-helper v0.0.0-20231220091133-38e296e68ad2
github.com/longhorn/go-spdk-helper v0.0.0-20231225123608-84cedbc12ba3
github.com/longhorn/longhorn-engine v1.6.0-dev-20231217.0.20231229031622-5efed2b8a02f
github.com/longhorn/longhorn-instance-manager v1.6.0-dev-20231217.0.20231229072652-60067ae01e60
github.com/longhorn/longhorn-share-manager v1.6.0-dev-20231217.0.20231221124415-c1ae736675af
github.com/longhorn/longhorn-instance-manager v0.0.0-20240102035444-cbade98f23e1
github.com/longhorn/longhorn-share-manager v1.6.0-dev-20231217.0.20231226052309-99d57c1695ea
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.16.0
github.com/rancher/dynamiclistener v0.3.6
Expand Down Expand Up @@ -83,6 +82,7 @@ require (
require (
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/mitchellh/go-ps v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
Expand Down Expand Up @@ -187,7 +187,7 @@ require (
golang.org/x/text v0.14.0
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/protobuf v1.31.0
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,8 +1031,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.4.0-rc1.0.20230521151917-38ff27cc2cbb h1:y59M4Z8jvOowAwdXcATyHjG31ZbaMJvjIPY+SpVmeII=
github.com/longhorn/backing-image-manager v1.4.0-rc1.0.20230521151917-38ff27cc2cbb/go.mod h1:yhfIPKYbnFpRmrJOz0biNthyoyBpN4SrUk8ZQNMcW1o=
github.com/longhorn/backing-image-manager v1.4.0-rc1.0.20231226061407-a8bf86a98a90 h1:B63S6A3BZkSOn6ZnC4jg6JM8RcXZxInVz3fCEfAlNKs=
github.com/longhorn/backing-image-manager v1.4.0-rc1.0.20231226061407-a8bf86a98a90/go.mod h1:tSYqq1jTFPPbWRxT5JQpqw8PnQhFcDSU2xDRQVLjt9Q=
github.com/longhorn/backupstore v0.0.0-20231229024807-ccb82ae17a0e h1:JuR7tTd4lXNaB/IqMhOifqiPd1YbVUWhG65FL/RX/DU=
github.com/longhorn/backupstore v0.0.0-20231229024807-ccb82ae17a0e/go.mod h1:4cbJWtlrD2cGTQxQLtdlPTYopiJiusXH7CpOBrn/s3k=
github.com/longhorn/go-common-libs v0.0.0-20231228082901-99ebd3318e18 h1:rKpcDDMBybVPStct8zU6RcMeVUoeEdIldlzo5YkX898=
Expand All @@ -1043,10 +1043,10 @@ github.com/longhorn/go-spdk-helper v0.0.0-20231225123608-84cedbc12ba3 h1:RuDfgGe
github.com/longhorn/go-spdk-helper v0.0.0-20231225123608-84cedbc12ba3/go.mod h1:4KsWeze+GVhcjtIE39ho0qp0SisqYx03Ie9Qj0Bzuow=
github.com/longhorn/longhorn-engine v1.6.0-dev-20231217.0.20231229031622-5efed2b8a02f h1:WvjOdqhjZ2HXr7FN0GWSEo6a26+1EEuIsg3/pw5LrMQ=
github.com/longhorn/longhorn-engine v1.6.0-dev-20231217.0.20231229031622-5efed2b8a02f/go.mod h1:c2xk2KtroFqwewJ5TNuvCgCDRnWU4YdWo+p60TmptCc=
github.com/longhorn/longhorn-instance-manager v1.6.0-dev-20231217.0.20231229072652-60067ae01e60 h1:EUTWsdxEkaNrXHFAGjc4yZBGk8nslNN647b0leqPNOc=
github.com/longhorn/longhorn-instance-manager v1.6.0-dev-20231217.0.20231229072652-60067ae01e60/go.mod h1:UrlSbl7LAIrCMY7B8NHpyDnXamWu9p5jU5luYSXD6B4=
github.com/longhorn/longhorn-share-manager v1.6.0-dev-20231217.0.20231221124415-c1ae736675af h1:ZBNJDxX/Dk9Q/1xj8naoopX2l3a76AgY0THXUqB0e9E=
github.com/longhorn/longhorn-share-manager v1.6.0-dev-20231217.0.20231221124415-c1ae736675af/go.mod h1:sDo6d4FV5nALnXkZHRY31H6R6KTK0LNo0kMVULlhYiE=
github.com/longhorn/longhorn-instance-manager v0.0.0-20240102035444-cbade98f23e1 h1:9EFqKctA1jOQzyRyHnwNzqaHK1DjVkxNFWzyUg7cwns=
github.com/longhorn/longhorn-instance-manager v0.0.0-20240102035444-cbade98f23e1/go.mod h1:UrlSbl7LAIrCMY7B8NHpyDnXamWu9p5jU5luYSXD6B4=
github.com/longhorn/longhorn-share-manager v1.6.0-dev-20231217.0.20231226052309-99d57c1695ea h1:bYNEyl0yAh76fjzTQEo7+u2G80XaVi8aXfMlwyPiZmI=
github.com/longhorn/longhorn-share-manager v1.6.0-dev-20231217.0.20231226052309-99d57c1695ea/go.mod h1:sDo6d4FV5nALnXkZHRY31H6R6KTK0LNo0kMVULlhYiE=
github.com/longhorn/longhorn-spdk-engine v0.0.0-20231225122448-779b72c5fcf8 h1:xCCeskYtBhpybefILyIHnVLxSbKmmSIuDu0KvFljwqE=
github.com/longhorn/longhorn-spdk-engine v0.0.0-20231225122448-779b72c5fcf8/go.mod h1:mOqdVjHG3lcBSY8Y2MDV4k3fMWFwN904Kr2ch53AZW4=
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
Expand Down
9 changes: 5 additions & 4 deletions k8s/pkg/apis/longhorn/v1beta2/backingimagedatasource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@ const (
BackingImageDataSourceTypeUpload = BackingImageDataSourceType("upload")
BackingImageDataSourceTypeExportFromVolume = BackingImageDataSourceType("export-from-volume")

DataSourceTypeExportFromVolumeParameterVolumeName = "volume-name"
DataSourceTypeExportFromVolumeParameterVolumeSize = "volume-size"
DataSourceTypeExportFromVolumeParameterSnapshotName = "snapshot-name"
DataSourceTypeExportFromVolumeParameterSenderAddress = "sender-address"
DataSourceTypeExportFromVolumeParameterVolumeName = "volume-name"
DataSourceTypeExportFromVolumeParameterVolumeSize = "volume-size"
DataSourceTypeExportFromVolumeParameterSnapshotName = "snapshot-name"
DataSourceTypeExportFromVolumeParameterSenderAddress = "sender-address"
DataSourceTypeExportFromVolumeParameterFileSyncHTTPClientTimeout = "file-sync-http-client-timeout"
)

// BackingImageDataSourceSpec defines the desired state of the Longhorn backing image data source
Expand Down
27 changes: 14 additions & 13 deletions vendor/github.com/longhorn/backing-image-manager/pkg/client/manager_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading