Skip to content

OCPBUGS-32946: Default to watch all interfaces and IPs for router lis… #3285

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
merged 1 commit into from
Apr 26, 2024
Merged

OCPBUGS-32946: Default to watch all interfaces and IPs for router lis… #3285

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: 2 additions & 16 deletions pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"bytes"
"errors"
"fmt"
"github.com/openshift/microshift/pkg/config/apiserver"
"math"
"net"
"net/url"
Expand All @@ -16,6 +15,8 @@ import (
"strings"
"time"

"github.com/openshift/microshift/pkg/config/apiserver"

"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/klog/v2"
"k8s.io/utils/ptr"
Expand Down Expand Up @@ -281,21 +282,6 @@ func (c *Config) updateComputedValues() error {
c.ApiServer.AdvertiseAddress = firstValidIP.String()
}

if len(c.Ingress.ListenAddress) == 0 {
// If the listenAddress is not configured we need to include all of the host addresses
// to preserve previous behavior. However, if the apiserver advertise address has
// not been configured, it will do so in a later stage and we also need to
// include it here.
addresses, err := AllowedListeningIPAddresses()
if err != nil {
return fmt.Errorf("unable to compute default listening addresses: %v", err)
}
if !c.ApiServer.SkipInterface {
addresses = append(addresses, c.ApiServer.AdvertiseAddress)
}
c.Ingress.ListenAddress = addresses
}

c.computeLoggingSetting()

return nil
Expand Down
5 changes: 5 additions & 0 deletions pkg/loadbalancerservice/router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ func defaultRouterListenAddresses(ipAddresses, nicNames []string) ([]string, err
return nil, err
}

if len(ipAddresses) == 0 && len(nicNames) == 0 {
ipAddresses = allowedAddresses
nicNames = allowedNicNames
}

ipList := make([]string, 0, len(ipAddresses)+len(nicNames)*2)

for _, ip := range ipAddresses {
Expand Down