Remove some completed TODOs

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"
      }
     }

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",

docs/api-reference/scheduling.k8s.io/v1beta1/definitions.html

@@ -1368,7 +1368,7 @@ Examples:<br>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2018-04-24 19:23:14 UTC
+
 </div>
 </div>
 </body>

docs/api-reference/scheduling.k8s.io/v1beta1/operations.html

@@ -1785,7 +1785,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2018-04-24 19:23:14 UTC
+
 </div>
 </div>
 </body>

docs/api-reference/v1/definitions.html

@@ -3705,14 +3705,14 @@ Examples:<br>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">uid</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UID is the metadata.UID of the referenced ConfigMap. This field is currently reqired in Node.Spec.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">UID is the metadata.UID of the referenced ConfigMap. This field is forbidden in Node.Spec, and required in Node.Status.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">resourceVersion</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">ResourceVersion is the metadata.ResourceVersion of the referenced ConfigMap. This field is forbidden in Node.Spec.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">ResourceVersion is the metadata.ResourceVersion of the referenced ConfigMap. This field is forbidden in Node.Spec, and required in Node.Status.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
 <td class="tableblock halign-left valign-top"></td>

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
 

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;
 

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"`
 

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.",
 }