Skip to content

K
k3s
Unverified Commit e7e7615d authored by Manuel Buil's avatar Manuel Buil Committed by GitHub
Browse files
Options

Merge pull request #8551 from manuelbuil/netCleanUp127

[Release 1.27] Network defaults are duplicated, remove one
parents 9a930c68 9c70ee40
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 15 deletions
pkg/daemons/control/server.go
View file @ e7e7615d
...@@ -3,7 +3,6 @@ package control ...@@ -3,7 +3,6 @@ package control
import ( import (
"context" "context"
"math/rand" "math/rand"
"net"
"os" "os"
"path/filepath" "path/filepath"
"strconv" "strconv"
...@@ -221,20 +220,6 @@ func apiServer(ctx context.Context, cfg *config.Control) error { ...@@ -221,20 +220,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
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment