Merge pull request #60476 from xiangpengzhao/remove-todos

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Remove invalid TODOs in kubeadm constants. **What this PR does / why we need it**: These TODOs are invalid now. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: ref https://github.com/kubernetes/kubeadm/issues/571#issuecomment-347408384 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #60476 from xiangpengzhao/remove-todos
ac57bbea · Kubernetes Submit Queue · GitHub · ce1cab3b · f69fd761 · ac57bbea
Unverified Commit ac57bbea authored Apr 13, 2018 by Kubernetes Submit Queue Committed by GitHub Apr 13, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

constants.go cmd/kubeadm/app/constants/constants.go +0 -4

No files found.
--- a/cmd/kubeadm/app/constants/constants.go
+++ b/cmd/kubeadm/app/constants/constants.go
@@ -195,16 +195,12 @@ const (
 	KubeletBaseConfigurationConfigMap = "kubelet-base-config-1.9"

 	// KubeletBaseConfigurationConfigMapKey specifies in what ConfigMap key the initial remote configuration of kubelet should be stored
-	// TODO: Use the constant ("kubelet.config.k8s.io") defined in pkg/kubelet/kubeletconfig/util/keys/keys.go
-	// after https://github.com/kubernetes/kubernetes/pull/53833 being merged.
 	KubeletBaseConfigurationConfigMapKey = "kubelet"

 	// KubeletBaseConfigurationDir specifies the directory on the node where stores the initial remote configuration of kubelet
 	KubeletBaseConfigurationDir = "/var/lib/kubelet/config/init"

 	// KubeletBaseConfigurationFile specifies the file name on the node which stores initial remote configuration of kubelet
-	// TODO: Use the constant ("kubelet.config.k8s.io") defined in pkg/kubelet/kubeletconfig/util/keys/keys.go
-	// after https://github.com/kubernetes/kubernetes/pull/53833 being merged.
 	KubeletBaseConfigurationFile = "kubelet"

 	// MinExternalEtcdVersion indicates minimum external etcd version which kubeadm supports