Browse Source

Merge pull request #8523 from manuelbuil/RemoveNetworkDefaults

Network defaults are duplicated, remove one
pull/8554/head
Manuel Buil 1 year ago committed by GitHub
parent
commit
1c65568fa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      pkg/daemons/control/server.go

15
pkg/daemons/control/server.go

@ -3,7 +3,6 @@ package control
import ( import (
"context" "context"
"math/rand" "math/rand"
"net"
"os" "os"
"path/filepath" "path/filepath"
"strconv" "strconv"
@ -224,20 +223,6 @@ func apiServer(ctx context.Context, cfg *config.Control) error {
} }
func defaults(config *config.Control) { func defaults(config *config.Control) {
if config.ClusterIPRange == nil {
_, clusterIPNet, _ := net.ParseCIDR("10.42.0.0/16")
config.ClusterIPRange = clusterIPNet
}
if config.ServiceIPRange == nil {
_, serviceIPNet, _ := net.ParseCIDR("10.43.0.0/16")
config.ServiceIPRange = serviceIPNet
}
if len(config.ClusterDNS) == 0 {
config.ClusterDNS = net.ParseIP("10.43.0.10")
}
if config.AdvertisePort == 0 { if config.AdvertisePort == 0 {
config.AdvertisePort = config.HTTPSPort config.AdvertisePort = config.HTTPSPort
} }

Loading…
Cancel
Save