diff --git a/go.mod b/go.mod index 3bbb9c3e..e43a4ced 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.6 require ( github.com/longhorn/go-common-libs v0.0.0-20250215052214-151615b29f8e - github.com/longhorn/longhorn-manager v1.8.1-dev-20250209 + github.com/longhorn/longhorn-manager v1.8.1-rc1 github.com/otiai10/copy v1.14.1 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.3 @@ -93,7 +93,7 @@ require ( k8s.io/component-base v0.32.2 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect - k8s.io/mount-utils v0.32.1 // indirect + k8s.io/mount-utils v0.32.2 // indirect sigs.k8s.io/controller-runtime v0.20.1 // indirect sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect sigs.k8s.io/kustomize/api v0.18.0 // indirect diff --git a/go.sum b/go.sum index 9c4ea312..712b3140 100644 --- a/go.sum +++ b/go.sum @@ -90,8 +90,8 @@ github.com/lithammer/dedent v1.1.0 h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffkt github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= github.com/longhorn/go-common-libs v0.0.0-20250215052214-151615b29f8e h1:QxJaa0Jo3yGWXrxk317mH1KJwgz7SwDldH1ec/yNEss= github.com/longhorn/go-common-libs v0.0.0-20250215052214-151615b29f8e/go.mod h1:qDoXeH6jrSofJyr3ubwwhlptIKHHsQwTsm5TpNTs1B0= -github.com/longhorn/longhorn-manager v1.8.1-dev-20250209 h1:ahAhJWOOKBwmLbgpKUQvYDHPQ1Cwjq/Hex1IFavtxWM= -github.com/longhorn/longhorn-manager v1.8.1-dev-20250209/go.mod h1:8/bL8NgQQSZqgGsBmQGtn1RnVDLCSLlpogILKbvKms4= +github.com/longhorn/longhorn-manager v1.8.1-rc1 h1:l5a42IJzE+6IlmwDj13+TtdrCIrwklnZJUeDHtlS6dw= +github.com/longhorn/longhorn-manager v1.8.1-rc1/go.mod h1:d123yEwjoXyo5cQ77MebIo038KDyFQe2h1RmB5vDosM= github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4= github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU= github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= @@ -246,8 +246,8 @@ k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8X k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7/go.mod h1:GewRfANuJ70iYzvn+i4lezLDAFzvjxZYK1gn1lWcfas= k8s.io/kubectl v0.32.2 h1:TAkag6+XfSBgkqK9I7ZvwtF0WVtUAvK8ZqTt+5zi1Us= k8s.io/kubectl v0.32.2/go.mod h1:+h/NQFSPxiDZYX/WZaWw9fwYezGLISP0ud8nQKg+3g8= -k8s.io/mount-utils v0.32.1 h1:RJOD6xXzEJT/OOJoG1KstfVa8ZXJJPlHb+t2MoulPHM= -k8s.io/mount-utils v0.32.1/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= +k8s.io/mount-utils v0.32.2 h1:aDwp+ucWiVnDr/LpRg88/dsXf/vm6gI1VZkYH3+3+Vw= +k8s.io/mount-utils v0.32.2/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/controller-runtime v0.20.1 h1:JbGMAG/X94NeM3xvjenVUaBjy6Ui4Ogd/J5ZtjZnHaE= diff --git a/vendor/github.com/longhorn/longhorn-manager/k8s/pkg/apis/longhorn/v1beta2/backup.go b/vendor/github.com/longhorn/longhorn-manager/k8s/pkg/apis/longhorn/v1beta2/backup.go index 26752cd1..d5c8ab00 100644 --- a/vendor/github.com/longhorn/longhorn-manager/k8s/pkg/apis/longhorn/v1beta2/backup.go +++ b/vendor/github.com/longhorn/longhorn-manager/k8s/pkg/apis/longhorn/v1beta2/backup.go @@ -84,7 +84,7 @@ type BackupStatus struct { // +optional BackupCreatedAt string `json:"backupCreatedAt"` // The snapshot size. - // +kubebuilder:default="0" + // +optional Size string `json:"size"` // The labels of snapshot backup. // +optional diff --git a/vendor/github.com/longhorn/longhorn-manager/types/setting.go b/vendor/github.com/longhorn/longhorn-manager/types/setting.go index 1a36c0d8..fb239ae5 100644 --- a/vendor/github.com/longhorn/longhorn-manager/types/setting.go +++ b/vendor/github.com/longhorn/longhorn-manager/types/setting.go @@ -65,6 +65,7 @@ const ( SettingNameStorageMinimalAvailablePercentage = SettingName("storage-minimal-available-percentage") SettingNameStorageReservedPercentageForDefaultDisk = SettingName("storage-reserved-percentage-for-default-disk") SettingNameUpgradeChecker = SettingName("upgrade-checker") + SettingNameUpgradeResponderURL = SettingName("upgrade-responder-url") SettingNameAllowCollectingLonghornUsage = SettingName("allow-collecting-longhorn-usage-metrics") SettingNameCurrentLonghornVersion = SettingName("current-longhorn-version") SettingNameLatestLonghornVersion = SettingName("latest-longhorn-version") @@ -163,6 +164,7 @@ var ( SettingNameStorageMinimalAvailablePercentage, SettingNameStorageReservedPercentageForDefaultDisk, SettingNameUpgradeChecker, + SettingNameUpgradeResponderURL, SettingNameAllowCollectingLonghornUsage, SettingNameCurrentLonghornVersion, SettingNameLatestLonghornVersion, @@ -283,6 +285,7 @@ var ( SettingNameStorageMinimalAvailablePercentage: SettingDefinitionStorageMinimalAvailablePercentage, SettingNameStorageReservedPercentageForDefaultDisk: SettingDefinitionStorageReservedPercentageForDefaultDisk, SettingNameUpgradeChecker: SettingDefinitionUpgradeChecker, + SettingNameUpgradeResponderURL: SettingDefinitionUpgradeResponderURL, SettingNameAllowCollectingLonghornUsage: SettingDefinitionAllowCollectingLonghornUsageMetrics, SettingNameCurrentLonghornVersion: SettingDefinitionCurrentLonghornVersion, SettingNameLatestLonghornVersion: SettingDefinitionLatestLonghornVersion, @@ -585,6 +588,16 @@ var ( Default: "true", } + SettingDefinitionUpgradeResponderURL = SettingDefinition{ + DisplayName: "Upgrade Responder URL", + Description: "The Upgrade Responder sends a notification whenever a new Longhorn version that you can upgrade to becomes available", + Category: SettingCategoryGeneral, + Type: SettingTypeString, + Required: true, + ReadOnly: false, + Default: "https://longhorn-upgrade-responder.rancher.io/v1/checkupgrade", + } + SettingDefinitionAllowCollectingLonghornUsageMetrics = SettingDefinition{ DisplayName: "Allow Collecting Longhorn Usage Metrics", Description: "Enabling this setting will allow Longhorn to provide additional usage metrics to https://metrics.longhorn.io/.\n" + diff --git a/vendor/modules.txt b/vendor/modules.txt index e97c759c..d74b9ba2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -130,7 +130,7 @@ github.com/longhorn/go-common-libs/sync github.com/longhorn/go-common-libs/sys github.com/longhorn/go-common-libs/types github.com/longhorn/go-common-libs/utils -# github.com/longhorn/longhorn-manager v1.8.1-dev-20250209 +# github.com/longhorn/longhorn-manager v1.8.1-rc1 ## explicit; go 1.23.1 github.com/longhorn/longhorn-manager/k8s/pkg/apis/longhorn github.com/longhorn/longhorn-manager/k8s/pkg/apis/longhorn/v1beta1 @@ -805,7 +805,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/mount-utils v0.32.1 +# k8s.io/mount-utils v0.32.2 ## explicit; go 1.23.0 k8s.io/mount-utils # k8s.io/utils v0.0.0-20241210054802-24370beab758