From 0bba65ca1a89a6169feb454959f6f6fddd71eb3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= Date: Sat, 1 Oct 2016 16:46:48 +0300 Subject: [PATCH] Remove old references to contrib/mesos --- cmd/hyperkube/hyperkube.go | 2 -- cmd/hyperkube/hyperkube_test.go | 2 -- cmd/hyperkube/kube-apiserver.go | 2 -- cmd/hyperkube/kube-controller-manager.go | 2 -- cmd/hyperkube/kube-proxy.go | 2 -- cmd/hyperkube/kube-scheduler.go | 2 -- cmd/hyperkube/main.go | 2 -- cmd/hyperkube/server.go | 2 -- .../app/controllermanager.go | 2 -- .../app/options/options.go | 2 -- hack/.linted_packages | 7 ------ .../endpoint/endpoints_controller.go | 2 -- plugin/pkg/scheduler/scheduler.go | 3 --- test/test_owners.csv | 22 ------------------- 14 files changed, 54 deletions(-) diff --git a/cmd/hyperkube/hyperkube.go b/cmd/hyperkube/hyperkube.go index aff2af4ea7..e36902a262 100644 --- a/cmd/hyperkube/hyperkube.go +++ b/cmd/hyperkube/hyperkube.go @@ -14,8 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// CAUTION: If you update code in this file, you may need to also update code -// in contrib/mesos/cmd/km/hyperkube.go package main import ( diff --git a/cmd/hyperkube/hyperkube_test.go b/cmd/hyperkube/hyperkube_test.go index 5294000f61..779428b795 100644 --- a/cmd/hyperkube/hyperkube_test.go +++ b/cmd/hyperkube/hyperkube_test.go @@ -14,8 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// CAUTION: If you update code in this file, you may need to also update code -// in contrib/mesos/cmd/km/hyperkube_test.go package main import ( diff --git a/cmd/hyperkube/kube-apiserver.go b/cmd/hyperkube/kube-apiserver.go index bffcc0ce75..61041e1d99 100644 --- a/cmd/hyperkube/kube-apiserver.go +++ b/cmd/hyperkube/kube-apiserver.go @@ -14,8 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// CAUTION: If you update code in this file, you may need to also update code -// in contrib/mesos/cmd/km/kube-apiserver.go package main import ( diff --git a/cmd/hyperkube/kube-controller-manager.go b/cmd/hyperkube/kube-controller-manager.go index 76f1a793be..b102a4023a 100644 --- a/cmd/hyperkube/kube-controller-manager.go +++ b/cmd/hyperkube/kube-controller-manager.go @@ -14,8 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// CAUTION: If you update code in this file, you may need to also update code -// in contrib/mesos/cmd/km/k8sm-controllermanager.go package main import ( diff --git a/cmd/hyperkube/kube-proxy.go b/cmd/hyperkube/kube-proxy.go index 7fe790644f..9de0f4d84b 100644 --- a/cmd/hyperkube/kube-proxy.go +++ b/cmd/hyperkube/kube-proxy.go @@ -14,8 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// CAUTION: If you update code in this file, you may need to also update code -// in contrib/mesos/cmd/km/kube-proxy.go package main import ( diff --git a/cmd/hyperkube/kube-scheduler.go b/cmd/hyperkube/kube-scheduler.go index 385fcc8d8c..0939f3da77 100644 --- a/cmd/hyperkube/kube-scheduler.go +++ b/cmd/hyperkube/kube-scheduler.go @@ -14,8 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// CAUTION: If you update code in this file, you may need to also update code -// in contrib/mesos/cmd/km/k8sm-scheduler.go package main import ( diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go index df6d239231..a1f6c14cb7 100644 --- a/cmd/hyperkube/main.go +++ b/cmd/hyperkube/main.go @@ -17,8 +17,6 @@ limitations under the License. // A binary that can morph into all of the other kubernetes binaries. You can // also soft-link to it busybox style. // -// CAUTION: If you update code in this file, you may need to also update code -// in contrib/mesos/cmd/km/km.go package main import ( diff --git a/cmd/hyperkube/server.go b/cmd/hyperkube/server.go index 6ac1661b6c..e315d85bd8 100644 --- a/cmd/hyperkube/server.go +++ b/cmd/hyperkube/server.go @@ -14,8 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// CAUTION: If you update code in this file, you may need to also update code -// in contrib/mesos/cmd/km/server.go package main import ( diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 9573399da5..c24e96de6c 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -18,8 +18,6 @@ limitations under the License. // components. This includes replication controllers, service endpoints and // nodes. // -// CAUTION: If you update code in this file, you may need to also update code -// in contrib/mesos/pkg/controllermanager/controllermanager.go package app import ( diff --git a/cmd/kube-controller-manager/app/options/options.go b/cmd/kube-controller-manager/app/options/options.go index 78b388a52a..6d57277343 100644 --- a/cmd/kube-controller-manager/app/options/options.go +++ b/cmd/kube-controller-manager/app/options/options.go @@ -16,8 +16,6 @@ limitations under the License. // Package options provides the flags used for the controller manager. // -// CAUTION: If you update code in this file, you may need to also update code -// in contrib/mesos/pkg/controllermanager/controllermanager.go package options import ( diff --git a/hack/.linted_packages b/hack/.linted_packages index caeb063b66..c00257c0de 100644 --- a/hack/.linted_packages +++ b/hack/.linted_packages @@ -33,13 +33,6 @@ cmd/libs/go2idl/parser cmd/libs/go2idl/set-gen cmd/libs/go2idl/set-gen/generators cmd/linkcheck -contrib/mesos/cmd/k8sm-controller-manager -contrib/mesos/cmd/k8sm-executor -contrib/mesos/cmd/k8sm-scheduler -contrib/mesos/pkg/executor/config -contrib/mesos/pkg/flagutil -contrib/mesos/pkg/scheduler/components/algorithm -contrib/mesos/pkg/scheduler/service docs/user-guide/environment-guide/containers/backend docs/user-guide/environment-guide/containers/show docs/user-guide/liveness/image diff --git a/pkg/controller/endpoint/endpoints_controller.go b/pkg/controller/endpoint/endpoints_controller.go index b90032527b..20c5358c35 100644 --- a/pkg/controller/endpoint/endpoints_controller.go +++ b/pkg/controller/endpoint/endpoints_controller.go @@ -14,8 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// CAUTION: If you update code in this file, you may need to also update code -// in contrib/mesos/pkg/service/endpoints_controller.go package endpoint import ( diff --git a/plugin/pkg/scheduler/scheduler.go b/plugin/pkg/scheduler/scheduler.go index f6da7b4b37..8b85398fd2 100644 --- a/plugin/pkg/scheduler/scheduler.go +++ b/plugin/pkg/scheduler/scheduler.go @@ -16,9 +16,6 @@ limitations under the License. package scheduler -// Note: if you change code in this file, you might need to change code in -// contrib/mesos/pkg/scheduler/. - import ( "time" diff --git a/test/test_owners.csv b/test/test_owners.csv index be4869957a..207af23b2d 100644 --- a/test/test_owners.csv +++ b/test/test_owners.csv @@ -529,28 +529,6 @@ k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators,davidopp,1 k8s.io/kubernetes/cmd/libs/go2idl/parser,lavalamp,1 k8s.io/kubernetes/cmd/libs/go2idl/types,mikedanese,1 k8s.io/kubernetes/cmd/mungedocs,mwielgus,1 -k8s.io/kubernetes/contrib/mesos/cmd/km,brendandburns,1 -k8s.io/kubernetes/contrib/mesos/pkg/election,vulpecula,1 -k8s.io/kubernetes/contrib/mesos/pkg/executor,brendandburns,1 -k8s.io/kubernetes/contrib/mesos/pkg/minion/tasks,hurf,1 -k8s.io/kubernetes/contrib/mesos/pkg/node,jdef,1 -k8s.io/kubernetes/contrib/mesos/pkg/offers,Q-Lee,1 -k8s.io/kubernetes/contrib/mesos/pkg/podutil,Q-Lee,1 -k8s.io/kubernetes/contrib/mesos/pkg/proc,apelisse,1 -k8s.io/kubernetes/contrib/mesos/pkg/queue,caesarxuchao,1 -k8s.io/kubernetes/contrib/mesos/pkg/redirfd,cjcullen,1 -k8s.io/kubernetes/contrib/mesos/pkg/runtime,davidopp,1 -k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/deleter,karlkfi,1 -k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/framework,kevin-wangzefeng,1 -k8s.io/kubernetes/contrib/mesos/pkg/scheduler/config,dchen1107,1 -k8s.io/kubernetes/contrib/mesos/pkg/scheduler/constraint,dchen1107,1 -k8s.io/kubernetes/contrib/mesos/pkg/scheduler/executorinfo,luxas,1 -k8s.io/kubernetes/contrib/mesos/pkg/scheduler/integration,yifan-gu,1 -k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask,dchen1107,1 -k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask/hostport,mml,1 -k8s.io/kubernetes/contrib/mesos/pkg/scheduler/resources,ixdy,1 -k8s.io/kubernetes/contrib/mesos/pkg/scheduler/service,madhusudancs,1 -k8s.io/kubernetes/contrib/mesos/pkg/service,jdef,1 k8s.io/kubernetes/examples,Random-Liu,0 k8s.io/kubernetes/examples/apiserver,nikhiljindal,0 k8s.io/kubernetes/federation/apis/federation/install,nikhiljindal,0