github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-06 19:52:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4577 from satnam6502/cluster-name

Browse Source 
Qualify the name of forwarding rules with INSTANCE_PREFIX
This commit is contained in:
Eric Tune
2015-02-26 13:17:49 -08:00
parent 7665b2668f 19b927ea57
commit e77745672c
14 changed files with 59 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/master/master.go
View File

@@ -112,6 +112,9 @@ type Config struct {
// Control the interval that pod, node IP, and node heath status caches
// expire.
CacheTimeout time.Duration
// The name of the cluster.
ClusterName string
}
// Master contains state for a Kubernetes cluster master/api server.
@@ -402,7 +405,7 @@ func (m *Master) init(c *Config) {
"bindings": bindingStorage,
"replicationControllers": controller.NewREST(registry, podRegistry),
"services": service.NewREST(m.serviceRegistry, c.Cloud, m.nodeRegistry, m.portalNet),
"services": service.NewREST(m.serviceRegistry, c.Cloud, m.nodeRegistry, m.portalNet, c.ClusterName),
"endpoints": endpoint.NewREST(m.endpointRegistry),
"minions": nodeStorage,
"nodes": nodeStorage,