Revert "Add LeaseCandidate v1beta1"

This reverts commit fad4594.

Author: Jefftree

pkg/apis/coordination/types.go

@@ -108,8 +108,6 @@ type LeaseCandidate struct {
 // LeaseCandidateSpec is a specification of a Lease.
 type LeaseCandidateSpec struct {
 	// LeaseName is the name of the lease for which this candidate is contending.
-	// The limits on this field are the same as on Lease.name. Multiple lease candidates
-	// may reference the same Lease.name.
 	// This field is immutable.
 	// +required
 	LeaseName string

pkg/controlplane/apiserver/aggregator.go

@@ -284,7 +284,6 @@ func DefaultGenericAPIServicePriorities() map[schema.GroupVersion]APIServicePrio
 		{Group: "admissionregistration.k8s.io", Version: "v1beta1"}:  {Group: 16700, Version: 12},
 		{Group: "admissionregistration.k8s.io", Version: "v1alpha1"}: {Group: 16700, Version: 9},
 		{Group: "coordination.k8s.io", Version: "v1"}:                {Group: 16500, Version: 15},
-		{Group: "coordination.k8s.io", Version: "v1beta1"}:           {Group: 16500, Version: 13},
 		{Group: "coordination.k8s.io", Version: "v1alpha2"}:          {Group: 16500, Version: 12},
 		{Group: "discovery.k8s.io", Version: "v1"}:                   {Group: 16200, Version: 15},
 		{Group: "discovery.k8s.io", Version: "v1beta1"}:              {Group: 16200, Version: 12},

pkg/controlplane/instance.go

@@ -39,7 +39,6 @@ import (
 	certificatesv1alpha1 "k8s.io/api/certificates/v1alpha1"
 	coordinationapiv1 "k8s.io/api/coordination/v1"
 	coordinationv1alpha2 "k8s.io/api/coordination/v1alpha2"
-	coordinationv1beta1 "k8s.io/api/coordination/v1beta1"
 	apiv1 "k8s.io/api/core/v1"
 	discoveryv1 "k8s.io/api/discovery/v1"
 	eventsv1 "k8s.io/api/events/v1"
@@ -458,7 +457,6 @@ var (
 	betaAPIGroupVersionsDisabledByDefault = []schema.GroupVersion{
 		admissionregistrationv1beta1.SchemeGroupVersion,
 		authenticationv1beta1.SchemeGroupVersion,
-		coordinationv1beta1.SchemeGroupVersion,
 		storageapiv1beta1.SchemeGroupVersion,
 		flowcontrolv1beta1.SchemeGroupVersion,
 		flowcontrolv1beta2.SchemeGroupVersion,

staging/src/k8s.io/api/coordination/v1beta1/types.go

@@ -91,76 +91,3 @@ type LeaseList struct {
 	// items is a list of schema objects.
 	Items []Lease `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
-
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +k8s:prerelease-lifecycle-gen:introduced=1.33
-
-// LeaseCandidate defines a candidate for a Lease object.
-// Candidates are created such that coordinated leader election will pick the best leader from the list of candidates.
-type LeaseCandidate struct {
-	metav1.TypeMeta `json:",inline"`
-	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
-	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
-
-	// spec contains the specification of the Lease.
-	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
-	// +optional
-	Spec LeaseCandidateSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
-}
-
-// LeaseCandidateSpec is a specification of a Lease.
-type LeaseCandidateSpec struct {
-	// LeaseName is the name of the lease for which this candidate is contending.
-	// The limits on this field are the same as on Lease.name. Multiple lease candidates
-	// may reference the same Lease.name.
-	// This field is immutable.
-	// +required
-	LeaseName string `json:"leaseName" protobuf:"bytes,1,name=leaseName"`
-	// PingTime is the last time that the server has requested the LeaseCandidate
-	// to renew. It is only done during leader election to check if any
-	// LeaseCandidates have become ineligible. When PingTime is updated, the
-	// LeaseCandidate will respond by updating RenewTime.
-	// +optional
-	PingTime *metav1.MicroTime `json:"pingTime,omitempty" protobuf:"bytes,2,opt,name=pingTime"`
-	// 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.
-	// +optional
-	RenewTime *metav1.MicroTime `json:"renewTime,omitempty" protobuf:"bytes,3,opt,name=renewTime"`
-	// BinaryVersion is the binary version. It must be in a semver format without leading `v`.
-	// This field is required.
-	// +required
-	BinaryVersion string `json:"binaryVersion" protobuf:"bytes,4,name=binaryVersion"`
-	// 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"
-	// +optional
-	EmulationVersion string `json:"emulationVersion,omitempty" protobuf:"bytes,5,opt,name=emulationVersion"`
-	// Strategy is the strategy that coordinated leader election will use for picking the leader.
-	// If multiple candidates for the same Lease return different strategies, the strategy provided
-	// by the candidate with the latest BinaryVersion will be used. If there is still conflict,
-	// this is a user error and coordinated leader election will not operate the Lease until resolved.
-	// +required
-	Strategy v1.CoordinatedLeaseStrategy `json:"strategy,omitempty" protobuf:"bytes,6,opt,name=strategy"`
-}
-
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +k8s:prerelease-lifecycle-gen:introduced=1.33
-
-// LeaseCandidateList is a list of Lease objects.
-type LeaseCandidateList struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard list metadata.
-	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
-	// +optional
-	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
-
-	// items is a list of schema objects.
-	Items []LeaseCandidate `json:"items" protobuf:"bytes,2,rep,name=items"`
-}