зеркало из https://github.com/Azure/ARO-RP.git
Unit test coverage for ClusterDeployment conditions monitor (#2302)
This commit is contained in:
Ulrich Schlueter
GitHub
Родитель
e3b217fbb0
Коммит
5c22adb6f2
|
|
@ -31,20 +31,43 @@ func (mon *Monitor) emitHiveRegistrationStatus(ctx context.Context) error {
|
|||
return fmt.Errorf("cluster %s not adopted. No namespace in the clusterdocument", mon.oc.Name)
|
||||
}
|
||||
|
||||
cd, err := mon.hiveclientset.HiveV1().ClusterDeployments(mon.oc.Properties.HiveProfile.Namespace).Get(ctx, hive.ClusterDeploymentName, metav1.GetOptions{})
|
||||
cd, err := mon.retrieveClusterDeployment(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
conditions := mon.filterClusterDeploymentConditions(ctx, cd, clusterDeploymentConditionsExpected)
|
||||
mon.emitFilteredClusterDeploymentMetrics(conditions)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (mon *Monitor) retrieveClusterDeployment(ctx context.Context) (*hivev1.ClusterDeployment, error) {
|
||||
cd, err := mon.hiveclientset.HiveV1().ClusterDeployments(mon.oc.Properties.HiveProfile.Namespace).Get(ctx, hive.ClusterDeploymentName, metav1.GetOptions{})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return cd, nil
|
||||
}
|
||||
|
||||
func (mon *Monitor) filterClusterDeploymentConditions(ctx context.Context, cd *hivev1.ClusterDeployment, clusterDeploymentConditionsExpected map[hivev1.ClusterDeploymentConditionType]corev1.ConditionStatus) []hivev1.ClusterDeploymentCondition {
|
||||
conditions := make([]hivev1.ClusterDeploymentCondition, 0)
|
||||
for _, condition := range cd.Status.Conditions {
|
||||
if expectedState, ok := clusterDeploymentConditionsExpected[condition.Type]; ok {
|
||||
if condition.Status != expectedState {
|
||||
mon.emitGauge("hive.clusterdeployment.conditions", 1, map[string]string{
|
||||
"type": string(condition.Type),
|
||||
"reason": condition.Reason,
|
||||
})
|
||||
conditions = append(conditions, condition)
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
|
||||
return conditions
|
||||
}
|
||||
|
||||
func (mon *Monitor) emitFilteredClusterDeploymentMetrics(conditions []hivev1.ClusterDeploymentCondition) {
|
||||
for _, condition := range conditions {
|
||||
mon.emitGauge("hive.clusterdeployment.conditions", 1, map[string]string{
|
||||
"type": string(condition.Type),
|
||||
"reason": condition.Reason,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,281 @@
|
|||
package cluster
|
||||
|
||||
// Copyright (c) Microsoft Corporation.
|
||||
// Licensed under the Apache License 2.0.
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/golang/mock/gomock"
|
||||
hivev1 "github.com/openshift/hive/apis/hive/v1"
|
||||
hiveclient "github.com/openshift/hive/pkg/client/clientset/versioned"
|
||||
hivefake "github.com/openshift/hive/pkg/client/clientset/versioned/fake"
|
||||
"github.com/sirupsen/logrus"
|
||||
"github.com/sirupsen/logrus/hooks/test"
|
||||
"github.com/stretchr/testify/assert"
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
kruntime "k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/Azure/ARO-RP/pkg/api"
|
||||
"github.com/Azure/ARO-RP/pkg/hive"
|
||||
mock_metrics "github.com/Azure/ARO-RP/pkg/util/mocks/metrics"
|
||||
)
|
||||
|
||||
func TestEmitHiveRegistrationStatus(t *testing.T) {
|
||||
fakeNamespace := "fake-namespace"
|
||||
|
||||
for _, tt := range []struct {
|
||||
name string
|
||||
oc *api.OpenShiftCluster
|
||||
cd kruntime.Object
|
||||
withClient bool
|
||||
wantErr string
|
||||
wantLog string
|
||||
}{
|
||||
{
|
||||
name: "no hiveclient",
|
||||
withClient: false,
|
||||
wantLog: "skipping: no hive cluster manager",
|
||||
},
|
||||
{
|
||||
name: "no namespace in cosmosDB - not adopted yet",
|
||||
withClient: true,
|
||||
oc: &api.OpenShiftCluster{
|
||||
Name: "testcluster",
|
||||
Properties: api.OpenShiftClusterProperties{
|
||||
HiveProfile: api.HiveProfile{
|
||||
Namespace: "",
|
||||
},
|
||||
},
|
||||
},
|
||||
wantErr: "cluster testcluster not adopted. No namespace in the clusterdocument",
|
||||
},
|
||||
{
|
||||
name: "clusterdeployment can not be retrieved",
|
||||
withClient: true,
|
||||
oc: &api.OpenShiftCluster{
|
||||
Name: "testcluster",
|
||||
Properties: api.OpenShiftClusterProperties{
|
||||
HiveProfile: api.HiveProfile{
|
||||
Namespace: fakeNamespace,
|
||||
},
|
||||
},
|
||||
},
|
||||
wantErr: "clusterdeployments.hive.openshift.io \"cluster\" not found",
|
||||
},
|
||||
{
|
||||
name: "send metrics data",
|
||||
withClient: true,
|
||||
oc: &api.OpenShiftCluster{
|
||||
Name: "testcluster",
|
||||
Properties: api.OpenShiftClusterProperties{
|
||||
HiveProfile: api.HiveProfile{
|
||||
Namespace: fakeNamespace,
|
||||
},
|
||||
},
|
||||
},
|
||||
cd: &hivev1.ClusterDeployment{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: hive.ClusterDeploymentName,
|
||||
Namespace: fakeNamespace,
|
||||
},
|
||||
},
|
||||
},
|
||||
} {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
var hiveclient hiveclient.Interface
|
||||
if tt.withClient {
|
||||
fakeclient := hivefake.NewSimpleClientset()
|
||||
if tt.cd != nil {
|
||||
fakeclient.Tracker().Add(tt.cd)
|
||||
}
|
||||
hiveclient = fakeclient
|
||||
}
|
||||
|
||||
logger, hook := test.NewNullLogger()
|
||||
log := logrus.NewEntry(logger)
|
||||
|
||||
mon := &Monitor{
|
||||
hiveclientset: hiveclient,
|
||||
oc: tt.oc,
|
||||
log: log,
|
||||
}
|
||||
|
||||
err := mon.emitHiveRegistrationStatus(context.Background())
|
||||
if err != nil && err.Error() != tt.wantErr ||
|
||||
err == nil && tt.wantErr != "" {
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
if tt.wantLog != "" {
|
||||
x := hook.LastEntry()
|
||||
assert.Equal(t, tt.wantLog, x.Message)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestRetrieveClusterDeployment(t *testing.T) {
|
||||
fakeNamespace := "fake-namespace"
|
||||
|
||||
for _, tt := range []struct {
|
||||
name string
|
||||
cd *hivev1.ClusterDeployment
|
||||
wantErr string
|
||||
}{{
|
||||
name: "clusterdeployment available in hive",
|
||||
cd: &hivev1.ClusterDeployment{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: hive.ClusterDeploymentName,
|
||||
Namespace: fakeNamespace,
|
||||
},
|
||||
},
|
||||
}, {
|
||||
name: "no cluster deployment found in hive",
|
||||
wantErr: fmt.Sprintf("clusterdeployments.hive.openshift.io %q not found", hive.ClusterDeploymentName),
|
||||
}} {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
fakeclient := hivefake.NewSimpleClientset()
|
||||
if tt.cd != nil {
|
||||
fakeclient.Tracker().Add(tt.cd)
|
||||
}
|
||||
|
||||
mon := &Monitor{
|
||||
hiveclientset: fakeclient,
|
||||
oc: &api.OpenShiftCluster{
|
||||
Name: "testcluster",
|
||||
Properties: api.OpenShiftClusterProperties{
|
||||
HiveProfile: api.HiveProfile{
|
||||
Namespace: fakeNamespace,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
_, err := mon.retrieveClusterDeployment(context.Background())
|
||||
if err != nil && err.Error() != tt.wantErr ||
|
||||
err == nil && tt.wantErr != "" {
|
||||
t.Error(err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestFilterClusterDeploymentConditions(t *testing.T) {
|
||||
var testConditionList = map[hivev1.ClusterDeploymentConditionType]corev1.ConditionStatus{
|
||||
hivev1.ClusterReadyCondition: corev1.ConditionTrue,
|
||||
hivev1.UnreachableCondition: corev1.ConditionFalse,
|
||||
hivev1.SyncSetFailedCondition: corev1.ConditionFalse,
|
||||
}
|
||||
|
||||
for _, tt := range []struct {
|
||||
name string
|
||||
cd *hivev1.ClusterDeployment
|
||||
expectedConditions []hivev1.ClusterDeploymentCondition
|
||||
}{
|
||||
{
|
||||
name: "irrelevant condition",
|
||||
cd: &hivev1.ClusterDeployment{
|
||||
Status: hivev1.ClusterDeploymentStatus{
|
||||
Conditions: []hivev1.ClusterDeploymentCondition{
|
||||
{
|
||||
Type: hivev1.ClusterHibernatingCondition,
|
||||
Status: corev1.ConditionTrue,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
expectedConditions: []hivev1.ClusterDeploymentCondition{},
|
||||
},
|
||||
{
|
||||
name: "mixed conditions",
|
||||
cd: &hivev1.ClusterDeployment{
|
||||
Status: hivev1.ClusterDeploymentStatus{
|
||||
Conditions: []hivev1.ClusterDeploymentCondition{
|
||||
{ //should be ignored
|
||||
Type: hivev1.ClusterHibernatingCondition,
|
||||
Status: corev1.ConditionTrue,
|
||||
},
|
||||
{ //should be ignored
|
||||
Type: hivev1.UnreachableCondition,
|
||||
Status: corev1.ConditionFalse,
|
||||
},
|
||||
{ //should be returned
|
||||
Type: hivev1.ClusterReadyCondition,
|
||||
Status: corev1.ConditionFalse,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
expectedConditions: []hivev1.ClusterDeploymentCondition{
|
||||
{
|
||||
Type: hivev1.ClusterReadyCondition,
|
||||
Status: corev1.ConditionFalse,
|
||||
},
|
||||
},
|
||||
},
|
||||
} {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
mon := &Monitor{}
|
||||
conditions := mon.filterClusterDeploymentConditions(context.Background(), tt.cd, testConditionList)
|
||||
for _, c := range conditions {
|
||||
isExpected := false
|
||||
for _, ex := range tt.expectedConditions {
|
||||
if ex.Type == c.Type {
|
||||
isExpected = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !isExpected {
|
||||
t.Errorf("condition %s should not be returned", c.Type)
|
||||
}
|
||||
}
|
||||
|
||||
for _, ex := range tt.expectedConditions {
|
||||
isReturned := false
|
||||
for _, c := range conditions {
|
||||
if ex.Type == c.Type {
|
||||
isReturned = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !isReturned {
|
||||
t.Errorf("expected condition %s not returned", ex.Type)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestEmitFilteredClusterDeploymentMetrics(t *testing.T) {
|
||||
conditions := []hivev1.ClusterDeploymentCondition{
|
||||
{
|
||||
Type: hivev1.ClusterHibernatingCondition,
|
||||
Reason: "test",
|
||||
},
|
||||
{
|
||||
Type: hivev1.ClusterReadyCondition,
|
||||
Reason: "second test",
|
||||
},
|
||||
}
|
||||
|
||||
controller := gomock.NewController(t)
|
||||
defer controller.Finish()
|
||||
|
||||
m := mock_metrics.NewMockEmitter(controller)
|
||||
mon := &Monitor{
|
||||
m: m,
|
||||
}
|
||||
|
||||
for _, c := range conditions {
|
||||
m.EXPECT().EmitGauge("hive.clusterdeployment.conditions", int64(1), map[string]string{
|
||||
"type": string(c.Type),
|
||||
"reason": c.Reason,
|
||||
})
|
||||
}
|
||||
|
||||
mon.emitFilteredClusterDeploymentMetrics(conditions)
|
||||
}
|
||||
Загрузка…
Ссылка в новой задаче