Skip to content

K
k3s
Commit e21ebbca authored by Mike Danese's avatar Mike Danese
Browse files
Options

give the kubernetes service client ip session affinity

parent c412dcba
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
pkg/master/controller.go
View file @ e21ebbca
...@@ -210,7 +210,7 @@ func (c *Controller) CreateOrUpdateMasterServiceIfNeeded(serviceName string, ser ...@@ -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,
}, },
} }
......
pkg/master/controller_test.go
View file @ e21ebbca
...@@ -512,7 +512,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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,
}, },
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment