github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8551 from manuelbuil/netCleanUp127 

[Release 1.27] Network defaults are duplicated, remove one
pull/8569/head
Manuel Buil 2023-10-05 18:30:14 +02:00 committed by GitHub
parent 9a930c6877 9c70ee4091
commit e7e7615d84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/daemons/control/server.go
View File

@ -3,7 +3,6 @@ package control
import (
"context"
"math/rand"
"net"
"os"
"path/filepath"
"strconv"
@ -221,20 +220,6 @@ func apiServer(ctx context.Context, cfg *config.Control) error {
}
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 {
config.AdvertisePort = config.HTTPSPort
}