fanhuadesenlinnn/kube-vip
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/kube-vip/kube-vip.git synced 2026-09-20 08:03:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: set vip_cidr default value

Browse Source 
Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>
This commit is contained in:
Ludovic Ortega
2024-07-23 21:15:12 +02:00
parent 04ce471366
commit a5d6846608
3 changed files with 57 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
cmd/kube-vip-manifests.go
View File

@@ -2,8 +2,6 @@ package cmd
import (
"fmt"
"net"
"strings"
"github.com/kube-vip/kube-vip/pkg/kubevip"
log "github.com/sirupsen/logrus"
@@ -59,7 +57,7 @@ var kubeManifestPod = &cobra.Command{
// Ensure there is an address to generate the CIDR from
if initConfig.VIPCIDR == "" && initConfig.Address != "" {
initConfig.VIPCIDR, err = generateCidrRange(initConfig.Address)
initConfig.VIPCIDR, err = GenerateCidrRange(initConfig.Address)
if err != nil {
log.Fatalln(err)
}
@@ -94,7 +92,7 @@ var kubeManifestDaemon = &cobra.Command{
// Ensure there is an address to generate the CIDR from
if initConfig.VIPCIDR == "" && initConfig.Address != "" {
initConfig.VIPCIDR, err = generateCidrRange(initConfig.Address)
initConfig.VIPCIDR, err = GenerateCidrRange(initConfig.Address)
if err != nil {
log.Fatalln(err)
}
@@ -127,7 +125,7 @@ var kubeManifestRbac = &cobra.Command{
// Ensure there is an address to generate the CIDR from
if initConfig.VIPCIDR == "" && initConfig.Address != "" {
initConfig.VIPCIDR, err = generateCidrRange(initConfig.Address)
initConfig.VIPCIDR, err = GenerateCidrRange(initConfig.Address)
if err != nil {
log.Fatalln(err)
}
@@ -138,24 +136,3 @@ var kubeManifestRbac = &cobra.Command{
fmt.Println(string(b)) // output manifest to stdout
},
}
func generateCidrRange(address string) (string, error) {
var cidrs []string
addresses := strings.Split(address, ",")
for _, a := range addresses {
ip := net.ParseIP(a)
if ip == nil {
return "", fmt.Errorf("invalid IP address: %s from [%s]", a, address)
}
if ip.To4() != nil {
cidrs = append(cidrs, "32")
} else {
cidrs = append(cidrs, "128")
}
}
return strings.Join(cidrs, ","), nil
}