Skip to content

Handle server side default for TrafficDistribution #8994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhr323 merged 1 commit into from
Jan 12, 2026
+29 −0
Merged

Handle server side default for TrafficDistribution #8994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkg/controller/common/service_control.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,11 @@ func applyServerSideValues(expected, reconciled *corev1.Service) {
if expected.Spec.AllocateLoadBalancerNodePorts == nil {
expected.Spec.AllocateLoadBalancerNodePorts = reconciled.Spec.AllocateLoadBalancerNodePorts
}

// TrafficDistribution may be defaulted by the API server starting K8s v1.31
if expected.Spec.TrafficDistribution == nil {
expected.Spec.TrafficDistribution = reconciled.Spec.TrafficDistribution
}
}

// hasNodePort returns for a given service type, if the service ports have a NodePort or not.
Expand Down
24 changes: 24 additions & 0 deletions pkg/controller/common/service_control_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,30 @@ func Test_applyServerSideValues(t *testing.T) {
ClusterIP: "1.2.3.4",
}},
},
{
name: "Reconciled TrafficDistribution is used if the expected one is nil",
args: args{
expected: corev1.Service{Spec: corev1.ServiceSpec{}},
reconciled: corev1.Service{Spec: corev1.ServiceSpec{
TrafficDistribution: ptr.To(corev1.ServiceTrafficDistributionPreferClose),
}},
},
want: corev1.Service{Spec: corev1.ServiceSpec{
TrafficDistribution: ptr.To(corev1.ServiceTrafficDistributionPreferClose),
}},
},
{
name: "Expected TrafficDistribution is used if not nil",
args: args{
expected: corev1.Service{Spec: corev1.ServiceSpec{
TrafficDistribution: ptr.To(corev1.ServiceTrafficDistributionPreferClose),
}},
reconciled: corev1.Service{Spec: corev1.ServiceSpec{}},
},
want: corev1.Service{Spec: corev1.ServiceSpec{
TrafficDistribution: ptr.To(corev1.ServiceTrafficDistributionPreferClose),
}},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down