From 6a84e825d912ef16713025cd9a562f26a5ce1c94 Mon Sep 17 00:00:00 2001
From: Zihong Zheng <zihongz@google.com>
Date: Wed, 17 May 2017 12:50:53 -0700
Subject: [PATCH] Autogenerated files

Kubernetes-commit: 931892af8a76ee768108798a8bcaecaac0c4d9f2
---
 pkg/api/v1/defaults.go              | 24 +++++++++++++++++-------
 pkg/api/v1/zz_generated.defaults.go |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkg/api/v1/defaults.go b/pkg/api/v1/defaults.go
index 8324ebd5..47f610df 100644
--- a/pkg/api/v1/defaults.go
+++ b/pkg/api/v1/defaults.go
@@ -96,15 +96,15 @@ func SetDefaults_Container(obj *Container) {
 		obj.TerminationMessagePolicy = TerminationMessageReadFile
 	}
 }
-func SetDefaults_ServiceSpec(obj *ServiceSpec) {
-	if obj.SessionAffinity == "" {
-		obj.SessionAffinity = ServiceAffinityNone
+func SetDefaults_Service(obj *Service) {
+	if obj.Spec.SessionAffinity == "" {
+		obj.Spec.SessionAffinity = ServiceAffinityNone
 	}
-	if obj.Type == "" {
-		obj.Type = ServiceTypeClusterIP
+	if obj.Spec.Type == "" {
+		obj.Spec.Type = ServiceTypeClusterIP
 	}
-	for i := range obj.Ports {
-		sp := &obj.Ports[i]
+	for i := range obj.Spec.Ports {
+		sp := &obj.Spec.Ports[i]
 		if sp.Protocol == "" {
 			sp.Protocol = ProtocolTCP
 		}
@@ -112,6 +112,16 @@ func SetDefaults_ServiceSpec(obj *ServiceSpec) {
 			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) {
 	// If limits are specified, but requests are not, default requests to limits
diff --git a/pkg/api/v1/zz_generated.defaults.go b/pkg/api/v1/zz_generated.defaults.go
index 121b3918..31e79506 100644
--- a/pkg/api/v1/zz_generated.defaults.go
+++ b/pkg/api/v1/zz_generated.defaults.go
@@ -620,7 +620,7 @@ func SetObjectDefaults_SecretList(in *SecretList) {
 }
 
 func SetObjectDefaults_Service(in *Service) {
-	SetDefaults_ServiceSpec(&in.Spec)
+	SetDefaults_Service(in)
 }
 
 func SetObjectDefaults_ServiceList(in *ServiceList) {