Skip to content

Commit 2470f04

Browse files
Merge pull request #3542 from pacevedom/OCPBUGS-35468
OCPBUGS-35468: Filter out empty entries in router listenAddress
2 parents 36498db + ac14cb5 commit 2470f04

File tree

2 files changed

+6
-2
lines changed
  • etcd/vendor/github.com/openshift/microshift/pkg/config
  • pkg/config

2 files changed

+6
-2
lines changed

etcd/vendor/github.com/openshift/microshift/pkg/config/config.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/config/config.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,9 @@ func (c *Config) incorporateUserSettings(u *Config) {
246246
}
247247

248248
if len(u.Ingress.ListenAddress) != 0 {
249-
c.Ingress.ListenAddress = u.Ingress.ListenAddress
249+
c.Ingress.ListenAddress = slices.DeleteFunc(u.Ingress.ListenAddress, func(s string) bool {
250+
return len(s) == 0
251+
})
250252
}
251253

252254
if len(u.ApiServer.NamedCertificates) != 0 {

0 commit comments

Comments
 (0)