Merge pull request #3854 from yujuhong/defaults

Migrate API defaulting to a centralized location
This commit is contained in:
Brian Grant
2015-02-04 11:41:23 -08:00
42 changed files with 1212 additions and 397 deletions

View File

@@ -90,8 +90,10 @@ func (m *Master) createMasterServiceIfNeeded(serviceName string, serviceIP net.I
Spec: api.ServiceSpec{
Port: servicePort,
// maintained by this code, not by the pod selector
Selector: nil,
PortalIP: serviceIP.String(),
Selector: nil,
PortalIP: serviceIP.String(),
Protocol: api.ProtocolTCP,
SessionAffinity: api.AffinityTypeNone,
},
}
// Kids, don't do this at home: this is a hack. There's no good way to call the business