From f126887b52d8af2a072dcc475a0128f876d9bbec Mon Sep 17 00:00:00 2001 From: Blaine Gardner Date: Tue, 9 Apr 2019 15:38:07 -0600 Subject: [PATCH] tests: add T/F/Unk. status to node ready condition Rook previously relied on the presence of `Ready` to determine if a node is ready, but `Ready` can have different statuses. Correct this. https://kubernetes.io/docs/concepts/architecture/nodes/#condition Signed-off-by: Blaine Gardner --- pkg/operator/ceph/cluster/mon/health_test.go | 4 ++-- pkg/operator/ceph/cluster/osd/osd_test.go | 2 +- pkg/operator/test/client.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/operator/ceph/cluster/mon/health_test.go b/pkg/operator/ceph/cluster/mon/health_test.go index b43e58d2b..c4ea7445f 100644 --- a/pkg/operator/ceph/cluster/mon/health_test.go +++ b/pkg/operator/ceph/cluster/mon/health_test.go @@ -222,7 +222,7 @@ func TestCheckHealthTwoMonsOneNode(t *testing.T) { Status: v1.NodeStatus{ Conditions: []v1.NodeCondition{ { - Type: v1.NodeReady, + Type: v1.NodeReady, Status: v1.ConditionTrue, }, }, Addresses: []v1.NodeAddress{ @@ -310,7 +310,7 @@ func TestCheckMonsValid(t *testing.T) { Status: v1.NodeStatus{ Conditions: []v1.NodeCondition{ { - Type: v1.NodeReady, + Type: v1.NodeReady, Status: v1.ConditionTrue, }, }, Addresses: []v1.NodeAddress{ diff --git a/pkg/operator/ceph/cluster/osd/osd_test.go b/pkg/operator/ceph/cluster/osd/osd_test.go index 21230fab1..a22ab0f35 100644 --- a/pkg/operator/ceph/cluster/osd/osd_test.go +++ b/pkg/operator/ceph/cluster/osd/osd_test.go @@ -79,7 +79,7 @@ func createNode(nodeName string, condition v1.NodeConditionType, clientset *fake Status: v1.NodeStatus{ Conditions: []v1.NodeCondition{ { - Type: condition, + Type: condition, Status: v1.ConditionTrue, }, }, }, diff --git a/pkg/operator/test/client.go b/pkg/operator/test/client.go index 195da08e6..add8237e6 100644 --- a/pkg/operator/test/client.go +++ b/pkg/operator/test/client.go @@ -28,7 +28,7 @@ import ( func New(nodes int) *fake.Clientset { clientset := fake.NewSimpleClientset() for i := 0; i < nodes; i++ { - ready := v1.NodeCondition{Type: v1.NodeReady} + ready := v1.NodeCondition{Type: v1.NodeReady, Status: v1.ConditionTrue} name := fmt.Sprintf("node%d", i) n := &v1.Node{ ObjectMeta: metav1.ObjectMeta{