diff --git a/go.mod b/go.mod index 6e9041294..5e2c1278b 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( golang.org/x/time v0.14.0 google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af gopkg.in/evanphx/json-patch.v4 v4.13.0 - k8s.io/api v0.0.0-20260422222040-ee0388f558bb + k8s.io/api v0.0.0-20260422222041-738ad2fc7666 k8s.io/apimachinery v0.0.0-20260414135623-72791e98891a k8s.io/klog/v2 v2.140.0 k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a diff --git a/go.sum b/go.sum index 2b45ce028..2b3386ff3 100644 --- a/go.sum +++ b/go.sum @@ -105,8 +105,8 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= 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/api v0.0.0-20260422222040-ee0388f558bb h1:wzBOAiu/hhFZcxVWClrA2oPFNUHLGdxkkynHcYx+CO8= -k8s.io/api v0.0.0-20260422222040-ee0388f558bb/go.mod h1:0MHCnfE89X5hpXeB0MmNRJy2DP3MVFqj2JGtSte5YBs= +k8s.io/api v0.0.0-20260422222041-738ad2fc7666 h1:d4xRHtlzeu5W4t4BBWA7wylPf9TORY2pnILk48cjkcU= +k8s.io/api v0.0.0-20260422222041-738ad2fc7666/go.mod h1:0MHCnfE89X5hpXeB0MmNRJy2DP3MVFqj2JGtSte5YBs= k8s.io/apimachinery v0.0.0-20260414135623-72791e98891a h1:fGTRW0wFSkwIK6xpLqCLXcZnpMVA/d/z4/VY1+V6sck= k8s.io/apimachinery v0.0.0-20260414135623-72791e98891a/go.mod h1:Fqsi1zDY7A12KBcrFdhpzVHlFskhmS7gwXYeqzTa3zY= k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc= diff --git a/tools/leaderelection/resourcelock/multilock.go b/tools/leaderelection/resourcelock/multilock.go index 5ee1dcbb5..e2ba21d37 100644 --- a/tools/leaderelection/resourcelock/multilock.go +++ b/tools/leaderelection/resourcelock/multilock.go @@ -25,10 +25,14 @@ import ( ) const ( + // Deprecated: UnknownLeader is only used by MultiLock, which is deprecated. UnknownLeader = "leaderelection.k8s.io/unknown" ) -// MultiLock is used for lock's migration +// Deprecated: MultiLock was used to facilitate migration from non-lease +// based leader election to lease-based leader election. Support for +// non-lease locks was removed in Kubernetes 1.28, making MultiLock +// non-functional. Use LeaseLock directly instead. type MultiLock struct { Primary Interface Secondary Interface @@ -99,6 +103,7 @@ func (ml *MultiLock) Identity() string { return ml.Primary.Identity() } +// Deprecated: ConcatRawRecord is only used by MultiLock, which is deprecated. func ConcatRawRecord(primaryRaw, secondaryRaw []byte) []byte { return bytes.Join([][]byte{primaryRaw, secondaryRaw}, []byte(",")) }