public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed case where, no ready label is defined, but node is unscheduable (#1162) 

* fixed case where, no ready label is defined, but node is unscheduable
This commit is contained in:
arminfelder 2020-10-28 09:33:52 +01:00 committed by GitHub
parent e97235aa39
commit 7730ecfdec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/node.go
View File

@ -76,7 +76,7 @@ func (c *Controller) nodeUpdate(prev, cur interface{}) {
} }
func (c *Controller) nodeIsReady(node *v1.Node) bool { func (c *Controller) nodeIsReady(node *v1.Node) bool {
return (!node.Spec.Unschedulable || util.MapContains(node.Labels, c.opConfig.NodeReadinessLabel) || return (!node.Spec.Unschedulable || (len(c.opConfig.NodeReadinessLabel) > 0 && util.MapContains(node.Labels, c.opConfig.NodeReadinessLabel)) ||
util.MapContains(node.Labels, map[string]string{"master": "true"})) util.MapContains(node.Labels, map[string]string{"master": "true"}))
} }

52
pkg/controller/node_test.go
View File

@ -15,7 +15,6 @@ const (
func newNodeTestController() *Controller { func newNodeTestController() *Controller {
var controller = NewController(&spec.ControllerConfig{}, "node-test") var controller = NewController(&spec.ControllerConfig{}, "node-test")
controller.opConfig.NodeReadinessLabel = map[string]string{readyLabel: readyValue}
return controller return controller
} }
@ -36,27 +35,58 @@ var nodeTestController = newNodeTestController()
func TestNodeIsReady(t *testing.T) { func TestNodeIsReady(t *testing.T) {
testName := "TestNodeIsReady" testName := "TestNodeIsReady"
var testTable = []struct { var testTable = []struct {
in *v1.Node in *v1.Node
out bool out bool
readinessLabel map[string]string
}{ }{
{ {
in: makeNode(map[string]string{"foo": "bar"}, true), in: makeNode(map[string]string{"foo": "bar"}, true),
out: true, out: true,
readinessLabel: map[string]string{readyLabel: readyValue},
}, },
{ {
in: makeNode(map[string]string{"foo": "bar"}, false), in: makeNode(map[string]string{"foo": "bar"}, false),
out: false, out: false,
readinessLabel: map[string]string{readyLabel: readyValue},
}, },
{ {
in: makeNode(map[string]string{readyLabel: readyValue}, false), in: makeNode(map[string]string{readyLabel: readyValue}, false),
out: true, out: true,
readinessLabel: map[string]string{readyLabel: readyValue},
}, },
{ {
in: makeNode(map[string]string{"foo": "bar", "master": "true"}, false), in: makeNode(map[string]string{"foo": "bar", "master": "true"}, false),
out: true, out: true,
readinessLabel: map[string]string{readyLabel: readyValue},
},
{
in: makeNode(map[string]string{"foo": "bar", "master": "true"}, false),
out: true,
readinessLabel: map[string]string{readyLabel: readyValue},
},
{
in: makeNode(map[string]string{"foo": "bar"}, true),
out: true,
readinessLabel: map[string]string{},
},
{
in: makeNode(map[string]string{"foo": "bar"}, false),
out: false,
readinessLabel: map[string]string{},
},
{
in: makeNode(map[string]string{readyLabel: readyValue}, false),
out: false,
readinessLabel: map[string]string{},
},
{
in: makeNode(map[string]string{"foo": "bar", "master": "true"}, false),
out: true,
readinessLabel: map[string]string{},
}, },
} }
for _, tt := range testTable { for _, tt := range testTable {
nodeTestController.opConfig.NodeReadinessLabel = tt.readinessLabel
if isReady := nodeTestController.nodeIsReady(tt.in); isReady != tt.out { if isReady := nodeTestController.nodeIsReady(tt.in); isReady != tt.out {
t.Errorf("%s: expected response %t doesn't match the actual %t for the node %#v", t.Errorf("%s: expected response %t doesn't match the actual %t for the node %#v",
testName, tt.out, isReady, tt.in) testName, tt.out, isReady, tt.in)