Merge pull request kubernetes#75993 from caesarxuchao/add-count

Adding RemainingItemCount to ListMeta

Author: k8s-ci-robot

api/openapi-spec/swagger.json

@@ -94,6 +94,8 @@ type ListInterface interface {
 	SetSelfLink(selfLink string)
 	GetContinue() string
 	SetContinue(c string)
+	GetRemainingItemCount() int64
+	SetRemainingItemCount(c int64)
 }
 
 // Type exposes the type and APIVersion of versioned or internal API objects.
@@ -111,6 +113,8 @@ func (meta *ListMeta) GetSelfLink() string               { return meta.SelfLink
 func (meta *ListMeta) SetSelfLink(selfLink string)       { meta.SelfLink = selfLink }
 func (meta *ListMeta) GetContinue() string               { return meta.Continue }
 func (meta *ListMeta) SetContinue(c string)              { meta.Continue = c }
+func (meta *ListMeta) GetRemainingItemCount() int64      { return meta.RemainingItemCount }
+func (meta *ListMeta) SetRemainingItemCount(c int64)     { meta.RemainingItemCount = c }
 
 func (obj *TypeMeta) GetObjectKind() schema.ObjectKind { return obj }
 

staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go

@@ -81,6 +81,14 @@ type ListMeta struct {
 	// identical to the value in the first response, unless you have received this token from an error
 	// message.
 	Continue string `json:"continue,omitempty" protobuf:"bytes,3,opt,name=continue"`
+
+	// RemainingItemCount is the number of subsequent items in the list which are not included in this
+	// list response. If the list request contained label or field selectors, then the number of
+	// remaining items is unknown and this field will be unset. If the list is complete (either
+	// because it is unpaginated or because this is the last page), then there are no more remaining
+	// items and this field will also be unset.  Servers older than v1.15 do not set this field.
+	// +optional
+	RemainingItemCount int64 `json:"remainingItemCount,omitempty" protobuf:"bytes,4,opt,name=remainingItemCount"`
 }
 
 // These are internal finalizer values for Kubernetes-like APIs, must be qualified name unless defined here

staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go

@@ -275,6 +275,14 @@ func getNestedString(obj map[string]interface{}, fields ...string) string {
 	return val
 }
 
+func getNestedInt64(obj map[string]interface{}, fields ...string) int64 {
+	val, found, err := NestedInt64(obj, fields...)
+	if !found || err != nil {
+		return 0
+	}
+	return val
+}
+
 func jsonPath(fields []string) string {
 	return "." + strings.Join(fields, ".")
 }

staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto

@@ -166,6 +166,14 @@ func (u *UnstructuredList) SetContinue(c string) {
 	u.setNestedField(c, "metadata", "continue")
 }
 
+func (u *UnstructuredList) GetRemainingItemCount() int64 {
+	return getNestedInt64(u.Object, "metadata", "remainingItemCount")
+}
+
+func (u *UnstructuredList) SetRemainingItemCount(c int64) {
+	u.setNestedField(c, "metadata", "remainingItemCount")
+}
+
 func (u *UnstructuredList) SetGroupVersionKind(gvk schema.GroupVersionKind) {
 	u.SetAPIVersion(gvk.GroupVersion().String())
 	u.SetKind(gvk.Kind)

staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/meta.go

@@ -193,28 +193,31 @@ func TestGenericTypeMeta(t *testing.T) {
 }
 
 type InternalTypeMeta struct {
-	Kind              string                  `json:"kind,omitempty"`
-	Namespace         string                  `json:"namespace,omitempty"`
-	Name              string                  `json:"name,omitempty"`
-	GenerateName      string                  `json:"generateName,omitempty"`
-	UID               string                  `json:"uid,omitempty"`
-	CreationTimestamp metav1.Time             `json:"creationTimestamp,omitempty"`
-	SelfLink          string                  `json:"selfLink,omitempty"`
-	ResourceVersion   string                  `json:"resourceVersion,omitempty"`
-	Continue          string                  `json:"next,omitempty"`
-	APIVersion        string                  `json:"apiVersion,omitempty"`
-	Labels            map[string]string       `json:"labels,omitempty"`
-	Annotations       map[string]string       `json:"annotations,omitempty"`
-	Finalizers        []string                `json:"finalizers,omitempty"`
-	OwnerReferences   []metav1.OwnerReference `json:"ownerReferences,omitempty"`
+	Kind               string                  `json:"kind,omitempty"`
+	Namespace          string                  `json:"namespace,omitempty"`
+	Name               string                  `json:"name,omitempty"`
+	GenerateName       string                  `json:"generateName,omitempty"`
+	UID                string                  `json:"uid,omitempty"`
+	CreationTimestamp  metav1.Time             `json:"creationTimestamp,omitempty"`
+	SelfLink           string                  `json:"selfLink,omitempty"`
+	ResourceVersion    string                  `json:"resourceVersion,omitempty"`
+	Continue           string                  `json:"next,omitempty"`
+	RemainingItemCount int64                   `json:"remainingItemCount,omitempty"`
+	APIVersion         string                  `json:"apiVersion,omitempty"`
+	Labels             map[string]string       `json:"labels,omitempty"`
+	Annotations        map[string]string       `json:"annotations,omitempty"`
+	Finalizers         []string                `json:"finalizers,omitempty"`
+	OwnerReferences    []metav1.OwnerReference `json:"ownerReferences,omitempty"`
 }
 
-func (m *InternalTypeMeta) GetResourceVersion() string   { return m.ResourceVersion }
-func (m *InternalTypeMeta) SetResourceVersion(rv string) { m.ResourceVersion = rv }
-func (m *InternalTypeMeta) GetSelfLink() string          { return m.SelfLink }
-func (m *InternalTypeMeta) SetSelfLink(link string)      { m.SelfLink = link }
-func (m *InternalTypeMeta) GetContinue() string          { return m.Continue }
-func (m *InternalTypeMeta) SetContinue(c string)         { m.Continue = c }
+func (m *InternalTypeMeta) GetResourceVersion() string    { return m.ResourceVersion }
+func (m *InternalTypeMeta) SetResourceVersion(rv string)  { m.ResourceVersion = rv }
+func (m *InternalTypeMeta) GetSelfLink() string           { return m.SelfLink }
+func (m *InternalTypeMeta) SetSelfLink(link string)       { m.SelfLink = link }
+func (m *InternalTypeMeta) GetContinue() string           { return m.Continue }
+func (m *InternalTypeMeta) SetContinue(c string)          { m.Continue = c }
+func (m *InternalTypeMeta) GetRemainingItemCount() int64  { return m.RemainingItemCount }
+func (m *InternalTypeMeta) SetRemainingItemCount(c int64) { m.RemainingItemCount = c }
 
 type MyAPIObject struct {
 	TypeMeta InternalTypeMeta `json:",inline"`