kairos/provider-kairos
1
0
Fork 0
mirror of https://github.com/kairos-io/provider-kairos.git synced 2025-09-24 20:47:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Schedule

Browse Source 
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
This commit is contained in:
Mauro Morales
2025-03-19 23:49:08 +01:00
parent adc755a455
commit 3284d24ae2
3 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/cli/get_kubeconfig.go
View File

@@ -30,8 +30,8 @@ var GetKubeConfigCMD = cli.Command{
edgeVPNClient.NewClient(edgeVPNClient.WithHost(c.String("api"))))
str, _ := cc.Get("kubeconfig", "control-plane")
b, _ := base64.RawURLEncoding.DecodeString(str)
masterIP, _ := cc.Get("control-plane", "ip")
fmt.Println(strings.ReplaceAll(string(b), "127.0.0.1", masterIP))
cpIP, _ := cc.Get("control-plane", "ip")
fmt.Println(strings.ReplaceAll(string(b), "127.0.0.1", cpIP))
return nil
},
}

11
internal/provider/config/config.go
View File

@@ -69,13 +69,20 @@ func (a Auto) IsEnabled() bool {
}
func (ha HA) IsEnabled() bool {
return (ha.Enable != nil && *ha.Enable) || (ha.Enable == nil && ha.MasterNodes != nil)
return (ha.Enable != nil && *ha.Enable) || (ha.Enable == nil && ha.ExtraControlPlanes() != nil)
}
func (ha HA) ExtraControlPlanes() *int {
if ha.ControlPlanes != nil {
return ha.ControlPlanes
}
return ha.MasterNodes
}
type HA struct {
Enable *bool `yaml:"enable,omitempty"`
ExternalDB string `yaml:"external_db,omitempty"`
MasterNodes *int `yaml:"master_nodes,omitempty"`
MasterNodes *int `yaml:"master_nodes,omitempty"` // kept to avoid breaking older configs
ControlPlanes *int `yaml:"control_planes,omitempty"`
}

34
internal/role/schedule.go
View File

@@ -31,30 +31,30 @@ func scheduleRoles(nodes []string, c *service.RoleConfig, cc *config.Config, pco
}
}
existsMaster := false
hasControlPlane := false
masterRole := "master"
controlPlaneRole := "master"
workerRole := "worker"
masterHA := "master/ha"
controlPlaneHA := "master/ha"
if pconfig.P2P.Auto.HA.IsEnabled() {
masterRole = "master/clusterinit"
controlPlaneRole = "master/clusterinit"
}
mastersHA := 0
controlPlaneCounter := 0
for _, r := range currentRoles {
switch r {
case masterRole:
existsMaster = true
case masterHA:
mastersHA++
case controlPlaneRole:
hasControlPlane = true
case controlPlaneHA:
controlPlaneCounter++
}
}
c.Logger.Infof("Master already present: %t", existsMaster)
c.Logger.Infof("Control Plane already present: %t", hasControlPlane)
c.Logger.Infof("Unassigned nodes: %+v", unassignedNodes)
if !existsMaster && len(unassignedNodes) > 0 {
if !hasControlPlane && len(unassignedNodes) > 0 {
var selected string
toSelect := unassignedNodes
@@ -68,26 +68,26 @@ func scheduleRoles(nodes []string, c *service.RoleConfig, cc *config.Config, pco
}
}
// select one node without roles to become master
// select one node without roles to become control-plane
if len(toSelect) == 1 {
selected = toSelect[0]
} else {
selected = toSelect[rand.Intn(len(toSelect)-1)]
}
if err := c.Client.Set("role", selected, masterRole); err != nil {
if err := c.Client.Set("role", selected, controlPlaneRole); err != nil {
return err
}
c.Logger.Infof("-> Set %s to %s", masterRole, selected)
currentRoles[selected] = masterRole
c.Logger.Infof("-> Set %s to %s", controlPlaneRole, selected)
currentRoles[selected] = controlPlaneRole
// Return here, so next time we get called
// makes sure master is set.
return nil
}
if pconfig.P2P.Auto.HA.IsEnabled() && pconfig.P2P.Auto.HA.MasterNodes != nil && *pconfig.P2P.Auto.HA.MasterNodes != mastersHA {
if pconfig.P2P.Auto.HA.IsEnabled() && pconfig.P2P.Auto.HA.ExtraControlPlanes != nil && *pconfig.P2P.Auto.HA.ExtraControlPlanes() != controlPlaneCounter {
if len(unassignedNodes) > 0 {
if err := c.Client.Set("role", unassignedNodes[0], masterHA); err != nil {
if err := c.Client.Set("role", unassignedNodes[0], controlPlaneHA); err != nil {
c.Logger.Error(err)
return err
}