Merge pull request #26196 from nikhiljindal/renameFedAPIServer

Automatic merge from submit-queue

Renaming federated-apiserver to federation-apiserver

Its not a "federated" apiserver. Its an apiserver for federation.

The corresponding controller manager is also called federation-controller-manager.

If we are going to rename, it should be done in 1.3 before people write scripts referencing the binary name.

federation/cmd/federation-apiserver/apiserver.go

@@ -25,7 +25,7 @@ import (
 	"runtime"
 	"time"
 
-	"k8s.io/kubernetes/federation/cmd/federated-apiserver/app"
+	"k8s.io/kubernetes/federation/cmd/federation-apiserver/app"
 	genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options"
 	"k8s.io/kubernetes/pkg/util"
 	"k8s.io/kubernetes/pkg/util/flag"

federation/cmd/federation-apiserver/app/server.go

@@ -42,7 +42,7 @@ func NewAPIServerCommand() *cobra.Command {
 	s := genericoptions.NewServerRunOptions()
 	s.AddFlags(pflag.CommandLine)
 	cmd := &cobra.Command{
-		Use: "federated-apiserver",
+		Use: "federation-apiserver",
 		Long: `The Kubernetes federation API server validates and configures data
 for the api objects which include pods, services, replicationcontrollers, and
 others. The API Server services REST operations and provides the frontend to the

hack/lib/golang.sh

@@ -37,7 +37,7 @@ kube::golang::server_targets() {
     cmd/kubelet
     cmd/kubemark
     cmd/hyperkube
-    federation/cmd/federated-apiserver
+    federation/cmd/federation-apiserver
     federation/cmd/federation-controller-manager
     plugin/cmd/kube-scheduler
   )