Skip to content

OCPBUGS-65951: [release-4.20]: Fix linter issues, add missing cheryy-pick bits of #2844 #2866

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
openshift-merge-bot merged 1 commit into from
Nov 25, 2025
Merged

OCPBUGS-65951: [release-4.20]: Fix linter issues, add missing cheryy-pick bits of #2844 #2866

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
18 changes: 9 additions & 9 deletions go-controller/pkg/ovn/controller/services/lb_config_ocphack_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func Test_buildPerNodeLBs_OCPHackForDNS(t *testing.T) {
vips: []string{"192.168.1.1"},
protocol: corev1.ProtocolTCP,
inport: 80,
clusterEndpoints: lbEndpoints{
clusterEndpoints: util.LBEndpoints{
V4IPs: []string{"10.128.0.2", "10.128.1.2"},
Port: 8080,
},
Expand Down Expand Up @@ -263,11 +263,11 @@ func Test_buildPerNodeLBs_OCPHackForLocalWithFallback(t *testing.T) {
inport: 5, // node port
externalTrafficLocal: true,
hasNodePort: true,
clusterEndpoints: lbEndpoints{
clusterEndpoints: util.LBEndpoints{
V4IPs: []string{"10.128.0.2", "10.128.1.2"},
Port: outport,
},
nodeEndpoints: map[string]lbEndpoints{
nodeEndpoints: map[string]util.LBEndpoints{
nodeA: {V4IPs: []string{"10.128.0.2"}, Port: outport},
nodeB: {V4IPs: []string{"10.128.1.2"}, Port: outport},
},
Expand All @@ -277,11 +277,11 @@ func Test_buildPerNodeLBs_OCPHackForLocalWithFallback(t *testing.T) {
protocol: corev1.ProtocolTCP,
inport: inport,
externalTrafficLocal: true,
clusterEndpoints: lbEndpoints{
clusterEndpoints: util.LBEndpoints{
V4IPs: []string{"10.128.0.2", "10.128.1.2"},
Port: outport,
},
nodeEndpoints: map[string]lbEndpoints{
nodeEndpoints: map[string]util.LBEndpoints{
nodeA: {V4IPs: []string{"10.128.0.2"}, Port: outport},
nodeB: {V4IPs: []string{"10.128.1.2"}, Port: outport},
},
Expand Down Expand Up @@ -362,11 +362,11 @@ func Test_buildPerNodeLBs_OCPHackForLocalWithFallback(t *testing.T) {
inport: 5, // node port
externalTrafficLocal: true,
hasNodePort: true,
clusterEndpoints: lbEndpoints{
clusterEndpoints: util.LBEndpoints{
V4IPs: []string{"10.128.1.2"}, // only endpoint on node-b is running
Port: outport,
},
nodeEndpoints: map[string]lbEndpoints{
nodeEndpoints: map[string]util.LBEndpoints{
nodeB: {V4IPs: []string{"10.128.1.2"}, Port: outport},
},
},
Expand All @@ -375,11 +375,11 @@ func Test_buildPerNodeLBs_OCPHackForLocalWithFallback(t *testing.T) {
protocol: corev1.ProtocolTCP,
inport: inport,
externalTrafficLocal: true,
clusterEndpoints: lbEndpoints{
clusterEndpoints: util.LBEndpoints{
V4IPs: []string{"10.128.1.2"},
Port: outport,
},
nodeEndpoints: map[string]lbEndpoints{
nodeEndpoints: map[string]util.LBEndpoints{
nodeB: {V4IPs: []string{"10.128.1.2"}, Port: outport},
},
},
Expand Down
2 changes: 1 addition & 1 deletion go-controller/pkg/ovn/controller/services/lb_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4592,7 +4592,7 @@ func Test_makeNodeSwitchTargetIPs(t *testing.T) {
vips: []string{"1.2.3.4", "fe10::1"},
protocol: corev1.ProtocolTCP,
inport: 80,
clusterEndpoints: lbEndpoints{
clusterEndpoints: util.LBEndpoints{
V4IPs: []string{"192.168.1.1"}, // on nodeB
V6IPs: []string{"fe00:0:0:0:2::2"}, // on nodeB
Port: 8080,
Expand Down