github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

service update event should be triggered when appProtocol in port is changed.

Browse Source 
Signed-off-by: MartinForReal <fanshangxiang@gmail.com>
This commit is contained in:
MartinForReal 2022-09-29 11:56:03 +00:00
parent 4516c7972d
commit f68345b2f0
2 changed files with 73 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/cloud-provider/controllers/service/controller.go
View File

@ -640,6 +640,10 @@ func portEqualForLB(x, y *v1.ServicePort) bool {
return false
}
if !reflect.DeepEqual(x.AppProtocol, y.AppProtocol) {
return false
}
return true
}

69
staging/src/k8s.io/cloud-provider/controllers/service/controller_test.go
View File

@ -1391,6 +1391,75 @@ func TestNeedsUpdate(t *testing.T) {
},
expectedNeedsUpdate: true,
},
{
testName: "If appProtocol is the same",
updateFn: func() {
oldSvc = &v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "tcp-service",
Namespace: "default",
},
Spec: v1.ServiceSpec{
Ports: []v1.ServicePort{{
Port: 80,
Protocol: v1.ProtocolTCP,
TargetPort: intstr.Parse("22"),
}},
Type: v1.ServiceTypeLoadBalancer,
},
}
newSvc = oldSvc.DeepCopy()
},
expectedNeedsUpdate: false,
},
{
testName: "If appProtocol is set when previously unset",
updateFn: func() {
oldSvc = &v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "tcp-service",
Namespace: "default",
},
Spec: v1.ServiceSpec{
Ports: []v1.ServicePort{{
Port: 80,
Protocol: v1.ProtocolTCP,
TargetPort: intstr.Parse("22"),
}},
Type: v1.ServiceTypeLoadBalancer,
},
}
newSvc = oldSvc.DeepCopy()
protocol := "http"
newSvc.Spec.Ports[0].AppProtocol = &protocol
},
expectedNeedsUpdate: true,
},
{
testName: "If appProtocol is set to a different value",
updateFn: func() {
protocol := "http"
oldSvc = &v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "tcp-service",
Namespace: "default",
},
Spec: v1.ServiceSpec{
Ports: []v1.ServicePort{{
Port: 80,
Protocol: v1.ProtocolTCP,
TargetPort: intstr.Parse("22"),
AppProtocol: &protocol,
}},
Type: v1.ServiceTypeLoadBalancer,
},
}
newSvc = oldSvc.DeepCopy()
newProtocol := "tcp"
newSvc.Spec.Ports[0].AppProtocol = &newProtocol
},
expectedNeedsUpdate: true,
},
}
controller, _, _ := newController()