Skip to content

Commit

Permalink
Merge pull request #65356 from afritzler/automated-cherry-pick-of-#56…
Browse files Browse the repository at this point in the history 
…690-upstream-release-1.9

Automatic merge from submit-queue.

Automated cherry pick of #56690: Disable session affinity for internal kuberntes service

Cherry pick of #56690 on release-1.9.

#56690: Disable session affinity for internal kuberntes service
  • Loading branch information
Kubernetes Submit Queue authored Jul 14, 2018
2 parents 707acf5 + b636c78 commit b6af6bc
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion pkg/master/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ func (c *Controller) CreateOrUpdateMasterServiceIfNeeded(serviceName string, ser
// maintained by this code, not by the pod selector
Selector: nil,
ClusterIP: serviceIP.String(),
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: serviceType,
},
}
Expand Down
34 changes: 17 additions & 17 deletions pkg/master/controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
Selector: nil,
ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeClusterIP,
},
},
Expand Down Expand Up @@ -625,7 +625,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
Selector: nil,
ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeClusterIP,
},
},
Expand All @@ -637,7 +637,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
Selector: nil,
ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeClusterIP,
},
},
Expand All @@ -658,7 +658,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
Selector: nil,
ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeClusterIP,
},
},
Expand All @@ -671,7 +671,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
Selector: nil,
ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeClusterIP,
},
},
Expand All @@ -691,7 +691,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
Selector: nil,
ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeClusterIP,
},
},
Expand All @@ -703,7 +703,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
Selector: nil,
ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeClusterIP,
},
},
Expand All @@ -723,7 +723,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
Selector: nil,
ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeClusterIP,
},
},
Expand All @@ -735,7 +735,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
Selector: nil,
ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeClusterIP,
},
},
Expand All @@ -755,7 +755,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
Selector: nil,
ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeClusterIP,
},
},
Expand All @@ -767,7 +767,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
Selector: nil,
ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeClusterIP,
},
},
Expand All @@ -787,7 +787,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
Selector: nil,
ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeClusterIP,
},
},
Expand All @@ -799,7 +799,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
Selector: nil,
ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeClusterIP,
},
},
Expand All @@ -819,7 +819,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
Selector: nil,
ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeNodePort,
},
},
Expand All @@ -831,7 +831,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
Selector: nil,
ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeClusterIP,
},
},
Expand All @@ -851,7 +851,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
Selector: nil,
ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeClusterIP,
},
},
Expand Down Expand Up @@ -910,7 +910,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
Selector: nil,
ClusterIP: "1.2.3.4",
SessionAffinity: api.ServiceAffinityClientIP,
SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeClusterIP,
},
},
Expand Down

0 comments on commit b6af6bc

Please sign in to comment.