forked from kubernetes/kubernetes
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request kubernetes#3998 from jbeda/hyperkube-servers2
Convert scheduler and controller-manager to hyperkube
- Loading branch information
Showing
7 changed files
with
311 additions
and
151 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,173 @@ | ||
| /* | ||
| Copyright 2014 Google Inc. All rights reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| // Package controllermanager implements a server that runs a set of active | ||
| // components. This includes replication controllers, service endpoints and | ||
| // nodes. | ||
| package controllermanager | ||
|
|
||
| import ( | ||
| "net" | ||
| "net/http" | ||
| "strconv" | ||
| "time" | ||
|
|
||
| "github.com/GoogleCloudPlatform/kubernetes/pkg/api" | ||
| "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" | ||
| "github.com/GoogleCloudPlatform/kubernetes/pkg/client" | ||
| "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" | ||
| nodeControllerPkg "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/controller" | ||
| replicationControllerPkg "github.com/GoogleCloudPlatform/kubernetes/pkg/controller" | ||
| _ "github.com/GoogleCloudPlatform/kubernetes/pkg/healthz" | ||
| "github.com/GoogleCloudPlatform/kubernetes/pkg/hyperkube" | ||
| "github.com/GoogleCloudPlatform/kubernetes/pkg/master/ports" | ||
| "github.com/GoogleCloudPlatform/kubernetes/pkg/resourcequota" | ||
| "github.com/GoogleCloudPlatform/kubernetes/pkg/service" | ||
| "github.com/GoogleCloudPlatform/kubernetes/pkg/util" | ||
|
|
||
| "github.com/golang/glog" | ||
| "github.com/spf13/pflag" | ||
| ) | ||
|
|
||
| // CMServer is the mail context object for the controller manager. | ||
| type CMServer struct { | ||
| Port int | ||
| Address util.IP | ||
| ClientConfig client.Config | ||
| CloudProvider string | ||
| CloudConfigFile string | ||
| MinionRegexp string | ||
| NodeSyncPeriod time.Duration | ||
| ResourceQuotaSyncPeriod time.Duration | ||
| RegisterRetryCount int | ||
| MachineList util.StringList | ||
|
|
||
| // TODO: Discover these by pinging the host machines, and rip out these params. | ||
| NodeMilliCPU int64 | ||
| NodeMemory resource.Quantity | ||
|
|
||
| KubeletConfig client.KubeletConfig | ||
| } | ||
|
|
||
| // NewCMServer creates a new CMServer with default a default config. | ||
| func NewCMServer() *CMServer { | ||
| s := CMServer{ | ||
| Port: ports.ControllerManagerPort, | ||
| Address: util.IP(net.ParseIP("127.0.0.1")), | ||
| NodeSyncPeriod: 10 * time.Second, | ||
| ResourceQuotaSyncPeriod: 10 * time.Second, | ||
| RegisterRetryCount: 10, | ||
| NodeMilliCPU: 1000, | ||
| NodeMemory: resource.MustParse("3Gi"), | ||
| KubeletConfig: client.KubeletConfig{ | ||
| Port: ports.KubeletPort, | ||
| EnableHttps: false, | ||
| }, | ||
| } | ||
| return &s | ||
| } | ||
|
|
||
| // NewHyperkubeServer creates a new hyperkube Server object that includes the | ||
| // description and flags. | ||
| func NewHyperkubeServer() *hyperkube.Server { | ||
| s := NewCMServer() | ||
|
|
||
| hks := hyperkube.Server{ | ||
| SimpleUsage: "controller-manager", | ||
| Long: "A server that runs a set of active components. This includes replication controllers, service endpoints and nodes.", | ||
| Run: func(_ *hyperkube.Server, args []string) error { | ||
| return s.Run(args) | ||
| }, | ||
| } | ||
| s.AddFlags(hks.Flags()) | ||
| return &hks | ||
| } | ||
|
|
||
| // AddFlags adds flags for a specific CMServer to the specified FlagSet | ||
| func (s *CMServer) AddFlags(fs *pflag.FlagSet) { | ||
| fs.IntVar(&s.Port, "port", s.Port, "The port that the controller-manager's http service runs on") | ||
| fs.Var(&s.Address, "address", "The IP address to serve on (set to 0.0.0.0 for all interfaces)") | ||
| client.BindClientConfigFlags(fs, &s.ClientConfig) | ||
| fs.StringVar(&s.CloudProvider, "cloud_provider", s.CloudProvider, "The provider for cloud services. Empty string for no provider.") | ||
| fs.StringVar(&s.CloudConfigFile, "cloud_config", s.CloudConfigFile, "The path to the cloud provider configuration file. Empty string for no configuration file.") | ||
| fs.StringVar(&s.MinionRegexp, "minion_regexp", s.MinionRegexp, "If non empty, and -cloud_provider is specified, a regular expression for matching minion VMs.") | ||
| fs.DurationVar(&s.NodeSyncPeriod, "node_sync_period", s.NodeSyncPeriod, ""+ | ||
| "The period for syncing nodes from cloudprovider. Longer periods will result in "+ | ||
| "fewer calls to cloud provider, but may delay addition of new nodes to cluster.") | ||
| fs.DurationVar(&s.ResourceQuotaSyncPeriod, "resource_quota_sync_period", s.ResourceQuotaSyncPeriod, "The period for syncing quota usage status in the system") | ||
| fs.IntVar(&s.RegisterRetryCount, "register_retry_count", s.RegisterRetryCount, ""+ | ||
| "The number of retries for initial node registration. Retry interval equals node_sync_period.") | ||
| fs.Var(&s.MachineList, "machines", "List of machines to schedule onto, comma separated.") | ||
| // TODO: Discover these by pinging the host machines, and rip out these flags. | ||
| // TODO: in the meantime, use resource.QuantityFlag() instead of these | ||
| fs.Int64Var(&s.NodeMilliCPU, "node_milli_cpu", s.NodeMilliCPU, "The amount of MilliCPU provisioned on each node") | ||
| fs.Var(resource.NewQuantityFlagValue(&s.NodeMemory), "node_memory", "The amount of memory (in bytes) provisioned on each node") | ||
| client.BindKubeletClientConfigFlags(fs, &s.KubeletConfig) | ||
| } | ||
|
|
||
| func (s *CMServer) verifyMinionFlags() { | ||
| if s.CloudProvider == "" || s.MinionRegexp == "" { | ||
| if len(s.MachineList) == 0 { | ||
| glog.Info("No machines specified!") | ||
| } | ||
| return | ||
| } | ||
| if len(s.MachineList) != 0 { | ||
| glog.Info("--machines is overwritten by --minion_regexp") | ||
| } | ||
| } | ||
|
|
||
| // Run runs the CMServer. This should never exit. | ||
| func (s *CMServer) Run(_ []string) error { | ||
| s.verifyMinionFlags() | ||
|
|
||
| if len(s.ClientConfig.Host) == 0 { | ||
| glog.Fatal("usage: controller-manager --master <master>") | ||
| } | ||
|
|
||
| kubeClient, err := client.New(&s.ClientConfig) | ||
| if err != nil { | ||
| glog.Fatalf("Invalid API configuration: %v", err) | ||
| } | ||
|
|
||
| go http.ListenAndServe(net.JoinHostPort(s.Address.String(), strconv.Itoa(s.Port)), nil) | ||
|
|
||
| endpoints := service.NewEndpointController(kubeClient) | ||
| go util.Forever(func() { endpoints.SyncServiceEndpoints() }, time.Second*10) | ||
|
|
||
| controllerManager := replicationControllerPkg.NewReplicationManager(kubeClient) | ||
| controllerManager.Run(10 * time.Second) | ||
|
|
||
| kubeletClient, err := client.NewKubeletClient(&s.KubeletConfig) | ||
| if err != nil { | ||
| glog.Fatalf("Failure to start kubelet client: %v", err) | ||
| } | ||
| cloud := cloudprovider.InitCloudProvider(s.CloudProvider, s.CloudConfigFile) | ||
| nodeResources := &api.NodeResources{ | ||
| Capacity: api.ResourceList{ | ||
| api.ResourceCPU: *resource.NewMilliQuantity(s.NodeMilliCPU, resource.DecimalSI), | ||
| api.ResourceMemory: s.NodeMemory, | ||
| }, | ||
| } | ||
| nodeController := nodeControllerPkg.NewNodeController(cloud, s.MinionRegexp, s.MachineList, nodeResources, kubeClient, kubeletClient) | ||
| nodeController.Run(s.NodeSyncPeriod, s.RegisterRetryCount) | ||
|
|
||
| resourceQuotaManager := resourcequota.NewResourceQuotaManager(kubeClient) | ||
| resourceQuotaManager.Run(s.ResourceQuotaSyncPeriod) | ||
|
|
||
| select {} | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.