diff --git a/coordination/v1alpha1/generated.proto b/coordination/v1alpha1/generated.proto index 9868bebfb..57895ad56 100644 --- a/coordination/v1alpha1/generated.proto +++ b/coordination/v1alpha1/generated.proto @@ -92,13 +92,10 @@ message LeaseCandidateSpec { // The list is ordered, and the first strategy supersedes all other strategies. The list is used by coordinated // leader election to make a decision about the final election strategy. This follows as // - If all clients have strategy X as the first element in this list, strategy X will be used. - // - If a candidate has [X] and another candidate has [Y, X], Y supersedes X and strategy Y + // - If a candidate has strategy [X] and another candidate has strategy [Y, X], Y supersedes X and strategy Y // will be used. - // - If a candidate has [X, Y] and another candidate has [Y, X], this is a user error and leader + // - If a candidate has strategy [X, Y] and another candidate has strategy [Y, X], this is a user error and leader // election will not operate the Lease until resolved. - // - In general: [A1, A2, ..., An] > [B1, B2, ..., Bm] if the latter is a sub-sequence of the former, and hence - // A1 is chosen. For more than two candidates, one must be the maximum of all candidates. Otherwise, this is a user - // error and leader election will not operate the Lease until resolved. // (Alpha) Using this field requires the CoordinatedLeaderElection feature gate to be enabled. // +featureGate=CoordinatedLeaderElection // +listType=atomic diff --git a/coordination/v1alpha1/types_swagger_doc_generated.go b/coordination/v1alpha1/types_swagger_doc_generated.go index 33bb96fc9..0e52809c8 100644 --- a/coordination/v1alpha1/types_swagger_doc_generated.go +++ b/coordination/v1alpha1/types_swagger_doc_generated.go @@ -54,7 +54,7 @@ var map_LeaseCandidateSpec = map[string]string{ "renewTime": "RenewTime is the time that the LeaseCandidate was last updated. Any time a Lease needs to do leader election, the PingTime field is updated to signal to the LeaseCandidate that they should update the RenewTime. Old LeaseCandidate objects are also garbage collected if it has been hours since the last renew. The PingTime field is updated regularly to prevent garbage collection for still active LeaseCandidates.", "binaryVersion": "BinaryVersion is the binary version. It must be in a semver format without leading `v`. This field is required when strategy is \"OldestEmulationVersion\"", "emulationVersion": "EmulationVersion is the emulation version. It must be in a semver format without leading `v`. EmulationVersion must be less than or equal to BinaryVersion. This field is required when strategy is \"OldestEmulationVersion\"", - "preferredStrategies": "PreferredStrategies indicates the list of strategies for picking the leader for coordinated leader election. The list is ordered, and the first strategy supersedes all other strategies. The list is used by coordinated leader election to make a decision about the final election strategy. This follows as - If all clients have strategy X as the first element in this list, strategy X will be used. - If a candidate has [X] and another candidate has [Y, X], Y supersedes X and strategy Y\n will be used.\n- If a candidate has [X, Y] and another candidate has [Y, X], this is a user error and leader\n election will not operate the Lease until resolved.\n- In general: [A1, A2, ..., An] > [B1, B2, ..., Bm] if the latter is a sub-sequence of the former, and hence\n A1 is chosen. For more than two candidates, one must be the maximum of all candidates. Otherwise, this is a user\n error and leader election will not operate the Lease until resolved.\n(Alpha) Using this field requires the CoordinatedLeaderElection feature gate to be enabled.", + "preferredStrategies": "PreferredStrategies indicates the list of strategies for picking the leader for coordinated leader election. The list is ordered, and the first strategy supersedes all other strategies. The list is used by coordinated leader election to make a decision about the final election strategy. This follows as - If all clients have strategy X as the first element in this list, strategy X will be used. - If a candidate has strategy [X] and another candidate has strategy [Y, X], Y supersedes X and strategy Y\n will be used.\n- If a candidate has strategy [X, Y] and another candidate has strategy [Y, X], this is a user error and leader\n election will not operate the Lease until resolved.\n(Alpha) Using this field requires the CoordinatedLeaderElection feature gate to be enabled.", } func (LeaseCandidateSpec) SwaggerDoc() map[string]string { diff --git a/go.mod b/go.mod index eec04867a..3a504530b 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ go 1.22.0 require ( github.com/gogo/protobuf v1.3.2 github.com/stretchr/testify v1.9.0 - k8s.io/apimachinery v0.0.0-20240720202316-95b78024e3fe + k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe ) require ( diff --git a/go.sum b/go.sum index 49aee3a82..bca6ca652 100644 --- a/go.sum +++ b/go.sum @@ -89,8 +89,8 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/apimachinery v0.0.0-20240720202316-95b78024e3fe h1:V9MwpYUwbKlfLKVrhpVuKWiat/LBIhm1pGB9/xdHm5Q= -k8s.io/apimachinery v0.0.0-20240720202316-95b78024e3fe/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe h1:lt6b7CTEYMgUTCGIZrATyWMZTQThE+qIQq5YTCbpMVQ= +k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=