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

Network defaults are duplicated, remove one 

Signed-off-by: Manuel Buil <mbuil@suse.com>
pull/8553/head
Manuel Buil 2023-10-02 17:09:25 +02:00
parent a873fba947
commit 67380ddb01
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 ( import (
"context" "context"
"math/rand" "math/rand"
"net"
"os" "os"
"path/filepath" "path/filepath"
"strconv" "strconv"
@ -213,20 +212,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
} }