Autogenerated files

This commit is contained in:
Zihong Zheng 2017-05-17 12:50:53 -07:00
parent a28a22df11
commit 931892af8a
3 changed files with 19 additions and 9 deletions

View File

@ -620,7 +620,7 @@ func SetObjectDefaults_SecretList(in *SecretList) {
} }
func SetObjectDefaults_Service(in *Service) { func SetObjectDefaults_Service(in *Service) {
SetDefaults_ServiceSpec(&in.Spec) SetDefaults_Service(in)
} }
func SetObjectDefaults_ServiceList(in *ServiceList) { func SetObjectDefaults_ServiceList(in *ServiceList) {

View File

@ -96,15 +96,15 @@ func SetDefaults_Container(obj *Container) {
obj.TerminationMessagePolicy = TerminationMessageReadFile obj.TerminationMessagePolicy = TerminationMessageReadFile
} }
} }
func SetDefaults_ServiceSpec(obj *ServiceSpec) { func SetDefaults_Service(obj *Service) {
if obj.SessionAffinity == "" { if obj.Spec.SessionAffinity == "" {
obj.SessionAffinity = ServiceAffinityNone obj.Spec.SessionAffinity = ServiceAffinityNone
} }
if obj.Type == "" { if obj.Spec.Type == "" {
obj.Type = ServiceTypeClusterIP obj.Spec.Type = ServiceTypeClusterIP
} }
for i := range obj.Ports { for i := range obj.Spec.Ports {
sp := &obj.Ports[i] sp := &obj.Spec.Ports[i]
if sp.Protocol == "" { if sp.Protocol == "" {
sp.Protocol = ProtocolTCP sp.Protocol = ProtocolTCP
} }
@ -112,6 +112,16 @@ func SetDefaults_ServiceSpec(obj *ServiceSpec) {
sp.TargetPort = intstr.FromInt(int(sp.Port)) sp.TargetPort = intstr.FromInt(int(sp.Port))
} }
} }
// Defaults ExternalTrafficPolicy field for NodePort / LoadBalancer service
// to Global for consistency.
if _, ok := obj.Annotations[BetaAnnotationExternalTraffic]; ok {
// Don't default this field if beta annotation exists.
return
} else if (obj.Spec.Type == ServiceTypeNodePort ||
obj.Spec.Type == ServiceTypeLoadBalancer) &&
obj.Spec.ExternalTrafficPolicy == "" {
obj.Spec.ExternalTrafficPolicy = ServiceExternalTrafficPolicyTypeGlobal
}
} }
func SetDefaults_Pod(obj *Pod) { func SetDefaults_Pod(obj *Pod) {
// If limits are specified, but requests are not, default requests to limits // If limits are specified, but requests are not, default requests to limits

View File

@ -620,7 +620,7 @@ func SetObjectDefaults_SecretList(in *SecretList) {
} }
func SetObjectDefaults_Service(in *Service) { func SetObjectDefaults_Service(in *Service) {
SetDefaults_ServiceSpec(&in.Spec) SetDefaults_Service(in)
} }
func SetObjectDefaults_ServiceList(in *ServiceList) { func SetObjectDefaults_ServiceList(in *ServiceList) {