diff --git a/go.mod b/go.mod index ddb5e28693..7ffa56e5d9 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1 github.com/kubernetes/dashboard v1.10.1 github.com/longhorn/backupstore v0.0.0-20210908163358-43c9d3298665 - github.com/longhorn/longhorn-manager v1.2.1-rc1 + github.com/longhorn/longhorn-manager v1.2.2 github.com/mattn/go-isatty v0.0.12 github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2 github.com/mitchellh/mapstructure v1.4.1 diff --git a/go.sum b/go.sum index b17fb9f238..26ed76358e 100644 --- a/go.sum +++ b/go.sum @@ -953,8 +953,8 @@ github.com/longhorn/go-iscsi-helper v0.0.0-20201111045018-ee87992ec536/go.mod h1 github.com/longhorn/longhorn-instance-manager v0.0.0-20201016215346-d8437b4e156e/go.mod h1:SfnIsnFj+HdmRiyF2buQ6+CB1WTD1pDQ4zEE6lBLs4s= github.com/longhorn/longhorn-instance-manager v0.0.0-20210729081215-50c310f97378/go.mod h1:6Ng1ShE4YRvWDscr1XhEhiTufv55LHBBfN5ln8S7diU= github.com/longhorn/longhorn-manager v1.1.0/go.mod h1:h2q+OgktnaFU3nFILh3umfR8vWywg9D2iTtdUry/JiY= -github.com/longhorn/longhorn-manager v1.2.1-rc1 h1:nSlvFtcrToHxfbHfjl0KsbKqbzlCsTvHpcQcpdlH5Oo= -github.com/longhorn/longhorn-manager v1.2.1-rc1/go.mod h1:Tbo9hfTbW1htLmp6VoscRnMHV1sGq9gKsXqXupCQX6U= +github.com/longhorn/longhorn-manager v1.2.2 h1:rCpt7T3LlIEwHvW/JXsI6BgN3zqU/zRpyXBg4Q5vxsg= +github.com/longhorn/longhorn-manager v1.2.2/go.mod h1:Tbo9hfTbW1htLmp6VoscRnMHV1sGq9gKsXqXupCQX6U= github.com/longhorn/nsfilelock v0.0.0-20200723175406-fa7c83ad0003/go.mod h1:0CLeXlf59Lg6C0kjLSDf47ft73Dh37CwymYRKWwAn04= github.com/longhorn/sparse-tools v0.0.0-20210420073041-5c51de69e0eb/go.mod h1:1WSSJRDNret4VKADAzvD49oaVt1/idYVWBL8TiyevRk= github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA= diff --git a/vendor/github.com/longhorn/longhorn-manager/types/setting.go b/vendor/github.com/longhorn/longhorn-manager/types/setting.go index a2c4630e30..461dcc2089 100644 --- a/vendor/github.com/longhorn/longhorn-manager/types/setting.go +++ b/vendor/github.com/longhorn/longhorn-manager/types/setting.go @@ -52,6 +52,7 @@ const ( SettingNameStorageMinimalAvailablePercentage = SettingName("storage-minimal-available-percentage") SettingNameUpgradeChecker = SettingName("upgrade-checker") SettingNameLatestLonghornVersion = SettingName("latest-longhorn-version") + SettingNameStableLonghornVersions = SettingName("stable-longhorn-versions") SettingNameDefaultReplicaCount = SettingName("default-replica-count") SettingNameDefaultDataLocality = SettingName("default-data-locality") SettingNameGuaranteedEngineCPU = SettingName("guaranteed-engine-cpu") @@ -101,6 +102,7 @@ var ( SettingNameStorageMinimalAvailablePercentage, SettingNameUpgradeChecker, SettingNameLatestLonghornVersion, + SettingNameStableLonghornVersions, SettingNameDefaultReplicaCount, SettingNameDefaultDataLocality, SettingNameGuaranteedEngineCPU, @@ -171,6 +173,7 @@ var ( SettingNameStorageMinimalAvailablePercentage: SettingDefinitionStorageMinimalAvailablePercentage, SettingNameUpgradeChecker: SettingDefinitionUpgradeChecker, SettingNameLatestLonghornVersion: SettingDefinitionLatestLonghornVersion, + SettingNameStableLonghornVersions: SettingDefinitionStableLonghornVersions, SettingNameDefaultReplicaCount: SettingDefinitionDefaultReplicaCount, SettingNameDefaultDataLocality: SettingDefinitionDefaultDataLocality, SettingNameGuaranteedEngineCPU: SettingDefinitionGuaranteedEngineCPU, @@ -375,6 +378,15 @@ var ( ReadOnly: true, } + SettingDefinitionStableLonghornVersions = SettingDefinition{ + DisplayName: "Stable Longhorn Versions", + Description: "The latest stable version of every minor release line. Updated by Upgrade Checker automatically", + Category: SettingCategoryGeneral, + Type: SettingTypeString, + Required: false, + ReadOnly: true, + } + SettingDefinitionDefaultReplicaCount = SettingDefinition{ DisplayName: "Default Replica Count", Description: "The default number of replicas when a volume is created from the Longhorn UI. For Kubernetes configuration, update the `numberOfReplicas` in the StorageClass", @@ -602,7 +614,7 @@ var ( DisplayName: "Disable Replica Rebuild", Description: "This setting disable replica rebuild cross the whole cluster, eviction and data locality feature won't work if this setting is true. But doesn't have any impact to any current replica rebuild and restore disaster recovery volume.", Category: SettingCategoryDangerZone, - Type: SettingTypeBool, + Type: SettingTypeDeprecated, Required: true, ReadOnly: false, Default: "false", @@ -621,13 +633,17 @@ var ( SettingDefinitionConcurrentReplicaRebuildPerNodeLimit = SettingDefinition{ DisplayName: "Concurrent Replica Rebuild Per Node Limit", - Description: "This setting controls how many replicas on a node can be rebuilt simultaneously." + - "If the value is 0, Longhorn will not limit the rebuilding.", - Category: SettingCategoryGeneral, + Description: "This setting controls how many replicas on a node can be rebuilt simultaneously. \n\n" + + "Typically, Longhorn can block the replica starting once the current rebuilding count on a node exceeds the limit. But when the value is 0, it means disabling the replica rebuilding. \n\n" + + "WARNING: \n\n" + + " - The old setting \"Disable Replica Rebuild\" is replaced by this setting. \n\n" + + " - Different from relying on replica starting delay to limit the concurrent rebuilding, if the rebuilding is disabled, replica object replenishment will be directly skipped. \n\n" + + " - When the value is 0, the eviction and data locality feature won't work. But this shouldn't have any impact to any current replica rebuild and backup restore.", + Category: SettingCategoryDangerZone, Type: SettingTypeInt, Required: true, ReadOnly: false, - Default: "0", + Default: "5", } SettingDefinitionSystemManagedPodsImagePullPolicy = SettingDefinition{ diff --git a/vendor/modules.txt b/vendor/modules.txt index 2c9d0b6aa8..386dfacd49 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -369,7 +369,7 @@ github.com/longhorn/backupstore/logging github.com/longhorn/backupstore/util # github.com/longhorn/go-iscsi-helper v0.0.0-20201111045018-ee87992ec536 github.com/longhorn/go-iscsi-helper/util -# github.com/longhorn/longhorn-manager v1.2.1-rc1 +# github.com/longhorn/longhorn-manager v1.2.2 ## explicit github.com/longhorn/longhorn-manager/k8s/pkg/apis/longhorn github.com/longhorn/longhorn-manager/k8s/pkg/apis/longhorn/v1beta1