From 62a1532d518dbd09bae69e997c88cec30bcd5d6b Mon Sep 17 00:00:00 2001 From: Michael Taufen Date: Mon, 21 May 2018 19:05:07 -0700 Subject: [PATCH] Remove some completed TODOs --- api/openapi-spec/swagger.json | 4 ++-- api/swagger-spec/v1.json | 4 ++-- .../v1beta1/definitions.html | 2 +- .../scheduling.k8s.io/v1beta1/operations.html | 2 +- docs/api-reference/v1/definitions.html | 4 ++-- pkg/apis/core/types.go | 19 ++----------------- .../src/k8s.io/api/core/v1/generated.proto | 7 ++----- staging/src/k8s.io/api/core/v1/types.go | 7 ++----- .../core/v1/types_swagger_doc_generated.go | 4 ++-- 9 files changed, 16 insertions(+), 37 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index b8fa0e7748..a2dd9539f1 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -76513,11 +76513,11 @@ "type": "string" }, "resourceVersion": { - "description": "ResourceVersion is the metadata.ResourceVersion of the referenced ConfigMap. This field is forbidden in Node.Spec.", + "description": "ResourceVersion is the metadata.ResourceVersion of the referenced ConfigMap. This field is forbidden in Node.Spec, and required in Node.Status.", "type": "string" }, "uid": { - "description": "UID is the metadata.UID of the referenced ConfigMap. This field is currently reqired in Node.Spec.", + "description": "UID is the metadata.UID of the referenced ConfigMap. This field is forbidden in Node.Spec, and required in Node.Status.", "type": "string" } } diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 05388e592d..7ac54ed33b 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -18743,11 +18743,11 @@ }, "uid": { "type": "string", - "description": "UID is the metadata.UID of the referenced ConfigMap. This field is currently reqired in Node.Spec." + "description": "UID is the metadata.UID of the referenced ConfigMap. This field is forbidden in Node.Spec, and required in Node.Status." }, "resourceVersion": { "type": "string", - "description": "ResourceVersion is the metadata.ResourceVersion of the referenced ConfigMap. This field is forbidden in Node.Spec." + "description": "ResourceVersion is the metadata.ResourceVersion of the referenced ConfigMap. This field is forbidden in Node.Spec, and required in Node.Status." }, "kubeletConfigKey": { "type": "string", diff --git a/docs/api-reference/scheduling.k8s.io/v1beta1/definitions.html b/docs/api-reference/scheduling.k8s.io/v1beta1/definitions.html index f1dd21bda9..4b8adef581 100755 --- a/docs/api-reference/scheduling.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/scheduling.k8s.io/v1beta1/definitions.html @@ -1368,7 +1368,7 @@ Examples:
diff --git a/docs/api-reference/scheduling.k8s.io/v1beta1/operations.html b/docs/api-reference/scheduling.k8s.io/v1beta1/operations.html index c70d1a259d..8c9c1566c9 100755 --- a/docs/api-reference/scheduling.k8s.io/v1beta1/operations.html +++ b/docs/api-reference/scheduling.k8s.io/v1beta1/operations.html @@ -1785,7 +1785,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html index c82d349a17..ac244a75f5 100755 --- a/docs/api-reference/v1/definitions.html +++ b/docs/api-reference/v1/definitions.html @@ -3705,14 +3705,14 @@ Examples:

uid

-

UID is the metadata.UID of the referenced ConfigMap. This field is currently reqired in Node.Spec.

+

UID is the metadata.UID of the referenced ConfigMap. This field is forbidden in Node.Spec, and required in Node.Status.

false

string

resourceVersion

-

ResourceVersion is the metadata.ResourceVersion of the referenced ConfigMap. This field is forbidden in Node.Spec.

+

ResourceVersion is the metadata.ResourceVersion of the referenced ConfigMap. This field is forbidden in Node.Spec, and required in Node.Status.

false

string

diff --git a/pkg/apis/core/types.go b/pkg/apis/core/types.go index 4284fbd2d4..54c23ab719 100644 --- a/pkg/apis/core/types.go +++ b/pkg/apis/core/types.go @@ -3269,27 +3269,12 @@ type ConfigMapNodeConfigSource struct { Name string // UID is the metadata.UID of the referenced ConfigMap. - // This field is currently reqired in Node.Spec. - // TODO(#61643): This field will be forbidden in Node.Spec when #61643 is resolved. - // #61643 changes the behavior of dynamic Kubelet config to respect - // ConfigMap updates, and thus removes the ability to pin the Spec to a given UID. - // TODO(#56896): This field will be required in Node.Status when #56896 is resolved. - // #63314 (the PR that resolves #56896) adds a structured status to the Node - // object for reporting information about the config. This status requires UID - // and ResourceVersion, so that it represents a fully-explicit description of - // the configuration in use, while (see previous TODO) the Spec will be - // restricted to namespace/name in #61643. + // This field is forbidden in Node.Spec, and required in Node.Status. // +optional UID types.UID // ResourceVersion is the metadata.ResourceVersion of the referenced ConfigMap. - // This field is forbidden in Node.Spec. - // TODO(#56896): This field will be required in Node.Status when #56896 is resolved. - // #63314 (the PR that resolves #56896) adds a structured status to the Node - // object for reporting information about the config. This status requires UID - // and ResourceVersion, so that it represents a fully-explicit description of - // the configuration in use, while (see previous TODO) the Spec will be - // restricted to namespace/name in #61643. + // This field is forbidden in Node.Spec, and required in Node.Status. // +optional ResourceVersion string diff --git a/staging/src/k8s.io/api/core/v1/generated.proto b/staging/src/k8s.io/api/core/v1/generated.proto index c1f260c659..a92d7392c6 100644 --- a/staging/src/k8s.io/api/core/v1/generated.proto +++ b/staging/src/k8s.io/api/core/v1/generated.proto @@ -450,15 +450,12 @@ message ConfigMapNodeConfigSource { optional string name = 2; // UID is the metadata.UID of the referenced ConfigMap. - // This field is currently reqired in Node.Spec. - // TODO(#61643): This field will be forbidden in Node.Spec when #61643 is resolved. - // TODO(#56896): This field will be required in Node.Status when #56896 is resolved. + // This field is forbidden in Node.Spec, and required in Node.Status. // +optional optional string uid = 3; // ResourceVersion is the metadata.ResourceVersion of the referenced ConfigMap. - // This field is forbidden in Node.Spec. - // TODO(#56896): This field will be required in Node.Status when #56896 is resolved. + // This field is forbidden in Node.Spec, and required in Node.Status. // +optional optional string resourceVersion = 4; diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index 47344bb049..e46e9db0a7 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -3666,15 +3666,12 @@ type ConfigMapNodeConfigSource struct { Name string `json:"name" protobuf:"bytes,2,opt,name=name"` // UID is the metadata.UID of the referenced ConfigMap. - // This field is currently reqired in Node.Spec. - // TODO(#61643): This field will be forbidden in Node.Spec when #61643 is resolved. - // TODO(#56896): This field will be required in Node.Status when #56896 is resolved. + // This field is forbidden in Node.Spec, and required in Node.Status. // +optional UID types.UID `json:"uid,omitempty" protobuf:"bytes,3,opt,name=uid"` // ResourceVersion is the metadata.ResourceVersion of the referenced ConfigMap. - // This field is forbidden in Node.Spec. - // TODO(#56896): This field will be required in Node.Status when #56896 is resolved. + // This field is forbidden in Node.Spec, and required in Node.Status. // +optional ResourceVersion string `json:"resourceVersion,omitempty" protobuf:"bytes,4,opt,name=resourceVersion"` diff --git a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go index 6316816abc..567f37dd22 100644 --- a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go @@ -266,8 +266,8 @@ var map_ConfigMapNodeConfigSource = map[string]string{ "": "ConfigMapNodeConfigSource contains the information to reference a ConfigMap as a config source for the Node.", "namespace": "Namespace is the metadata.namespace of the referenced ConfigMap. This field is required in all cases.", "name": "Name is the metadata.name of the referenced ConfigMap. This field is required in all cases.", - "uid": "UID is the metadata.UID of the referenced ConfigMap. This field is currently reqired in Node.Spec.", - "resourceVersion": "ResourceVersion is the metadata.ResourceVersion of the referenced ConfigMap. This field is forbidden in Node.Spec.", + "uid": "UID is the metadata.UID of the referenced ConfigMap. This field is forbidden in Node.Spec, and required in Node.Status.", + "resourceVersion": "ResourceVersion is the metadata.ResourceVersion of the referenced ConfigMap. This field is forbidden in Node.Spec, and required in Node.Status.", "kubeletConfigKey": "KubeletConfigKey declares which key of the referenced ConfigMap corresponds to the KubeletConfiguration structure This field is required in all cases.", }