Skip to content

Commit

Permalink
Fix fetching kubeadm join command from invalid masters (#77)
Browse files Browse the repository at this point in the history
* Fixes wrong masters used for initializing another

* Adds a degenerate test case for node management
  • Loading branch information
Eagerod authored Feb 22, 2025
1 parent 92feab9 commit c7cf633
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 7 deletions.
12 changes: 6 additions & 6 deletions cmd/hope/utils/nodes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ var testNodes []hope.Node = []hope.Node{
Memory: 2048,
},
{
Name: "test-master-02",
Role: hope.NodeRoleMaster.String(),
User: "packer",
Host: "192.168.1.10",
Cpu: 2,
Memory: 2048,
Name: "test-master-02",
Role: hope.NodeRoleMaster.String(),
User: "packer",
Host: "192.168.1.10",
Cpu: 2,
Memory: 2048,
},
{
Name: "test-master-03",
Expand Down
2 changes: 1 addition & 1 deletion pkg/hope/node_management.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ func CreateClusterMaster(log *logrus.Entry, node *Node, podNetworkCidr string, l
return err
}

existingMasters := (*masters)[1:]
existingMasters := lbMasters[1:]
joinCommand, err := KubeadmGetClusterJoinCommandFromAnyMaster(&existingMasters)
if err != nil {
return err
Expand Down
18 changes: 18 additions & 0 deletions pkg/hope/node_management_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package hope

import (
"testing"
)

import (
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
)

func TestSetupCommonNodeRequirementsNotKubernetesNode(t *testing.T) {
node := Node{
Role: "load-balancer",
}
err := setupCommonNodeRequirements(log.WithFields(log.Fields{}), &node)
assert.Error(t, err, "Node has role load-balancer, should not prepare as Kubernetes node")
}

0 comments on commit c7cf633

Please sign in to comment.