Skip to content

Commit

Permalink
Merge pull request #42070 from luxas/remove_kube_discovery
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

Remove the kube-discovery binary from the tree

**What this PR does / why we need it**:

kube-discovery was a temporary solution to implementing proposal: https://github.com/kubernetes/community/blob/master/contributors/design-proposals/bootstrap-discovery.md

However, this functionality is now gonna be implemented in the core for v1.6 and will fully replace kube-discovery:
 - #36101 
 - #41281
 - #41417

So due to that `kube-discovery` isn't used in any v1.6 code, it should be removed.
The image `gcr.io/google_containers/kube-discovery-${ARCH}:1.0` should and will continue to exist so kubeadm <= v1.5 continues to work.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
Remove cmd/kube-discovery from the tree since it's not necessary anymore
```
@jbeda @dgoodwin @mikedanese @dmmcquay @lukemarsden @errordeveloper @pires
  • Loading branch information
Kubernetes Submit Queue committed Mar 4, 2017
2 parents b70a5b1 + c4e989f commit 79883dc
Show file tree
Hide file tree
Showing 15 changed files with 0 additions and 747 deletions.
1 change: 0 additions & 1 deletion build/release-tars/BUILD
Expand Up @@ -71,7 +71,6 @@ SERVER_TARGETS = [
"//cmd/hyperkube",
"//cmd/kube-apiserver",
"//cmd/kube-controller-manager",
"//cmd/kube-discovery",
"//cmd/kubeadm",
"//plugin/cmd/kube-scheduler",
]
Expand Down
18 changes: 0 additions & 18 deletions cluster/images/kube-discovery/Dockerfile

This file was deleted.

57 changes: 0 additions & 57 deletions cluster/images/kube-discovery/Makefile

This file was deleted.

45 changes: 0 additions & 45 deletions cluster/images/kube-discovery/README.md

This file was deleted.

1 change: 0 additions & 1 deletion cmd/BUILD
Expand Up @@ -26,7 +26,6 @@ filegroup(
"//cmd/hyperkube:all-srcs",
"//cmd/kube-apiserver:all-srcs",
"//cmd/kube-controller-manager:all-srcs",
"//cmd/kube-discovery:all-srcs",
"//cmd/kube-proxy:all-srcs",
"//cmd/kubeadm:all-srcs",
"//cmd/kubectl:all-srcs",
Expand Down
38 changes: 0 additions & 38 deletions cmd/kube-discovery/BUILD

This file was deleted.

44 changes: 0 additions & 44 deletions cmd/kube-discovery/app/BUILD

This file was deleted.

0 comments on commit 79883dc

Please sign in to comment.