github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Fixes from feedback and testing

Browse Source
This commit is contained in:
Tim Hockin
2015-03-30 14:01:46 -07:00
parent 186818d787
commit eeff1b74fb
16 changed files with 4515 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/api/v1beta3/defaults.go
View File

@@ -52,17 +52,18 @@ func init() {
obj.TerminationMessagePath = TerminationMessagePathDefault
}
},
func(obj *Service) {
if obj.Spec.SessionAffinity == "" {
obj.Spec.SessionAffinity = AffinityTypeNone
func(obj *ServiceSpec) {
if obj.SessionAffinity == "" {
obj.SessionAffinity = AffinityTypeNone
}
},
func(obj *ServicePort) {
if obj.Protocol == "" {
obj.Protocol = ProtocolTCP
}
if obj.TargetPort == util.NewIntOrStringFromInt(0) || obj.TargetPort == util.NewIntOrStringFromString("") {
obj.TargetPort = util.NewIntOrStringFromInt(obj.Port)
for i := range obj.Ports {
sp := &obj.Ports[i]
if sp.Protocol == "" {
sp.Protocol = ProtocolTCP
}
if sp.TargetPort == util.NewIntOrStringFromInt(0) || sp.TargetPort == util.NewIntOrStringFromString("") {
sp.TargetPort = util.NewIntOrStringFromInt(sp.Port)
}
}
},
func(obj *PodSpec) {
@@ -102,14 +103,6 @@ func init() {
obj.Path = "/"
}
},
func(obj *ServicePort) {
if obj.Protocol == "" {
obj.Protocol = ProtocolTCP
}
if obj.TargetPort == util.NewIntOrStringFromInt(0) || obj.TargetPort == util.NewIntOrStringFromString("") {
obj.TargetPort = util.NewIntOrStringFromInt(obj.Port)
}
},
func(obj *NamespaceStatus) {
if obj.Phase == "" {
obj.Phase = NamespaceActive