github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

endpointslice API: rename 'accepting' condition to 'serving' condition

Browse Source 
Signed-off-by: Andrew Sy Kim <kim.andrewsy@gmail.com>
This commit is contained in:
Andrew Sy Kim 2020-10-30 22:44:46 -04:00
parent 17cf1b4415
commit 7cf19e5fb7
21 changed files with 199 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/openapi-spec/swagger.json generated
View File

@ -10913,14 +10913,14 @@
"io.k8s.api.discovery.v1beta1.EndpointConditions": {
"description": "EndpointConditions represents the current condition of an endpoint.",
"properties": {
"accepting": {
"description": "accepting is identical to ready except that it is set regardless of the terminating state of endpoints. This condition should be set to true for a ready endpoint that is terminating. If nil, consumers should defer to the ready condition.",
"type": "boolean"
},
"ready": {
"description": "ready indicates that this endpoint is prepared to receive traffic, according to whatever system is managing the endpoint. A nil value indicates an unknown state. In most cases consumers should interpret this unknown state as ready. For compatibility reasons, ready should never be \"true\" for terminating endpoints.",
"type": "boolean"
},
"serving": {
"description": "serving is identical to ready except that it is set regardless of the terminating state of endpoints. This condition should be set to true for a ready endpoint that is terminating. If nil, consumers should defer to the ready condition.",
"type": "boolean"
},
"terminating": {
"description": "terminating indicates that this endpoint is terminating. A nil value indicates an unknown state. Consumers should interpret this unknown state to mean that the endpoint is not terminating.",
"type": "boolean"

4
pkg/apis/discovery/types.go
View File

@ -118,11 +118,11 @@ type EndpointConditions struct {
// "true" for terminating endpoints.
Ready *bool
// accepting is identical to ready except that it is set regardless of the terminating
// serving is identical to ready except that it is set regardless of the terminating
// state of endpoints. This condition should be set to true for a ready endpoint that
// is terminating. If nil, consumers should defer to the ready condition.
// +optional
Accepting *bool
Serving *bool
// terminating indicates that this endpoint is terminating. A nil value indicates an
// unknown state. Consumers should interpret this unknown state to mean that the

4
pkg/apis/discovery/v1alpha1/zz_generated.conversion.go generated
View File

@ -125,7 +125,7 @@ func Convert_discovery_Endpoint_To_v1alpha1_Endpoint(in *discovery.Endpoint, out
func autoConvert_v1alpha1_EndpointConditions_To_discovery_EndpointConditions(in *v1alpha1.EndpointConditions, out *discovery.EndpointConditions, s conversion.Scope) error {
out.Ready = (*bool)(unsafe.Pointer(in.Ready))
out.Accepting = (*bool)(unsafe.Pointer(in.Accepting))
out.Serving = (*bool)(unsafe.Pointer(in.Serving))
out.Terminating = (*bool)(unsafe.Pointer(in.Terminating))
return nil
}
@ -137,7 +137,7 @@ func Convert_v1alpha1_EndpointConditions_To_discovery_EndpointConditions(in *v1a
func autoConvert_discovery_EndpointConditions_To_v1alpha1_EndpointConditions(in *discovery.EndpointConditions, out *v1alpha1.EndpointConditions, s conversion.Scope) error {
out.Ready = (*bool)(unsafe.Pointer(in.Ready))
out.Accepting = (*bool)(unsafe.Pointer(in.Accepting))
out.Serving = (*bool)(unsafe.Pointer(in.Serving))
out.Terminating = (*bool)(unsafe.Pointer(in.Terminating))
return nil
}

4
pkg/apis/discovery/v1beta1/zz_generated.conversion.go generated
View File

@ -125,7 +125,7 @@ func Convert_discovery_Endpoint_To_v1beta1_Endpoint(in *discovery.Endpoint, out
func autoConvert_v1beta1_EndpointConditions_To_discovery_EndpointConditions(in *v1beta1.EndpointConditions, out *discovery.EndpointConditions, s conversion.Scope) error {
out.Ready = (*bool)(unsafe.Pointer(in.Ready))
out.Accepting = (*bool)(unsafe.Pointer(in.Accepting))
out.Serving = (*bool)(unsafe.Pointer(in.Serving))
out.Terminating = (*bool)(unsafe.Pointer(in.Terminating))
return nil
}
@ -137,7 +137,7 @@ func Convert_v1beta1_EndpointConditions_To_discovery_EndpointConditions(in *v1be
func autoConvert_discovery_EndpointConditions_To_v1beta1_EndpointConditions(in *discovery.EndpointConditions, out *v1beta1.EndpointConditions, s conversion.Scope) error {
out.Ready = (*bool)(unsafe.Pointer(in.Ready))
out.Accepting = (*bool)(unsafe.Pointer(in.Accepting))
out.Serving = (*bool)(unsafe.Pointer(in.Serving))
out.Terminating = (*bool)(unsafe.Pointer(in.Terminating))
return nil
}

4
pkg/apis/discovery/zz_generated.deepcopy.go generated
View File

@ -72,8 +72,8 @@ func (in *EndpointConditions) DeepCopyInto(out *EndpointConditions) {
*out = new(bool)
**out = **in
}
if in.Accepting != nil {
in, out := &in.Accepting, &out.Accepting
if in.Serving != nil {
in, out := &in.Serving, &out.Serving
*out = new(bool)
**out = **in
}

8
pkg/controller/endpointslice/endpointslice_controller_test.go
View File

@ -664,7 +664,7 @@ func TestSyncService(t *testing.T) {
{
Conditions: discovery.EndpointConditions{
Ready: utilpointer.BoolPtr(true),
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(false),
},
Addresses: []string{"10.0.0.1"},
@ -674,7 +674,7 @@ func TestSyncService(t *testing.T) {
{
Conditions: discovery.EndpointConditions{
Ready: utilpointer.BoolPtr(false),
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(true),
},
Addresses: []string{"10.0.0.2"},
@ -884,7 +884,7 @@ func TestSyncService(t *testing.T) {
{
Conditions: discovery.EndpointConditions{
Ready: utilpointer.BoolPtr(true),
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(false),
},
Addresses: []string{"10.0.0.1"},
@ -894,7 +894,7 @@ func TestSyncService(t *testing.T) {
{
Conditions: discovery.EndpointConditions{
Ready: utilpointer.BoolPtr(false),
Accepting: utilpointer.BoolPtr(false),
Serving: utilpointer.BoolPtr(false),
Terminating: utilpointer.BoolPtr(true),
},
Addresses: []string{"10.0.0.2"},

2
pkg/controller/endpointslice/reconciler_test.go
View File

@ -178,7 +178,7 @@ func TestReconcile1Pod(t *testing.T) {
Addresses: []string{"1.2.3.4"},
Conditions: discovery.EndpointConditions{
Ready: utilpointer.BoolPtr(true),
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(false),
},
Topology: map[string]string{

6
pkg/controller/endpointslice/utils.go
View File

@ -62,11 +62,11 @@ func podToEndpoint(pod *corev1.Pod, node *corev1.Node, service *corev1.Service,
}
}
accepting := podutil.IsPodReady(pod)
serving := podutil.IsPodReady(pod)
terminating := pod.DeletionTimestamp != nil
// For compatibility reasons, "ready" should never be "true" if a pod is terminatng, unless
// publishNotReadyAddresses was set.
ready := service.Spec.PublishNotReadyAddresses || (accepting && !terminating)
ready := service.Spec.PublishNotReadyAddresses || (serving && !terminating)
ep := discovery.Endpoint{
Addresses: getEndpointAddresses(pod.Status, service, addressType),
Conditions: discovery.EndpointConditions{
@ -83,7 +83,7 @@ func podToEndpoint(pod *corev1.Pod, node *corev1.Node, service *corev1.Service,
}
if utilfeature.DefaultFeatureGate.Enabled(features.EndpointSliceTerminatingCondition) {
ep.Conditions.Accepting = &accepting
ep.Conditions.Serving = &serving
ep.Conditions.Terminating = &terminating
}

6
pkg/controller/endpointslice/utils_test.go
View File

@ -396,7 +396,7 @@ func TestPodToEndpoint(t *testing.T) {
Addresses: []string{"1.2.3.5"},
Conditions: discovery.EndpointConditions{
Ready: utilpointer.BoolPtr(true),
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(false),
},
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
@ -438,7 +438,7 @@ func TestPodToEndpoint(t *testing.T) {
Addresses: []string{"1.2.3.5"},
Conditions: discovery.EndpointConditions{
Ready: utilpointer.BoolPtr(false),
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(true),
},
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
@ -480,7 +480,7 @@ func TestPodToEndpoint(t *testing.T) {
Addresses: []string{"1.2.3.5"},
Conditions: discovery.EndpointConditions{
Ready: utilpointer.BoolPtr(false),
Accepting: utilpointer.BoolPtr(false),
Serving: utilpointer.BoolPtr(false),
Terminating: utilpointer.BoolPtr(true),
},
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},

10
pkg/registry/discovery/endpointslice/strategy.go
View File

@ -110,9 +110,9 @@ func dropDisabledConditionsOnCreate(endpointSlice *discovery.EndpointSlice) {
return
}
// Always drop the accepting / terminating conditions on create when feature gate is disabled.
// Always drop the serving/terminating conditions on create when feature gate is disabled.
for i := range endpointSlice.Endpoints {
endpointSlice.Endpoints[i].Conditions.Accepting = nil
endpointSlice.Endpoints[i].Conditions.Serving = nil
endpointSlice.Endpoints[i].Conditions.Terminating = nil
}
}
@ -125,10 +125,10 @@ func dropDisabledConditionsOnUpdate(oldEPS, newEPS *discovery.EndpointSlice) {
return
}
// Only drop the accepting/terminating condition if the existing EndpointSlice doesn't have it set.
// Only drop the serving/terminating condition if the existing EndpointSlice doesn't have it set.
dropConditions := true
for _, ep := range oldEPS.Endpoints {
if ep.Conditions.Accepting != nil || ep.Conditions.Terminating != nil {
if ep.Conditions.Serving != nil || ep.Conditions.Terminating != nil {
dropConditions = false
break
}
@ -136,7 +136,7 @@ func dropDisabledConditionsOnUpdate(oldEPS, newEPS *discovery.EndpointSlice) {
if dropConditions {
for i := range newEPS.Endpoints {
newEPS.Endpoints[i].Conditions.Accepting = nil
newEPS.Endpoints[i].Conditions.Serving = nil
newEPS.Endpoints[i].Conditions.Terminating = nil
}
}

90
pkg/registry/discovery/endpointslice/strategy_test.go
View File

@ -41,19 +41,19 @@ func Test_dropConditionsOnCreate(t *testing.T) {
Endpoints: []discovery.Endpoint{
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(false),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(true),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
@ -63,19 +63,19 @@ func Test_dropConditionsOnCreate(t *testing.T) {
Endpoints: []discovery.Endpoint{
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(false),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(true),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
@ -89,19 +89,19 @@ func Test_dropConditionsOnCreate(t *testing.T) {
Endpoints: []discovery.Endpoint{
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(false),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(true),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
@ -111,19 +111,19 @@ func Test_dropConditionsOnCreate(t *testing.T) {
Endpoints: []discovery.Endpoint{
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
@ -161,19 +161,19 @@ func Test_dropTerminatingConditionOnUpdate(t *testing.T) {
Endpoints: []discovery.Endpoint{
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(false),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(true),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
@ -183,19 +183,19 @@ func Test_dropTerminatingConditionOnUpdate(t *testing.T) {
Endpoints: []discovery.Endpoint{
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(false),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(true),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
@ -205,19 +205,19 @@ func Test_dropTerminatingConditionOnUpdate(t *testing.T) {
Endpoints: []discovery.Endpoint{
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(false),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(true),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
@ -231,19 +231,19 @@ func Test_dropTerminatingConditionOnUpdate(t *testing.T) {
Endpoints: []discovery.Endpoint{
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
@ -253,19 +253,19 @@ func Test_dropTerminatingConditionOnUpdate(t *testing.T) {
Endpoints: []discovery.Endpoint{
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(false),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(true),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
@ -275,19 +275,19 @@ func Test_dropTerminatingConditionOnUpdate(t *testing.T) {
Endpoints: []discovery.Endpoint{
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
@ -301,19 +301,19 @@ func Test_dropTerminatingConditionOnUpdate(t *testing.T) {
Endpoints: []discovery.Endpoint{
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(false),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(true),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
@ -323,19 +323,19 @@ func Test_dropTerminatingConditionOnUpdate(t *testing.T) {
Endpoints: []discovery.Endpoint{
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(false),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(true),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
@ -345,19 +345,19 @@ func Test_dropTerminatingConditionOnUpdate(t *testing.T) {
Endpoints: []discovery.Endpoint{
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(false),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(true),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: nil,
Serving: nil,
Terminating: nil,
},
},
@ -371,13 +371,13 @@ func Test_dropTerminatingConditionOnUpdate(t *testing.T) {
Endpoints: []discovery.Endpoint{
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(false),
Serving: utilpointer.BoolPtr(false),
Terminating: utilpointer.BoolPtr(false),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(true),
},
},
@ -392,13 +392,13 @@ func Test_dropTerminatingConditionOnUpdate(t *testing.T) {
Endpoints: []discovery.Endpoint{
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(true),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(false),
Serving: utilpointer.BoolPtr(false),
Terminating: utilpointer.BoolPtr(false),
},
},
@ -413,13 +413,13 @@ func Test_dropTerminatingConditionOnUpdate(t *testing.T) {
Endpoints: []discovery.Endpoint{
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(true),
Serving: utilpointer.BoolPtr(true),
Terminating: utilpointer.BoolPtr(true),
},
},
{
Conditions: discovery.EndpointConditions{
Accepting: utilpointer.BoolPtr(false),
Serving: utilpointer.BoolPtr(false),
Terminating: utilpointer.BoolPtr(false),
},
},

111
staging/src/k8s.io/api/discovery/v1alpha1/generated.pb.go generated
View File

@ -200,56 +200,57 @@ func init() {
}
var fileDescriptor_772f83c5b34e07a5 = []byte{
// 781 bytes of a gzipped FileDescriptorProto
// 787 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x4d, 0x8f, 0xe3, 0x44,
0x10, 0x8d, 0x27, 0x63, 0xc9, 0xee, 0x6c, 0xc4, 0x6e, 0x8b, 0x43, 0x14, 0xc0, 0x8e, 0xc2, 0x81,
0x48, 0x03, 0x6d, 0x32, 0x02, 0xb4, 0x82, 0xd3, 0x18, 0x96, 0x0f, 0x89, 0x8f, 0xd0, 0xe4, 0x80,
0x10, 0x07, 0x3a, 0x76, 0xad, 0x63, 0x12, 0xbb, 0x2d, 0xbb, 0x13, 0x29, 0x37, 0x7e, 0x02, 0x17,
0xfe, 0x0d, 0x47, 0x84, 0xe6, 0xb8, 0xc7, 0x39, 0x59, 0x8c, 0xe7, 0x5f, 0xcc, 0x09, 0x75, 0xfb,
0x73, 0x08, 0xb0, 0xb9, 0x75, 0xbf, 0xae, 0xf7, 0xaa, 0x5e, 0x75, 0x15, 0xfa, 0x74, 0xf3, 0x34,
0x23, 0x21, 0x77, 0x36, 0xbb, 0x15, 0xa4, 0x31, 0x08, 0xc8, 0x9c, 0x3d, 0xc4, 0x3e, 0x4f, 0x9d,
0xea, 0x81, 0x25, 0xa1, 0xe3, 0x87, 0x99, 0xc7, 0xf7, 0x90, 0x1e, 0x9c, 0xfd, 0x9c, 0x6d, 0x93,
0x35, 0x9b, 0x3b, 0x01, 0xc4, 0x90, 0x32, 0x01, 0x3e, 0x49, 0x52, 0x2e, 0x38, 0x7e, 0xa3, 0x0c,
0x27, 0x2c, 0x09, 0x49, 0x13, 0x4e, 0xea, 0xf0, 0xf1, 0x3b, 0x41, 0x28, 0xd6, 0xbb, 0x15, 0xf1,
0x78, 0xe4, 0x04, 0x3c, 0xe0, 0x8e, 0x62, 0xad, 0x76, 0xcf, 0xd5, 0x4d, 0x5d, 0xd4, 0xa9, 0x54,
0x1b, 0x4f, 0x3b, 0xc9, 0x3d, 0x9e, 0x82, 0xb3, 0x3f, 0xca, 0x38, 0x7e, 0xaf, 0x8d, 0x89, 0x98,
0xb7, 0x0e, 0x63, 0x59, 0x5f, 0xb2, 0x09, 0x24, 0x90, 0x39, 0x11, 0x08, 0xf6, 0x6f, 0x2c, 0xe7,
0xbf, 0x58, 0xe9, 0x2e, 0x16, 0x61, 0x04, 0x47, 0x84, 0x0f, 0x5e, 0x46, 0xc8, 0xbc, 0x35, 0x44,
0xec, 0x9f, 0xbc, 0xe9, 0xef, 0x7d, 0x64, 0x3c, 0x8b, 0xfd, 0x84, 0x87, 0xb1, 0xc0, 0x17, 0xc8,
0x64, 0xbe, 0x9f, 0x42, 0x96, 0x41, 0x36, 0xd2, 0x26, 0xfd, 0x99, 0xe9, 0x0e, 0x8b, 0xdc, 0x36,
0xaf, 0x6a, 0x90, 0xb6, 0xef, 0x18, 0x10, 0xf2, 0x78, 0xec, 0x87, 0x22, 0xe4, 0x71, 0x36, 0x3a,
0x9b, 0x68, 0xb3, 0xc1, 0xe5, 0x9c, 0xfc, 0x6f, 0x7f, 0x49, 0x9d, 0xe9, 0xe3, 0x86, 0xe8, 0xe2,
0xeb, 0xdc, 0xee, 0x15, 0xb9, 0x8d, 0x5a, 0x8c, 0x76, 0x84, 0xf1, 0x0c, 0x19, 0x6b, 0x9e, 0x89,
0x98, 0x45, 0x30, 0xea, 0x4f, 0xb4, 0x99, 0xe9, 0x3e, 0x2a, 0x72, 0xdb, 0xf8, 0xbc, 0xc2, 0x68,
0xf3, 0x8a, 0x17, 0xc8, 0x14, 0x2c, 0x0d, 0x40, 0x50, 0x78, 0x3e, 0x3a, 0x57, 0xf5, 0xbc, 0xd9,
0xad, 0x47, 0xfe, 0x10, 0xd9, 0xcf, 0xc9, 0x37, 0xab, 0x9f, 0xc1, 0x93, 0x41, 0x90, 0x42, 0xec,
0x41, 0x69, 0x71, 0x59, 0x33, 0x69, 0x2b, 0x82, 0x3d, 0x64, 0x08, 0x9e, 0xf0, 0x2d, 0x0f, 0x0e,
0x23, 0x7d, 0xd2, 0x9f, 0x0d, 0x2e, 0xdf, 0x3f, 0xd1, 0x20, 0x59, 0x56, 0xbc, 0x67, 0xb1, 0x48,
0x0f, 0xee, 0xe3, 0xca, 0xa4, 0x51, 0xc3, 0xb4, 0x11, 0x1e, 0x7f, 0x84, 0x86, 0x0f, 0x82, 0xf1,
0x63, 0xd4, 0xdf, 0xc0, 0x61, 0xa4, 0x49, 0xb3, 0x54, 0x1e, 0xf1, 0xab, 0x48, 0xdf, 0xb3, 0xed,
0x0e, 0x54, 0x97, 0x4d, 0x5a, 0x5e, 0x3e, 0x3c, 0x7b, 0xaa, 0x4d, 0x7f, 0xd3, 0x10, 0x3e, 0x6e,
0x2a, 0xb6, 0x91, 0x9e, 0x02, 0xf3, 0x4b, 0x11, 0xc3, 0x35, 0x8b, 0xdc, 0xd6, 0xa9, 0x04, 0x68,
0x89, 0xab, 0x9f, 0xf6, 0x3c, 0x48, 0x44, 0x18, 0x07, 0x4a, 0xd5, 0xa8, 0x7e, 0xba, 0x06, 0x69,
0xfb, 0x8e, 0xe7, 0x68, 0x20, 0x20, 0x8d, 0xc2, 0x98, 0xa9, 0xf0, 0xbe, 0x0a, 0x7f, 0xa5, 0xc8,
0xed, 0xc1, 0xb2, 0x85, 0x69, 0x37, 0x66, 0xfa, 0xa7, 0x86, 0x1e, 0xd5, 0x75, 0x2d, 0x78, 0x2a,
0xf0, 0xeb, 0xe8, 0x5c, 0x7d, 0xa1, 0x72, 0xe5, 0x1a, 0x45, 0x6e, 0x9f, 0x7f, 0x2d, 0xbf, 0x4f,
0xa1, 0xf8, 0x33, 0x64, 0xa8, 0x71, 0xf4, 0xf8, 0xb6, 0xf4, 0xe8, 0x5e, 0xc8, 0x6e, 0x2d, 0x2a,
0xec, 0x3e, 0xb7, 0x5f, 0x3b, 0x5e, 0x35, 0x52, 0x3f, 0xd3, 0x86, 0x2c, 0xd3, 0x24, 0x3c, 0x15,
0xaa, 0x46, 0xbd, 0x4c, 0x23, 0xd3, 0x53, 0x85, 0x4a, 0x23, 0x2c, 0x49, 0x6a, 0x9a, 0x9a, 0x11,
0xb3, 0x34, 0x72, 0xd5, 0xc2, 0xb4, 0x1b, 0x33, 0xbd, 0x3b, 0x43, 0xc3, 0xda, 0xc8, 0x77, 0xdb,
0xd0, 0x03, 0xfc, 0x13, 0x32, 0xe4, 0xd6, 0xfa, 0x4c, 0x30, 0xe5, 0x66, 0x70, 0xf9, 0x6e, 0x67,
0x28, 0x9a, 0xe5, 0x23, 0xc9, 0x26, 0x90, 0x40, 0x46, 0x64, 0x74, 0x3b, 0x77, 0x5f, 0x81, 0x60,
0xed, 0xd0, 0xb7, 0x18, 0x6d, 0x54, 0xf1, 0x27, 0x68, 0x50, 0xad, 0xd9, 0xf2, 0x90, 0x40, 0x55,
0xe6, 0xb4, 0xa2, 0x0c, 0xae, 0xda, 0xa7, 0xfb, 0x87, 0x57, 0xda, 0xa5, 0xe1, 0xef, 0x91, 0x09,
0x55, 0xe1, 0x72, 0x3d, 0xe5, 0xf4, 0xbe, 0x75, 0xe2, 0xf4, 0xba, 0x4f, 0xaa, 0x64, 0x66, 0x8d,
0x64, 0xb4, 0x15, 0xc3, 0x0b, 0xa4, 0xcb, 0x76, 0x66, 0xa3, 0xbe, 0x52, 0xbd, 0x38, 0x51, 0x55,
0x7e, 0x84, 0x3b, 0xac, 0x94, 0x75, 0x79, 0xcb, 0x68, 0x29, 0x34, 0xfd, 0x43, 0x43, 0x4f, 0x1e,
0x74, 0xf9, 0xcb, 0x30, 0x13, 0xf8, 0xc7, 0xa3, 0x4e, 0x93, 0xd3, 0x3a, 0x2d, 0xd9, 0xaa, 0xcf,
0xcd, 0xde, 0xd5, 0x48, 0xa7, 0xcb, 0xdf, 0x22, 0x3d, 0x14, 0x10, 0xd5, 0xbd, 0x79, 0xfb, 0x44,
0x17, 0xaa, 0xbc, 0xd6, 0xc6, 0x17, 0x52, 0x82, 0x96, 0x4a, 0x2e, 0xb9, 0xbe, 0xb5, 0x7a, 0x2f,
0x6e, 0xad, 0xde, 0xcd, 0xad, 0xd5, 0xfb, 0xa5, 0xb0, 0xb4, 0xeb, 0xc2, 0xd2, 0x5e, 0x14, 0x96,
0x76, 0x53, 0x58, 0xda, 0x5f, 0x85, 0xa5, 0xfd, 0x7a, 0x67, 0xf5, 0x7e, 0x30, 0x6a, 0xcd, 0xbf,
0x03, 0x00, 0x00, 0xff, 0xff, 0xea, 0x19, 0xfd, 0x6e, 0xd6, 0x06, 0x00, 0x00,
0x10, 0x8d, 0x27, 0x13, 0xad, 0xdd, 0xd9, 0x11, 0xbb, 0x2d, 0x0e, 0xd1, 0x00, 0xf6, 0x28, 0x08,
0x11, 0x69, 0xa0, 0x4d, 0x46, 0x80, 0x56, 0x70, 0x1a, 0xc3, 0xf2, 0x21, 0xf1, 0x31, 0xf4, 0xce,
0x01, 0x21, 0x0e, 0xf4, 0xd8, 0xb5, 0x8e, 0x49, 0xec, 0xb6, 0xba, 0x3b, 0x91, 0x72, 0xe3, 0x1f,
0xc0, 0x0f, 0xe2, 0x88, 0xd0, 0x1c, 0xf7, 0xb8, 0x27, 0x8b, 0xf1, 0xfe, 0x8b, 0x39, 0xa1, 0x6e,
0x7f, 0x0e, 0x01, 0x36, 0x37, 0xf7, 0xab, 0x7a, 0xaf, 0xea, 0x95, 0xab, 0xd0, 0x67, 0xcb, 0x47,
0x92, 0x24, 0xdc, 0x5f, 0xae, 0xaf, 0x40, 0x64, 0xa0, 0x40, 0xfa, 0x1b, 0xc8, 0x22, 0x2e, 0xfc,
0x3a, 0xc0, 0xf2, 0xc4, 0x8f, 0x12, 0x19, 0xf2, 0x0d, 0x88, 0xad, 0xbf, 0x99, 0xb3, 0x55, 0xbe,
0x60, 0x73, 0x3f, 0x86, 0x0c, 0x04, 0x53, 0x10, 0x91, 0x5c, 0x70, 0xc5, 0xf1, 0x1b, 0x55, 0x3a,
0x61, 0x79, 0x42, 0xda, 0x74, 0xd2, 0xa4, 0x1f, 0xbf, 0x1b, 0x27, 0x6a, 0xb1, 0xbe, 0x22, 0x21,
0x4f, 0xfd, 0x98, 0xc7, 0xdc, 0x37, 0xac, 0xab, 0xf5, 0x53, 0xf3, 0x32, 0x0f, 0xf3, 0x55, 0xa9,
0x1d, 0x4f, 0x7b, 0xc5, 0x43, 0x2e, 0xc0, 0xdf, 0xec, 0x54, 0x3c, 0x7e, 0xbf, 0xcb, 0x49, 0x59,
0xb8, 0x48, 0x32, 0xdd, 0x5f, 0xbe, 0x8c, 0x35, 0x20, 0xfd, 0x14, 0x14, 0xfb, 0x37, 0x96, 0xff,
0x5f, 0x2c, 0xb1, 0xce, 0x54, 0x92, 0xc2, 0x0e, 0xe1, 0xc3, 0x97, 0x11, 0x64, 0xb8, 0x80, 0x94,
0xfd, 0x93, 0x37, 0xfd, 0x7d, 0x88, 0xec, 0xc7, 0x59, 0x94, 0xf3, 0x24, 0x53, 0xf8, 0x14, 0x39,
0x2c, 0x8a, 0x04, 0x48, 0x09, 0x72, 0x62, 0x9d, 0x0c, 0x67, 0x4e, 0x70, 0x54, 0x16, 0x9e, 0x73,
0xde, 0x80, 0xb4, 0x8b, 0x63, 0x40, 0x28, 0xe4, 0x59, 0x94, 0xa8, 0x84, 0x67, 0x72, 0x72, 0x70,
0x62, 0xcd, 0xc6, 0x67, 0x73, 0xf2, 0xbf, 0xf3, 0x25, 0x4d, 0xa5, 0x4f, 0x5a, 0x62, 0x80, 0xaf,
0x0b, 0x6f, 0x50, 0x16, 0x1e, 0xea, 0x30, 0xda, 0x13, 0xc6, 0x33, 0x64, 0x2f, 0xb8, 0x54, 0x19,
0x4b, 0x61, 0x32, 0x3c, 0xb1, 0x66, 0x4e, 0x70, 0xbf, 0x2c, 0x3c, 0xfb, 0x8b, 0x1a, 0xa3, 0x6d,
0x14, 0x5f, 0x20, 0x47, 0x31, 0x11, 0x83, 0xa2, 0xf0, 0x74, 0x72, 0x68, 0xfa, 0x79, 0xb3, 0xdf,
0x8f, 0xfe, 0x43, 0x64, 0x33, 0x27, 0xdf, 0x5e, 0xfd, 0x0c, 0xa1, 0x4e, 0x02, 0x01, 0x59, 0x08,
0x95, 0xc5, 0xcb, 0x86, 0x49, 0x3b, 0x11, 0x1c, 0x22, 0x5b, 0xf1, 0x9c, 0xaf, 0x78, 0xbc, 0x9d,
0x8c, 0x4e, 0x86, 0xb3, 0xf1, 0xd9, 0x07, 0x7b, 0x1a, 0x24, 0x97, 0x35, 0xef, 0x71, 0xa6, 0xc4,
0x36, 0x78, 0x50, 0x9b, 0xb4, 0x1b, 0x98, 0xb6, 0xc2, 0xc7, 0x1f, 0xa3, 0xa3, 0x3b, 0xc9, 0xf8,
0x01, 0x1a, 0x2e, 0x61, 0x3b, 0xb1, 0xb4, 0x59, 0xaa, 0x3f, 0xf1, 0xab, 0x68, 0xb4, 0x61, 0xab,
0x35, 0x98, 0x29, 0x3b, 0xb4, 0x7a, 0x7c, 0x74, 0xf0, 0xc8, 0x9a, 0xfe, 0x6a, 0x21, 0xbc, 0x3b,
0x54, 0xec, 0xa1, 0x91, 0x00, 0x16, 0x55, 0x22, 0x76, 0xe0, 0x94, 0x85, 0x37, 0xa2, 0x1a, 0xa0,
0x15, 0x8e, 0xdf, 0x42, 0xf7, 0x24, 0x88, 0x4d, 0x92, 0xc5, 0x46, 0xd3, 0x0e, 0xc6, 0x65, 0xe1,
0xdd, 0x7b, 0x52, 0x41, 0xb4, 0x89, 0xe1, 0x39, 0x1a, 0x2b, 0x10, 0x69, 0x92, 0x31, 0xa5, 0x53,
0x87, 0x26, 0xf5, 0x95, 0xb2, 0xf0, 0xc6, 0x97, 0x1d, 0x4c, 0xfb, 0x39, 0xd3, 0x3f, 0x2d, 0x74,
0xbf, 0xe9, 0xe8, 0x82, 0x0b, 0x85, 0x5f, 0x47, 0x87, 0xe6, 0xe7, 0x19, 0x3f, 0x81, 0x5d, 0x16,
0xde, 0xe1, 0x37, 0xfa, 0xc7, 0x19, 0x14, 0x7f, 0x8e, 0x6c, 0xb3, 0x88, 0x21, 0x5f, 0x55, 0xee,
0x82, 0x53, 0x3d, 0xa7, 0x8b, 0x1a, 0xbb, 0x2d, 0xbc, 0xd7, 0x76, 0x8f, 0x8c, 0x34, 0x61, 0xda,
0x92, 0x75, 0x99, 0x9c, 0x0b, 0x65, 0x7a, 0x1c, 0x55, 0x65, 0x74, 0x79, 0x6a, 0x50, 0x6d, 0x84,
0xe5, 0x79, 0x43, 0x33, 0xdb, 0xe1, 0x54, 0x46, 0xce, 0x3b, 0x98, 0xf6, 0x73, 0xa6, 0x2f, 0x0e,
0xd0, 0x51, 0x63, 0xe4, 0xc9, 0x2a, 0x09, 0x01, 0xff, 0x84, 0x6c, 0x7d, 0xaf, 0x11, 0x53, 0xcc,
0xb8, 0x19, 0x9f, 0xbd, 0xd7, 0x5b, 0x87, 0xf6, 0xec, 0x48, 0xbe, 0x8c, 0x35, 0x20, 0x89, 0xce,
0xee, 0x36, 0xee, 0x6b, 0x50, 0xac, 0x5b, 0xf7, 0x0e, 0xa3, 0xad, 0x2a, 0xfe, 0x14, 0x8d, 0xeb,
0x03, 0xbb, 0xdc, 0xe6, 0x50, 0xb7, 0x39, 0xad, 0x29, 0xe3, 0xf3, 0x2e, 0x74, 0x7b, 0xf7, 0x49,
0xfb, 0x34, 0xfc, 0x3d, 0x72, 0xa0, 0x6e, 0x5c, 0x1f, 0xa6, 0xde, 0xdb, 0xb7, 0xf7, 0xdc, 0xdb,
0xe0, 0x61, 0x5d, 0xcc, 0x69, 0x10, 0x49, 0x3b, 0x31, 0x7c, 0x81, 0x46, 0x7a, 0x9c, 0x72, 0x32,
0x34, 0xaa, 0xa7, 0x7b, 0xaa, 0xea, 0x1f, 0x11, 0x1c, 0xd5, 0xca, 0x23, 0xfd, 0x92, 0xb4, 0x12,
0x9a, 0xfe, 0x61, 0xa1, 0x87, 0x77, 0xa6, 0xfc, 0x55, 0x22, 0x15, 0xfe, 0x71, 0x67, 0xd2, 0x64,
0xbf, 0x49, 0x6b, 0xb6, 0x99, 0x73, 0x7b, 0x71, 0x0d, 0xd2, 0x9b, 0xf2, 0x77, 0x68, 0x94, 0x28,
0x48, 0x9b, 0xd9, 0xbc, 0xb3, 0xa7, 0x0b, 0xd3, 0x5e, 0x67, 0xe3, 0x4b, 0x2d, 0x41, 0x2b, 0xa5,
0x80, 0x5c, 0xdf, 0xb8, 0x83, 0x67, 0x37, 0xee, 0xe0, 0xf9, 0x8d, 0x3b, 0xf8, 0xa5, 0x74, 0xad,
0xeb, 0xd2, 0xb5, 0x9e, 0x95, 0xae, 0xf5, 0xbc, 0x74, 0xad, 0xbf, 0x4a, 0xd7, 0xfa, 0xed, 0x85,
0x3b, 0xf8, 0xc1, 0x6e, 0x34, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x11, 0xa7, 0x0f, 0xd0,
0x06, 0x00, 0x00,
}
func (m *Endpoint) Marshal() (dAtA []byte, err error) {
@ -367,9 +368,9 @@ func (m *EndpointConditions) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x18
}
if m.Accepting != nil {
if m.Serving != nil {
i--
if *m.Accepting {
if *m.Serving {
dAtA[i] = 1
} else {
dAtA[i] = 0
@ -605,7 +606,7 @@ func (m *EndpointConditions) Size() (n int) {
if m.Ready != nil {
n += 2
}
if m.Accepting != nil {
if m.Serving != nil {
n += 2
}
if m.Terminating != nil {
@ -716,7 +717,7 @@ func (this *EndpointConditions) String() string {
}
s := strings.Join([]string{`&EndpointConditions{`,
`Ready:` + valueToStringGenerated(this.Ready) + `,`,
`Accepting:` + valueToStringGenerated(this.Accepting) + `,`,
`Serving:` + valueToStringGenerated(this.Serving) + `,`,
`Terminating:` + valueToStringGenerated(this.Terminating) + `,`,
`}`,
}, "")
@ -1148,7 +1149,7 @@ func (m *EndpointConditions) Unmarshal(dAtA []byte) error {
m.Ready = &b
case 2:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Accepting", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field Serving", wireType)
}
var v int
for shift := uint(0); ; shift += 7 {
@ -1166,7 +1167,7 @@ func (m *EndpointConditions) Unmarshal(dAtA []byte) error {
}
}
b := bool(v != 0)
m.Accepting = &b
m.Serving = &b
case 3:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Terminating", wireType)

4
staging/src/k8s.io/api/discovery/v1alpha1/generated.proto
View File

@ -81,11 +81,11 @@ message EndpointConditions {
// +optional
optional bool ready = 1;
// accepting is identical to ready except that it is set regardless of the terminating
// serving is identical to ready except that it is set regardless of the terminating
// state of endpoints. This condition should be set to true for a ready endpoint that
// is terminating. If nil, consumers should defer to the ready condition.
// +optional
optional bool accepting = 2;
optional bool serving = 2;
// terminating indicates that this endpoint is terminating. A nil value indicates an
// unknown state. Consumers should interpret this unknown state to mean that the

4
staging/src/k8s.io/api/discovery/v1alpha1/types.go
View File

@ -120,11 +120,11 @@ type EndpointConditions struct {
// +optional
Ready *bool `json:"ready,omitempty" protobuf:"bytes,1,name=ready"`
// accepting is identical to ready except that it is set regardless of the terminating
// serving is identical to ready except that it is set regardless of the terminating
// state of endpoints. This condition should be set to true for a ready endpoint that
// is terminating. If nil, consumers should defer to the ready condition.
// +optional
Accepting *bool `json:"accepting,omitempty" protobuf:"bytes,2,name=accepting"`
Serving *bool `json:"serving,omitempty" protobuf:"bytes,2,name=serving"`
// terminating indicates that this endpoint is terminating. A nil value indicates an
// unknown state. Consumers should interpret this unknown state to mean that the

2
staging/src/k8s.io/api/discovery/v1alpha1/types_swagger_doc_generated.go generated
View File

@ -43,7 +43,7 @@ func (Endpoint) SwaggerDoc() map[string]string {
var map_EndpointConditions = map[string]string{
"": "EndpointConditions represents the current condition of an endpoint.",
"ready": "ready indicates that this endpoint is prepared to receive traffic, according to whatever system is managing the endpoint. A nil value indicates an unknown state. In most cases consumers should interpret this unknown state as ready. For compatibility reasons, ready should never be \"true\" for terminating endpoints.",
"accepting": "accepting is identical to ready except that it is set regardless of the terminating state of endpoints. This condition should be set to true for a ready endpoint that is terminating. If nil, consumers should defer to the ready condition.",
"serving": "serving is identical to ready except that it is set regardless of the terminating state of endpoints. This condition should be set to true for a ready endpoint that is terminating. If nil, consumers should defer to the ready condition.",
"terminating": "terminating indicates that this endpoint is terminating. A nil value indicates an unknown state. Consumers should interpret this unknown state to mean that the endpoint is not terminating.",
}

4
staging/src/k8s.io/api/discovery/v1alpha1/zz_generated.deepcopy.go generated
View File

@ -72,8 +72,8 @@ func (in *EndpointConditions) DeepCopyInto(out *EndpointConditions) {
*out = new(bool)
**out = **in
}
if in.Accepting != nil {
in, out := &in.Accepting, &out.Accepting
if in.Serving != nil {
in, out := &in.Serving, &out.Serving
*out = new(bool)
**out = **in
}

112
staging/src/k8s.io/api/discovery/v1beta1/generated.pb.go generated
View File

@ -200,56 +200,56 @@ func init() {
}
var fileDescriptor_ece80bbc872d519b = []byte{
// 778 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x4f, 0x6f, 0xfb, 0x44,
0x10, 0x8d, 0x9b, 0x5a, 0xd8, 0x9b, 0x5f, 0xc4, 0xaf, 0x2b, 0x0e, 0x51, 0xa8, 0xec, 0x28, 0x48,
0x28, 0xa2, 0xaa, 0x4d, 0xaa, 0x0a, 0x55, 0x70, 0xaa, 0xa1, 0x02, 0x24, 0xa0, 0xd1, 0x12, 0x09,
0x09, 0x71, 0x60, 0x63, 0x4f, 0x1d, 0x93, 0xd8, 0x6b, 0xd9, 0x9b, 0x48, 0xb9, 0xf1, 0x11, 0xb8,
0xf0, 0x65, 0xb8, 0x22, 0xa1, 0x1e, 0x7b, 0xec, 0xc9, 0x22, 0xe6, 0x5b, 0xf4, 0x84, 0x76, 0xfd,
0x2f, 0x21, 0xc0, 0x2f, 0xb7, 0xdd, 0xb7, 0xf3, 0xde, 0xcc, 0x9b, 0x9d, 0x41, 0x77, 0x8b, 0x9b,
0xd4, 0x0a, 0x98, 0xbd, 0x58, 0xcd, 0x20, 0x89, 0x80, 0x43, 0x6a, 0xaf, 0x21, 0xf2, 0x58, 0x62,
0x97, 0x0f, 0x34, 0x0e, 0x6c, 0x2f, 0x48, 0x5d, 0xb6, 0x86, 0x64, 0x63, 0xaf, 0xc7, 0x33, 0xe0,
0x74, 0x6c, 0xfb, 0x10, 0x41, 0x42, 0x39, 0x78, 0x56, 0x9c, 0x30, 0xce, 0xf0, 0x79, 0x11, 0x6d,
0xd1, 0x38, 0xb0, 0xea, 0x68, 0xab, 0x8c, 0xee, 0x5f, 0xfa, 0x01, 0x9f, 0xaf, 0x66, 0x96, 0xcb,
0x42, 0xdb, 0x67, 0x3e, 0xb3, 0x25, 0x69, 0xb6, 0x7a, 0x90, 0x37, 0x79, 0x91, 0xa7, 0x42, 0xac,
0x3f, 0xdc, 0x49, 0xed, 0xb2, 0x04, 0xec, 0xf5, 0x41, 0xc2, 0xfe, 0x75, 0x13, 0x13, 0x52, 0x77,
0x1e, 0x44, 0xa2, 0xba, 0x78, 0xe1, 0x0b, 0x20, 0xb5, 0x43, 0xe0, 0xf4, 0xdf, 0x58, 0xf6, 0x7f,
0xb1, 0x92, 0x55, 0xc4, 0x83, 0x10, 0x0e, 0x08, 0x1f, 0xbd, 0x89, 0x90, 0xba, 0x73, 0x08, 0xe9,
0x3f, 0x79, 0xc3, 0xdf, 0xda, 0x48, 0xbb, 0x8b, 0xbc, 0x98, 0x05, 0x11, 0xc7, 0x17, 0x48, 0xa7,
0x9e, 0x97, 0x40, 0x9a, 0x42, 0xda, 0x53, 0x06, 0xed, 0x91, 0xee, 0x74, 0xf3, 0xcc, 0xd4, 0x6f,
0x2b, 0x90, 0x34, 0xef, 0xd8, 0x43, 0xc8, 0x65, 0x91, 0x17, 0xf0, 0x80, 0x45, 0x69, 0xef, 0x64,
0xa0, 0x8c, 0x3a, 0x57, 0x1f, 0x5a, 0xff, 0xd7, 0x5e, 0xab, 0x4a, 0xf4, 0x69, 0xcd, 0x73, 0xf0,
0x63, 0x66, 0xb6, 0xf2, 0xcc, 0x44, 0x0d, 0x46, 0x76, 0x74, 0xf1, 0x08, 0x69, 0x73, 0x96, 0xf2,
0x88, 0x86, 0xd0, 0x6b, 0x0f, 0x94, 0x91, 0xee, 0xbc, 0xca, 0x33, 0x53, 0xfb, 0xa2, 0xc4, 0x48,
0xfd, 0x8a, 0x27, 0x48, 0xe7, 0x34, 0xf1, 0x81, 0x13, 0x78, 0xe8, 0x9d, 0xca, 0x72, 0xde, 0xdb,
0x2d, 0x47, 0x7c, 0x90, 0xb5, 0x1e, 0x5b, 0xf7, 0xb3, 0x9f, 0xc0, 0x15, 0x41, 0x90, 0x40, 0xe4,
0x42, 0xe1, 0x70, 0x5a, 0x31, 0x49, 0x23, 0x82, 0x67, 0x48, 0xe3, 0x2c, 0x66, 0x4b, 0xe6, 0x6f,
0x7a, 0xea, 0xa0, 0x3d, 0xea, 0x5c, 0x5d, 0x1f, 0xe7, 0xcf, 0x9a, 0x96, 0xb4, 0xbb, 0x88, 0x27,
0x1b, 0xe7, 0x75, 0xe9, 0x51, 0xab, 0x60, 0x52, 0xeb, 0xf6, 0x3f, 0x41, 0xdd, 0xbd, 0x60, 0xfc,
0x1a, 0xb5, 0x17, 0xb0, 0xe9, 0x29, 0xc2, 0x2b, 0x11, 0x47, 0xfc, 0x0e, 0x52, 0xd7, 0x74, 0xb9,
0x02, 0xd9, 0x63, 0x9d, 0x14, 0x97, 0x8f, 0x4f, 0x6e, 0x94, 0xe1, 0xaf, 0x0a, 0xc2, 0x87, 0x3d,
0xc5, 0x26, 0x52, 0x13, 0xa0, 0x5e, 0x21, 0xa2, 0x39, 0x7a, 0x9e, 0x99, 0x2a, 0x11, 0x00, 0x29,
0x70, 0xf9, 0xcf, 0xae, 0x0b, 0x31, 0x0f, 0x22, 0x5f, 0xaa, 0x6a, 0xe5, 0x3f, 0x57, 0x20, 0x69,
0xde, 0xf1, 0x18, 0x75, 0x38, 0x24, 0x61, 0x10, 0x51, 0x19, 0xde, 0x96, 0xe1, 0x6f, 0xe7, 0x99,
0xd9, 0x99, 0x36, 0x30, 0xd9, 0x8d, 0x19, 0xfe, 0xa1, 0xa0, 0x57, 0x55, 0x5d, 0x13, 0x96, 0x70,
0x7c, 0x8e, 0x4e, 0xe5, 0x0f, 0x4a, 0x57, 0x8e, 0x96, 0x67, 0xe6, 0xe9, 0x37, 0xe2, 0xf7, 0x24,
0x8a, 0x3f, 0x47, 0x9a, 0x1c, 0x46, 0x97, 0x2d, 0x0b, 0x8f, 0xce, 0x85, 0xe8, 0xd6, 0xa4, 0xc4,
0x5e, 0x32, 0xf3, 0xdd, 0xc3, 0x45, 0xb3, 0xaa, 0x67, 0x52, 0x93, 0x45, 0x9a, 0x98, 0x25, 0x5c,
0xd6, 0xa8, 0x16, 0x69, 0x44, 0x7a, 0x22, 0x51, 0x61, 0x84, 0xc6, 0x71, 0x45, 0x93, 0x23, 0xa2,
0x17, 0x46, 0x6e, 0x1b, 0x98, 0xec, 0xc6, 0x0c, 0xb7, 0x27, 0xa8, 0x5b, 0x19, 0xf9, 0x76, 0x19,
0xb8, 0x80, 0x7f, 0x44, 0x9a, 0xd8, 0x59, 0x8f, 0x72, 0x2a, 0xdd, 0xec, 0xcf, 0x7c, 0xbd, 0x7a,
0x56, 0xbc, 0xf0, 0x05, 0x90, 0x5a, 0x22, 0xba, 0x19, 0xbb, 0xaf, 0x81, 0xd3, 0x66, 0xe6, 0x1b,
0x8c, 0xd4, 0xaa, 0xf8, 0x33, 0xd4, 0x29, 0x97, 0x6c, 0xba, 0x89, 0xa1, 0x2c, 0x73, 0x58, 0x52,
0x3a, 0xb7, 0xcd, 0xd3, 0xcb, 0xfe, 0x95, 0xec, 0xd2, 0xf0, 0x77, 0x48, 0x87, 0xb2, 0x70, 0xb1,
0x9c, 0x62, 0x78, 0xdf, 0x3f, 0x6e, 0x78, 0x9d, 0xb3, 0x32, 0x97, 0x5e, 0x21, 0x29, 0x69, 0xb4,
0xf0, 0x3d, 0x52, 0x45, 0x37, 0xd3, 0x5e, 0x5b, 0x8a, 0x7e, 0x70, 0x9c, 0xa8, 0xf8, 0x06, 0xa7,
0x5b, 0x0a, 0xab, 0xe2, 0x96, 0x92, 0x42, 0x67, 0xf8, 0xbb, 0x82, 0xce, 0xf6, 0x7a, 0xfc, 0x55,
0x90, 0x72, 0xfc, 0xc3, 0x41, 0x9f, 0xad, 0xe3, 0xfa, 0x2c, 0xd8, 0xb2, 0xcb, 0xf5, 0xd6, 0x55,
0xc8, 0x4e, 0x8f, 0x27, 0x48, 0x0d, 0x38, 0x84, 0x55, 0x67, 0x2e, 0x8e, 0x33, 0x21, 0xab, 0x6b,
0x5c, 0x7c, 0x29, 0x14, 0x48, 0x21, 0xe4, 0x5c, 0x3e, 0x6e, 0x8d, 0xd6, 0xd3, 0xd6, 0x68, 0x3d,
0x6f, 0x8d, 0xd6, 0xcf, 0xb9, 0xa1, 0x3c, 0xe6, 0x86, 0xf2, 0x94, 0x1b, 0xca, 0x73, 0x6e, 0x28,
0x7f, 0xe6, 0x86, 0xf2, 0xcb, 0x5f, 0x46, 0xeb, 0xfb, 0xb7, 0x4a, 0xc9, 0xbf, 0x03, 0x00, 0x00,
0xff, 0xff, 0xd8, 0x47, 0x63, 0x91, 0xce, 0x06, 0x00, 0x00,
// 784 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x4d, 0x8f, 0xe3, 0x44,
0x10, 0x8d, 0x27, 0x63, 0x8d, 0xdd, 0xd9, 0x11, 0xbb, 0x2d, 0x0e, 0xd1, 0xb0, 0xb2, 0x47, 0x41,
0xa0, 0x88, 0xd1, 0xda, 0xcc, 0x6a, 0x85, 0x56, 0x70, 0x1a, 0xc3, 0x08, 0x90, 0x80, 0x8d, 0x7a,
0x23, 0x21, 0x21, 0x0e, 0x74, 0xec, 0x5a, 0xc7, 0x24, 0x76, 0x5b, 0xdd, 0x9d, 0x48, 0xb9, 0xf1,
0x0f, 0xe0, 0xf7, 0x70, 0x45, 0x42, 0x73, 0xdc, 0xe3, 0x9e, 0x2c, 0x62, 0xfe, 0xc5, 0x9c, 0x50,
0xb7, 0xbf, 0x12, 0xc2, 0x47, 0x6e, 0xee, 0x57, 0xf5, 0x5e, 0xd5, 0x2b, 0x57, 0xa1, 0xdb, 0xc5,
0x73, 0xe1, 0x25, 0xcc, 0x5f, 0xac, 0x66, 0xc0, 0x33, 0x90, 0x20, 0xfc, 0x35, 0x64, 0x11, 0xe3,
0x7e, 0x1d, 0xa0, 0x79, 0xe2, 0x47, 0x89, 0x08, 0xd9, 0x1a, 0xf8, 0xc6, 0x5f, 0x5f, 0xcf, 0x40,
0xd2, 0x6b, 0x3f, 0x86, 0x0c, 0x38, 0x95, 0x10, 0x79, 0x39, 0x67, 0x92, 0xe1, 0xc7, 0x55, 0xb6,
0x47, 0xf3, 0xc4, 0x6b, 0xb3, 0xbd, 0x3a, 0xfb, 0xe2, 0x49, 0x9c, 0xc8, 0xf9, 0x6a, 0xe6, 0x85,
0x2c, 0xf5, 0x63, 0x16, 0x33, 0x5f, 0x93, 0x66, 0xab, 0x57, 0xfa, 0xa5, 0x1f, 0xfa, 0xab, 0x12,
0xbb, 0x18, 0xed, 0x94, 0x0e, 0x19, 0x07, 0x7f, 0x7d, 0x50, 0xf0, 0xe2, 0x59, 0x97, 0x93, 0xd2,
0x70, 0x9e, 0x64, 0xaa, 0xbb, 0x7c, 0x11, 0x2b, 0x40, 0xf8, 0x29, 0x48, 0xfa, 0x4f, 0x2c, 0xff,
0xdf, 0x58, 0x7c, 0x95, 0xc9, 0x24, 0x85, 0x03, 0xc2, 0x47, 0xff, 0x47, 0x10, 0xe1, 0x1c, 0x52,
0xfa, 0x77, 0xde, 0xe8, 0xd7, 0x3e, 0xb2, 0x6e, 0xb3, 0x28, 0x67, 0x49, 0x26, 0xf1, 0x15, 0xb2,
0x69, 0x14, 0x71, 0x10, 0x02, 0xc4, 0xd0, 0xb8, 0xec, 0x8f, 0xed, 0xe0, 0xbc, 0x2c, 0x5c, 0xfb,
0xa6, 0x01, 0x49, 0x17, 0xc7, 0x11, 0x42, 0x21, 0xcb, 0xa2, 0x44, 0x26, 0x2c, 0x13, 0xc3, 0x93,
0x4b, 0x63, 0x3c, 0x78, 0xfa, 0xa1, 0xf7, 0x5f, 0xe3, 0xf5, 0x9a, 0x42, 0x9f, 0xb6, 0xbc, 0x00,
0xdf, 0x15, 0x6e, 0xaf, 0x2c, 0x5c, 0xd4, 0x61, 0x64, 0x47, 0x17, 0x8f, 0x91, 0x35, 0x67, 0x42,
0x66, 0x34, 0x85, 0x61, 0xff, 0xd2, 0x18, 0xdb, 0xc1, 0x83, 0xb2, 0x70, 0xad, 0x2f, 0x6a, 0x8c,
0xb4, 0x51, 0x3c, 0x41, 0xb6, 0xa4, 0x3c, 0x06, 0x49, 0xe0, 0xd5, 0xf0, 0x54, 0xb7, 0xf3, 0xee,
0x6e, 0x3b, 0xea, 0x07, 0x79, 0xeb, 0x6b, 0xef, 0xc5, 0xec, 0x47, 0x08, 0x55, 0x12, 0x70, 0xc8,
0x42, 0xa8, 0x1c, 0x4e, 0x1b, 0x26, 0xe9, 0x44, 0xf0, 0x0c, 0x59, 0x92, 0xe5, 0x6c, 0xc9, 0xe2,
0xcd, 0xd0, 0xbc, 0xec, 0x8f, 0x07, 0x4f, 0x9f, 0x1d, 0xe7, 0xcf, 0x9b, 0xd6, 0xb4, 0xdb, 0x4c,
0xf2, 0x4d, 0xf0, 0xb0, 0xf6, 0x68, 0x35, 0x30, 0x69, 0x75, 0x2f, 0x3e, 0x41, 0xe7, 0x7b, 0xc9,
0xf8, 0x21, 0xea, 0x2f, 0x60, 0x33, 0x34, 0x94, 0x57, 0xa2, 0x3e, 0xf1, 0xdb, 0xc8, 0x5c, 0xd3,
0xe5, 0x0a, 0xf4, 0x8c, 0x6d, 0x52, 0x3d, 0x3e, 0x3e, 0x79, 0x6e, 0x8c, 0x7e, 0x36, 0x10, 0x3e,
0x9c, 0x29, 0x76, 0x91, 0xc9, 0x81, 0x46, 0x95, 0x88, 0x15, 0xd8, 0x65, 0xe1, 0x9a, 0x44, 0x01,
0xa4, 0xc2, 0xf1, 0x7b, 0xe8, 0x4c, 0x00, 0x5f, 0x27, 0x59, 0xac, 0x35, 0xad, 0x60, 0x50, 0x16,
0xee, 0xd9, 0xcb, 0x0a, 0x22, 0x4d, 0x0c, 0x5f, 0xa3, 0x81, 0x04, 0x9e, 0x26, 0x19, 0x95, 0x2a,
0xb5, 0xaf, 0x53, 0xdf, 0x2a, 0x0b, 0x77, 0x30, 0xed, 0x60, 0xb2, 0x9b, 0x33, 0xfa, 0xdd, 0x40,
0x0f, 0x9a, 0x8e, 0x26, 0x8c, 0x4b, 0xfc, 0x18, 0x9d, 0xea, 0x7f, 0xa7, 0xfd, 0x04, 0x56, 0x59,
0xb8, 0xa7, 0xdf, 0xa8, 0xff, 0xa6, 0x51, 0xfc, 0x39, 0xb2, 0xf4, 0x1a, 0x86, 0x6c, 0x59, 0xb9,
0x0b, 0xae, 0xd4, 0x9c, 0x26, 0x35, 0x76, 0x5f, 0xb8, 0xef, 0x1c, 0x9e, 0x98, 0xd7, 0x84, 0x49,
0x4b, 0x56, 0x65, 0x72, 0xc6, 0xa5, 0xee, 0xd1, 0xac, 0xca, 0xa8, 0xf2, 0x44, 0xa3, 0xca, 0x08,
0xcd, 0xf3, 0x86, 0xa6, 0x97, 0xc3, 0xae, 0x8c, 0xdc, 0x74, 0x30, 0xd9, 0xcd, 0x19, 0x6d, 0x4f,
0xd0, 0x79, 0x63, 0xe4, 0xe5, 0x32, 0x09, 0x01, 0xff, 0x80, 0x2c, 0x75, 0xad, 0x11, 0x95, 0x54,
0xbb, 0xd9, 0xdf, 0xf6, 0xf6, 0xe8, 0xbc, 0x7c, 0x11, 0x2b, 0x40, 0x78, 0x2a, 0xbb, 0x5b, 0xb8,
0xaf, 0x41, 0xd2, 0x6e, 0xdb, 0x3b, 0x8c, 0xb4, 0xaa, 0xf8, 0x33, 0x34, 0xa8, 0xcf, 0x6b, 0xba,
0xc9, 0xa1, 0x6e, 0x73, 0x54, 0x53, 0x06, 0x37, 0x5d, 0xe8, 0x7e, 0xff, 0x49, 0x76, 0x69, 0xf8,
0x5b, 0x64, 0x43, 0xdd, 0xb8, 0x3a, 0x4b, 0xb5, 0xb6, 0xef, 0x1f, 0xb7, 0xb6, 0xc1, 0xa3, 0xba,
0x96, 0xdd, 0x20, 0x82, 0x74, 0x5a, 0xf8, 0x05, 0x32, 0xd5, 0x34, 0xc5, 0xb0, 0xaf, 0x45, 0x3f,
0x38, 0x4e, 0x54, 0xfd, 0x86, 0xe0, 0xbc, 0x16, 0x36, 0xd5, 0x4b, 0x90, 0x4a, 0x67, 0xf4, 0x9b,
0x81, 0x1e, 0xed, 0xcd, 0xf8, 0xab, 0x44, 0x48, 0xfc, 0xfd, 0xc1, 0x9c, 0xbd, 0xe3, 0xe6, 0xac,
0xd8, 0x7a, 0xca, 0xed, 0xbd, 0x35, 0xc8, 0xce, 0x8c, 0x27, 0xc8, 0x4c, 0x24, 0xa4, 0xcd, 0x64,
0xae, 0x8e, 0x33, 0xa1, 0xbb, 0xeb, 0x5c, 0x7c, 0xa9, 0x14, 0x48, 0x25, 0x14, 0x3c, 0xb9, 0xdb,
0x3a, 0xbd, 0xd7, 0x5b, 0xa7, 0xf7, 0x66, 0xeb, 0xf4, 0x7e, 0x2a, 0x1d, 0xe3, 0xae, 0x74, 0x8c,
0xd7, 0xa5, 0x63, 0xbc, 0x29, 0x1d, 0xe3, 0x8f, 0xd2, 0x31, 0x7e, 0xf9, 0xd3, 0xe9, 0x7d, 0x77,
0x56, 0x4b, 0xfe, 0x15, 0x00, 0x00, 0xff, 0xff, 0x95, 0x55, 0x4b, 0x65, 0xc8, 0x06, 0x00, 0x00,
}
func (m *Endpoint) Marshal() (dAtA []byte, err error) {
@ -367,9 +367,9 @@ func (m *EndpointConditions) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x18
}
if m.Accepting != nil {
if m.Serving != nil {
i--
if *m.Accepting {
if *m.Serving {
dAtA[i] = 1
} else {
dAtA[i] = 0
@ -605,7 +605,7 @@ func (m *EndpointConditions) Size() (n int) {
if m.Ready != nil {
n += 2
}
if m.Accepting != nil {
if m.Serving != nil {
n += 2
}
if m.Terminating != nil {
@ -716,7 +716,7 @@ func (this *EndpointConditions) String() string {
}
s := strings.Join([]string{`&EndpointConditions{`,
`Ready:` + valueToStringGenerated(this.Ready) + `,`,
`Accepting:` + valueToStringGenerated(this.Accepting) + `,`,
`Serving:` + valueToStringGenerated(this.Serving) + `,`,
`Terminating:` + valueToStringGenerated(this.Terminating) + `,`,
`}`,
}, "")
@ -1148,7 +1148,7 @@ func (m *EndpointConditions) Unmarshal(dAtA []byte) error {
m.Ready = &b
case 2:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Accepting", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field Serving", wireType)
}
var v int
for shift := uint(0); ; shift += 7 {
@ -1166,7 +1166,7 @@ func (m *EndpointConditions) Unmarshal(dAtA []byte) error {
}
}
b := bool(v != 0)
m.Accepting = &b
m.Serving = &b
case 3:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Terminating", wireType)

4
staging/src/k8s.io/api/discovery/v1beta1/generated.proto
View File

@ -81,11 +81,11 @@ message EndpointConditions {
// +optional
optional bool ready = 1;
// accepting is identical to ready except that it is set regardless of the terminating
// serving is identical to ready except that it is set regardless of the terminating
// state of endpoints. This condition should be set to true for a ready endpoint that
// is terminating. If nil, consumers should defer to the ready condition.
// +optional
optional bool accepting = 2;
optional bool serving = 2;
// terminating indicates that this endpoint is terminating. A nil value indicates an
// unknown state. Consumers should interpret this unknown state to mean that the

4
staging/src/k8s.io/api/discovery/v1beta1/types.go
View File

@ -122,11 +122,11 @@ type EndpointConditions struct {
// +optional
Ready *bool `json:"ready,omitempty" protobuf:"bytes,1,name=ready"`
// accepting is identical to ready except that it is set regardless of the terminating
// serving is identical to ready except that it is set regardless of the terminating
// state of endpoints. This condition should be set to true for a ready endpoint that
// is terminating. If nil, consumers should defer to the ready condition.
// +optional
Accepting *bool `json:"accepting,omitempty" protobuf:"bytes,2,name=accepting"`
Serving *bool `json:"serving,omitempty" protobuf:"bytes,2,name=serving"`
// terminating indicates that this endpoint is terminating. A nil value indicates an
// unknown state. Consumers should interpret this unknown state to mean that the

2
staging/src/k8s.io/api/discovery/v1beta1/types_swagger_doc_generated.go generated
View File

@ -43,7 +43,7 @@ func (Endpoint) SwaggerDoc() map[string]string {
var map_EndpointConditions = map[string]string{
"": "EndpointConditions represents the current condition of an endpoint.",
"ready": "ready indicates that this endpoint is prepared to receive traffic, according to whatever system is managing the endpoint. A nil value indicates an unknown state. In most cases consumers should interpret this unknown state as ready. For compatibility reasons, ready should never be \"true\" for terminating endpoints.",
"accepting": "accepting is identical to ready except that it is set regardless of the terminating state of endpoints. This condition should be set to true for a ready endpoint that is terminating. If nil, consumers should defer to the ready condition.",
"serving": "serving is identical to ready except that it is set regardless of the terminating state of endpoints. This condition should be set to true for a ready endpoint that is terminating. If nil, consumers should defer to the ready condition.",
"terminating": "terminating indicates that this endpoint is terminating. A nil value indicates an unknown state. Consumers should interpret this unknown state to mean that the endpoint is not terminating.",
}

4
staging/src/k8s.io/api/discovery/v1beta1/zz_generated.deepcopy.go generated
View File

@ -72,8 +72,8 @@ func (in *EndpointConditions) DeepCopyInto(out *EndpointConditions) {
*out = new(bool)
**out = **in
}
if in.Accepting != nil {
in, out := &in.Accepting, &out.Accepting
if in.Serving != nil {
in, out := &in.Serving, &out.Serving
*out = new(bool)
**out = **in
}