github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23129 from mikedanese/kube-service-affinity

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-17 16:11:53 -07:00
parent ad7a0da5af e21ebbcac4
commit 35d7469815
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/master/controller.go
View File

@@ -210,7 +210,7 @@ func (c *Controller) CreateOrUpdateMasterServiceIfNeeded(serviceName string, ser
// maintained by this code, not by the pod selector // maintained by this code, not by the pod selector
Selector: nil, Selector: nil,
ClusterIP: serviceIP.String(), ClusterIP: serviceIP.String(),
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: serviceType, Type: serviceType,
}, },
} }

34
pkg/master/controller_test.go
View File

@@ -512,7 +512,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}, },
Selector: nil, Selector: nil,
ClusterIP: "1.2.3.4", ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: api.ServiceTypeClusterIP, Type: api.ServiceTypeClusterIP,
}, },
}, },
@@ -560,7 +560,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}, },
Selector: nil, Selector: nil,
ClusterIP: "1.2.3.4", ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: api.ServiceTypeClusterIP, Type: api.ServiceTypeClusterIP,
}, },
}, },
@@ -572,7 +572,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}, },
Selector: nil, Selector: nil,
ClusterIP: "1.2.3.4", ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: api.ServiceTypeClusterIP, Type: api.ServiceTypeClusterIP,
}, },
}, },
@@ -593,7 +593,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}, },
Selector: nil, Selector: nil,
ClusterIP: "1.2.3.4", ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: api.ServiceTypeClusterIP, Type: api.ServiceTypeClusterIP,
}, },
}, },
@@ -606,7 +606,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}, },
Selector: nil, Selector: nil,
ClusterIP: "1.2.3.4", ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: api.ServiceTypeClusterIP, Type: api.ServiceTypeClusterIP,
}, },
}, },
@@ -626,7 +626,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}, },
Selector: nil, Selector: nil,
ClusterIP: "1.2.3.4", ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: api.ServiceTypeClusterIP, Type: api.ServiceTypeClusterIP,
}, },
}, },
@@ -638,7 +638,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}, },
Selector: nil, Selector: nil,
ClusterIP: "1.2.3.4", ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: api.ServiceTypeClusterIP, Type: api.ServiceTypeClusterIP,
}, },
}, },
@@ -658,7 +658,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}, },
Selector: nil, Selector: nil,
ClusterIP: "1.2.3.4", ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: api.ServiceTypeClusterIP, Type: api.ServiceTypeClusterIP,
}, },
}, },
@@ -670,7 +670,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}, },
Selector: nil, Selector: nil,
ClusterIP: "1.2.3.4", ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: api.ServiceTypeClusterIP, Type: api.ServiceTypeClusterIP,
}, },
}, },
@@ -690,7 +690,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}, },
Selector: nil, Selector: nil,
ClusterIP: "1.2.3.4", ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: api.ServiceTypeClusterIP, Type: api.ServiceTypeClusterIP,
}, },
}, },
@@ -702,7 +702,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}, },
Selector: nil, Selector: nil,
ClusterIP: "1.2.3.4", ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: api.ServiceTypeClusterIP, Type: api.ServiceTypeClusterIP,
}, },
}, },
@@ -722,7 +722,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}, },
Selector: nil, Selector: nil,
ClusterIP: "1.2.3.4", ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: api.ServiceTypeClusterIP, Type: api.ServiceTypeClusterIP,
}, },
}, },
@@ -734,7 +734,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}, },
Selector: nil, Selector: nil,
ClusterIP: "1.2.3.4", ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: api.ServiceTypeClusterIP, Type: api.ServiceTypeClusterIP,
}, },
}, },
@@ -754,7 +754,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}, },
Selector: nil, Selector: nil,
ClusterIP: "1.2.3.4", ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: api.ServiceTypeNodePort, Type: api.ServiceTypeNodePort,
}, },
}, },
@@ -766,7 +766,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}, },
Selector: nil, Selector: nil,
ClusterIP: "1.2.3.4", ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: api.ServiceTypeClusterIP, Type: api.ServiceTypeClusterIP,
}, },
}, },
@@ -786,7 +786,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}, },
Selector: nil, Selector: nil,
ClusterIP: "1.2.3.4", ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: api.ServiceTypeClusterIP, Type: api.ServiceTypeClusterIP,
}, },
}, },
@@ -838,7 +838,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}, },
Selector: nil, Selector: nil,
ClusterIP: "1.2.3.4", ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityClientIP,
Type: api.ServiceTypeClusterIP, Type: api.ServiceTypeClusterIP,
}, },
}, },