From c9a46a0806b61dc4bcc8edce3e36bd45aa9cd62d Mon Sep 17 00:00:00 2001 From: Klaus Ma Date: Tue, 6 Jun 2017 07:49:00 -0400 Subject: [PATCH 1/3] Deprecated binding object in 1.7. --- pkg/api/types.go | 3 ++- pkg/api/v1/types.go | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/api/types.go b/pkg/api/types.go index 673d5c7769c..bab3aa3ee29 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -3135,7 +3135,8 @@ type NamespaceList struct { Items []Namespace } -// Binding ties one object to another - for example, a pod is bound to a node by a scheduler. +// Binding ties one object to another; for example, a pod is bound to a node by a scheduler. +// Deprecated in 1.7, please use the bindings subresource of pods instead. type Binding struct { metav1.TypeMeta // ObjectMeta describes the object that is being bound. diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index 1e5d2bef473..3f4ac4ac933 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -3593,8 +3593,8 @@ type NamespaceList struct { Items []Namespace `json:"items" protobuf:"bytes,2,rep,name=items"` } -// Binding ties one object to another. -// For example, a pod is bound to a node by a scheduler. +// Binding ties one object to another; for example, a pod is bound to a node by a scheduler. +// Deprecated in 1.7, please use the bindings subresource of pods instead. type Binding struct { metav1.TypeMeta `json:",inline"` // Standard object's metadata. From fdc82d16f3ce3459efb147fe892a2053537b4139 Mon Sep 17 00:00:00 2001 From: Klaus Ma Date: Thu, 8 Jun 2017 10:51:46 +0800 Subject: [PATCH 2/3] generated codes. --- api/openapi-spec/swagger.json | 2 +- api/swagger-spec/v1.json | 2 +- docs/api-reference/v1/definitions.html | 4 ++-- pkg/api/v1/generated.proto | 4 ++-- pkg/api/v1/types_swagger_doc_generated.go | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index ff0b18e74a6..aa2dcb98c51 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -46918,7 +46918,7 @@ } }, "io.k8s.kubernetes.pkg.api.v1.Binding": { - "description": "Binding ties one object to another. For example, a pod is bound to a node by a scheduler.", + "description": "Binding ties one object to another; for example, a pod is bound to a node by a scheduler. Deprecated in 1.7, please use the bindings subresource of pods instead.", "required": [ "target" ], diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index eb07fbf68ea..7cee7941a2f 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -17327,7 +17327,7 @@ "models": { "v1.Binding": { "id": "v1.Binding", - "description": "Binding ties one object to another. For example, a pod is bound to a node by a scheduler.", + "description": "Binding ties one object to another; for example, a pod is bound to a node by a scheduler. Deprecated in 1.7, please use the bindings subresource of pods instead.", "required": [ "target" ], diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html index 431dfd23752..c4efeaa73d0 100755 --- a/docs/api-reference/v1/definitions.html +++ b/docs/api-reference/v1/definitions.html @@ -8071,7 +8071,7 @@ Examples:

v1.Binding

-

Binding ties one object to another. For example, a pod is bound to a node by a scheduler.

+

Binding ties one object to another; for example, a pod is bound to a node by a scheduler. Deprecated in 1.7, please use the bindings subresource of pods instead.

@@ -10112,7 +10112,7 @@ Examples:
diff --git a/pkg/api/v1/generated.proto b/pkg/api/v1/generated.proto index 4843f48f055..b3f8a58d6f6 100644 --- a/pkg/api/v1/generated.proto +++ b/pkg/api/v1/generated.proto @@ -138,8 +138,8 @@ message AzureFileVolumeSource { optional bool readOnly = 3; } -// Binding ties one object to another. -// For example, a pod is bound to a node by a scheduler. +// Binding ties one object to another; for example, a pod is bound to a node by a scheduler. +// Deprecated in 1.7, please use the bindings subresource of pods instead. message Binding { // Standard object's metadata. // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata diff --git a/pkg/api/v1/types_swagger_doc_generated.go b/pkg/api/v1/types_swagger_doc_generated.go index 228a34ffa44..69b72e445a3 100644 --- a/pkg/api/v1/types_swagger_doc_generated.go +++ b/pkg/api/v1/types_swagger_doc_generated.go @@ -95,7 +95,7 @@ func (AzureFileVolumeSource) SwaggerDoc() map[string]string { } var map_Binding = map[string]string{ - "": "Binding ties one object to another. For example, a pod is bound to a node by a scheduler.", + "": "Binding ties one object to another; for example, a pod is bound to a node by a scheduler. Deprecated in 1.7, please use the bindings subresource of pods instead.", "metadata": "Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata", "target": "The target object that you want to bind to the standard object.", } From 6ad529be3ee75eb16f0e1c6b4d518bfe5edaeeaa Mon Sep 17 00:00:00 2001 From: Klaus Ma Date: Thu, 8 Jun 2017 10:53:25 +0800 Subject: [PATCH 3/3] generated client-go. --- staging/src/k8s.io/client-go/pkg/api/types.go | 3 ++- staging/src/k8s.io/client-go/pkg/api/v1/generated.proto | 4 ++-- staging/src/k8s.io/client-go/pkg/api/v1/types.go | 4 ++-- .../client-go/pkg/api/v1/types_swagger_doc_generated.go | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/staging/src/k8s.io/client-go/pkg/api/types.go b/staging/src/k8s.io/client-go/pkg/api/types.go index 673d5c7769c..bab3aa3ee29 100644 --- a/staging/src/k8s.io/client-go/pkg/api/types.go +++ b/staging/src/k8s.io/client-go/pkg/api/types.go @@ -3135,7 +3135,8 @@ type NamespaceList struct { Items []Namespace } -// Binding ties one object to another - for example, a pod is bound to a node by a scheduler. +// Binding ties one object to another; for example, a pod is bound to a node by a scheduler. +// Deprecated in 1.7, please use the bindings subresource of pods instead. type Binding struct { metav1.TypeMeta // ObjectMeta describes the object that is being bound. diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/generated.proto b/staging/src/k8s.io/client-go/pkg/api/v1/generated.proto index 72dcb10223e..0e5d150e167 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/api/v1/generated.proto @@ -138,8 +138,8 @@ message AzureFileVolumeSource { optional bool readOnly = 3; } -// Binding ties one object to another. -// For example, a pod is bound to a node by a scheduler. +// Binding ties one object to another; for example, a pod is bound to a node by a scheduler. +// Deprecated in 1.7, please use the bindings subresource of pods instead. message Binding { // Standard object's metadata. // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/types.go b/staging/src/k8s.io/client-go/pkg/api/v1/types.go index 1e5d2bef473..3f4ac4ac933 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/types.go +++ b/staging/src/k8s.io/client-go/pkg/api/v1/types.go @@ -3593,8 +3593,8 @@ type NamespaceList struct { Items []Namespace `json:"items" protobuf:"bytes,2,rep,name=items"` } -// Binding ties one object to another. -// For example, a pod is bound to a node by a scheduler. +// Binding ties one object to another; for example, a pod is bound to a node by a scheduler. +// Deprecated in 1.7, please use the bindings subresource of pods instead. type Binding struct { metav1.TypeMeta `json:",inline"` // Standard object's metadata. diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/client-go/pkg/api/v1/types_swagger_doc_generated.go index 228a34ffa44..69b72e445a3 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/client-go/pkg/api/v1/types_swagger_doc_generated.go @@ -95,7 +95,7 @@ func (AzureFileVolumeSource) SwaggerDoc() map[string]string { } var map_Binding = map[string]string{ - "": "Binding ties one object to another. For example, a pod is bound to a node by a scheduler.", + "": "Binding ties one object to another; for example, a pod is bound to a node by a scheduler. Deprecated in 1.7, please use the bindings subresource of pods instead.", "metadata": "Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata", "target": "The target object that you want to bind to the standard object.", }