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

feat: generate VIPCIDR if not value is set

Browse Source 
Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>
This commit is contained in:
Ludovic Ortega
2024-05-16 22:42:53 +02:00
parent 1620e4c890
commit 28918e839f
2 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,8 @@ package cmd
import (
"fmt"
"net"
"strings"
"github.com/kube-vip/kube-vip/pkg/kubevip"
log "github.com/sirupsen/logrus"
@@ -39,6 +41,8 @@ var kubeManifestPod = &cobra.Command{
Use: "pod",
Short: "Generate a Pod Manifest",
Run: func(cmd *cobra.Command, args []string) {
var err error
// Set the logging level for all subsequent functions
log.SetLevel(log.Level(logLevel))
initConfig.LoadBalancers = append(initConfig.LoadBalancers, initLoadBalancer)
@@ -53,6 +57,14 @@ var kubeManifestPod = &cobra.Command{
log.Fatalln("No address is specified for kube-vip to expose services on")
}
if initConfig.VIPCIDR == "" {
initConfig.VIPCIDR, err = generateCidrRange(initConfig.Address)
if err != nil {
log.Fatalln(err)
}
}
cfg := kubevip.GeneratePodManifestFromConfig(&initConfig, Release.Version, inCluster)
fmt.Println(cfg) // output manifest to stdout
},
@@ -62,6 +74,8 @@ var kubeManifestDaemon = &cobra.Command{
Use: "daemonset",
Short: "Generate a Daemonset Manifest",
Run: func(cmd *cobra.Command, args []string) {
var err error
// Set the logging level for all subsequent functions
log.SetLevel(log.Level(logLevel))
initConfig.LoadBalancers = append(initConfig.LoadBalancers, initLoadBalancer)
@@ -78,6 +92,14 @@ var kubeManifestDaemon = &cobra.Command{
log.Fatalln("No address is specified for kube-vip to expose services on")
}
if initConfig.VIPCIDR == "" {
initConfig.VIPCIDR, err = generateCidrRange(initConfig.Address)
if err != nil {
log.Fatalln(err)
}
}
cfg := kubevip.GenerateDaemonsetManifestFromConfig(&initConfig, Release.Version, inCluster, taint)
fmt.Println(cfg) // output manifest to stdout
},
@@ -87,6 +109,8 @@ var kubeManifestRbac = &cobra.Command{
Use: "rbac",
Short: "Generate an RBAC Manifest",
Run: func(cmd *cobra.Command, args []string) {
var err error
// Set the logging level for all subsequent functions
log.SetLevel(log.Level(logLevel))
initConfig.LoadBalancers = append(initConfig.LoadBalancers, initLoadBalancer)
@@ -100,8 +124,38 @@ var kubeManifestRbac = &cobra.Command{
_ = cmd.Help()
log.Fatalln("No address is specified for kube-vip to expose services on")
}
if initConfig.VIPCIDR == "" {
initConfig.VIPCIDR, err = generateCidrRange(initConfig.Address)
if err != nil {
log.Fatalln(err)
}
}
cfg := kubevip.GenerateSA()
b, _ := yaml.Marshal(cfg)
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: %v", a)
}
if ip.To4() != nil {
cidrs = append(cidrs, "32")
} else {
cidrs = append(cidrs, "128")
}
}
return strings.Join(cidrs, ","), nil
}