зеркало из https://github.com/Azure/ARO-RP.git
Split output of failurelogs' list results (#4015)
* Add tests to capture existing behavior * Log nodes individiually and return simple summary * Log COs individually and return simple summary * Log ICs individually and return simple summary * Update steprunner tests to capture new failure logging format * Do not output summary strings as JSON
This commit is contained in:
Tanmay Satam
GitHub
Родитель
c6c8c5b983
Коммит
e723a443a3
|
|
@ -7,10 +7,13 @@ import (
|
|||
"bufio"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"strings"
|
||||
|
||||
configv1 "github.com/openshift/api/config/v1"
|
||||
operatorv1 "github.com/openshift/api/operator/v1"
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
|
|
@ -28,9 +31,9 @@ func (m *manager) gatherFailureLogs(ctx context.Context, runType string) {
|
|||
|
||||
s := []diagnosticStep{
|
||||
{f: m.logClusterVersion, isJSON: true},
|
||||
{f: m.logNodes, isJSON: true},
|
||||
{f: m.logClusterOperators, isJSON: true},
|
||||
{f: m.logIngressControllers, isJSON: true},
|
||||
{f: m.logNodes, isJSON: false},
|
||||
{f: m.logClusterOperators, isJSON: false},
|
||||
{f: m.logIngressControllers, isJSON: false},
|
||||
{f: m.logPodLogs, isJSON: false},
|
||||
}
|
||||
|
||||
|
|
@ -93,11 +96,30 @@ func (m *manager) logNodes(ctx context.Context) (interface{}, error) {
|
|||
return nil, err
|
||||
}
|
||||
|
||||
for i := range nodes.Items {
|
||||
nodes.Items[i].ManagedFields = nil
|
||||
lines := make([]string, 0)
|
||||
errs := make([]error, 0)
|
||||
|
||||
for _, node := range nodes.Items {
|
||||
node.ManagedFields = nil
|
||||
|
||||
nodeReady := corev1.ConditionUnknown
|
||||
for _, condition := range node.Status.Conditions {
|
||||
if condition.Type == corev1.NodeReady {
|
||||
nodeReady = condition.Status
|
||||
break
|
||||
}
|
||||
}
|
||||
lines = append(lines, fmt.Sprintf("%s - Ready: %s", node.Name, nodeReady))
|
||||
|
||||
json, err := json.Marshal(node)
|
||||
if err != nil {
|
||||
errs = append(errs, err)
|
||||
continue
|
||||
}
|
||||
m.log.Info(string(json))
|
||||
}
|
||||
|
||||
return nodes.Items, nil
|
||||
return strings.Join(lines, "\n"), errors.Join(errs...)
|
||||
}
|
||||
|
||||
func (m *manager) logClusterOperators(ctx context.Context) (interface{}, error) {
|
||||
|
|
@ -110,11 +132,36 @@ func (m *manager) logClusterOperators(ctx context.Context) (interface{}, error)
|
|||
return nil, err
|
||||
}
|
||||
|
||||
for i := range cos.Items {
|
||||
cos.Items[i].ManagedFields = nil
|
||||
lines := make([]string, 0)
|
||||
errs := make([]error, 0)
|
||||
|
||||
for _, co := range cos.Items {
|
||||
co.ManagedFields = nil
|
||||
|
||||
coAvailable := configv1.ConditionUnknown
|
||||
coProgressing := configv1.ConditionUnknown
|
||||
coDegraded := configv1.ConditionUnknown
|
||||
for _, condition := range co.Status.Conditions {
|
||||
switch condition.Type {
|
||||
case configv1.OperatorAvailable:
|
||||
coAvailable = condition.Status
|
||||
case configv1.OperatorProgressing:
|
||||
coProgressing = condition.Status
|
||||
case configv1.OperatorDegraded:
|
||||
coDegraded = condition.Status
|
||||
}
|
||||
}
|
||||
lines = append(lines, fmt.Sprintf("%s - Available: %s, Progressing: %s, Degraded: %s", co.Name, coAvailable, coProgressing, coDegraded))
|
||||
|
||||
json, err := json.Marshal(co)
|
||||
if err != nil {
|
||||
errs = append(errs, err)
|
||||
continue
|
||||
}
|
||||
m.log.Infof(string(json))
|
||||
}
|
||||
|
||||
return cos.Items, nil
|
||||
return strings.Join(lines, "\n"), errors.Join(errs...)
|
||||
}
|
||||
|
||||
func (m *manager) logIngressControllers(ctx context.Context) (interface{}, error) {
|
||||
|
|
@ -127,15 +174,40 @@ func (m *manager) logIngressControllers(ctx context.Context) (interface{}, error
|
|||
return nil, err
|
||||
}
|
||||
|
||||
for i := range ics.Items {
|
||||
ics.Items[i].ManagedFields = nil
|
||||
lines := make([]string, 0)
|
||||
errs := make([]error, 0)
|
||||
|
||||
for _, ic := range ics.Items {
|
||||
ic.ManagedFields = nil
|
||||
|
||||
icAvailable := operatorv1.ConditionUnknown
|
||||
icProgressing := operatorv1.ConditionUnknown
|
||||
icDegraded := operatorv1.ConditionUnknown
|
||||
for _, condition := range ic.Status.Conditions {
|
||||
switch condition.Type {
|
||||
case operatorv1.OperatorStatusTypeAvailable:
|
||||
icAvailable = condition.Status
|
||||
case operatorv1.OperatorStatusTypeProgressing:
|
||||
icProgressing = condition.Status
|
||||
case operatorv1.OperatorStatusTypeDegraded:
|
||||
icDegraded = condition.Status
|
||||
}
|
||||
}
|
||||
lines = append(lines, fmt.Sprintf("%s - Available: %s, Progressing: %s, Degraded: %s", ic.Name, icAvailable, icProgressing, icDegraded))
|
||||
|
||||
json, err := json.Marshal(ic)
|
||||
if err != nil {
|
||||
errs = append(errs, err)
|
||||
continue
|
||||
}
|
||||
m.log.Infof(string(json))
|
||||
}
|
||||
|
||||
return ics.Items, nil
|
||||
return strings.Join(lines, "\n"), errors.Join(errs...)
|
||||
}
|
||||
|
||||
func (m *manager) logPodLogs(ctx context.Context) (interface{}, error) {
|
||||
if m.operatorcli == nil {
|
||||
if m.kubernetescli == nil {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,303 @@
|
|||
package cluster
|
||||
|
||||
// Copyright (c) Microsoft Corporation.
|
||||
// Licensed under the Apache License 2.0.
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/onsi/gomega"
|
||||
"github.com/onsi/gomega/types"
|
||||
configv1 "github.com/openshift/api/config/v1"
|
||||
operatorv1 "github.com/openshift/api/operator/v1"
|
||||
configfake "github.com/openshift/client-go/config/clientset/versioned/fake"
|
||||
operatorfake "github.com/openshift/client-go/operator/clientset/versioned/fake"
|
||||
"github.com/sirupsen/logrus"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/api/meta"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
kruntime "k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/client-go/kubernetes/fake"
|
||||
|
||||
utilerror "github.com/Azure/ARO-RP/test/util/error"
|
||||
testlog "github.com/Azure/ARO-RP/test/util/log"
|
||||
)
|
||||
|
||||
var (
|
||||
managedFields = []metav1.ManagedFieldsEntry{{Manager: "something"}}
|
||||
cvv = &configv1.ClusterVersion{ObjectMeta: metav1.ObjectMeta{Name: "version"}}
|
||||
master0Node = &corev1.Node{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "cluster-aaaaa-master-0", ManagedFields: managedFields},
|
||||
Status: corev1.NodeStatus{Conditions: []corev1.NodeCondition{{Type: corev1.NodeReady, Status: corev1.ConditionTrue}}},
|
||||
}
|
||||
master1Node = &corev1.Node{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "cluster-aaaaa-master-1", ManagedFields: managedFields},
|
||||
Status: corev1.NodeStatus{Conditions: []corev1.NodeCondition{{Type: corev1.NodeReady, Status: corev1.ConditionFalse}}},
|
||||
}
|
||||
master2Node = &corev1.Node{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "cluster-aaaaa-master-2", ManagedFields: managedFields},
|
||||
Status: corev1.NodeStatus{Conditions: []corev1.NodeCondition{{Type: corev1.NodeReady, Status: corev1.ConditionUnknown}}},
|
||||
}
|
||||
aroOperator = &configv1.ClusterOperator{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "aro", ManagedFields: managedFields},
|
||||
Status: configv1.ClusterOperatorStatus{Conditions: []configv1.ClusterOperatorStatusCondition{
|
||||
{Type: configv1.OperatorAvailable, Status: configv1.ConditionTrue},
|
||||
{Type: configv1.OperatorProgressing, Status: configv1.ConditionFalse},
|
||||
{Type: configv1.OperatorDegraded, Status: configv1.ConditionFalse},
|
||||
}},
|
||||
}
|
||||
machineApiOperator = &configv1.ClusterOperator{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "machine-api", ManagedFields: managedFields},
|
||||
Status: configv1.ClusterOperatorStatus{Conditions: []configv1.ClusterOperatorStatusCondition{
|
||||
{Type: configv1.OperatorAvailable, Status: configv1.ConditionFalse},
|
||||
{Type: configv1.OperatorProgressing, Status: configv1.ConditionUnknown},
|
||||
{Type: configv1.OperatorDegraded, Status: configv1.ConditionTrue},
|
||||
}},
|
||||
}
|
||||
defaultIngressController = &operatorv1.IngressController{
|
||||
ObjectMeta: metav1.ObjectMeta{Namespace: "openshift-ingress-operator", Name: "default", ManagedFields: managedFields},
|
||||
Status: operatorv1.IngressControllerStatus{Conditions: []operatorv1.OperatorCondition{
|
||||
{Type: operatorv1.OperatorStatusTypeAvailable, Status: operatorv1.ConditionTrue},
|
||||
{Type: operatorv1.OperatorStatusTypeProgressing, Status: operatorv1.ConditionFalse},
|
||||
{Type: operatorv1.OperatorStatusTypeDegraded, Status: operatorv1.ConditionFalse},
|
||||
}},
|
||||
}
|
||||
aroOperatorMasterPod = &corev1.Pod{ObjectMeta: metav1.ObjectMeta{Namespace: "openshift-azure-operator", Name: "aro-operator-master-aaaaaaaaa-aaaaa"}, Status: corev1.PodStatus{}}
|
||||
aroOperatorWorkerPod = &corev1.Pod{ObjectMeta: metav1.ObjectMeta{Namespace: "openshift-azure-operator", Name: "aro-operator-worker-bbbbbbbbb-bbbbb"}, Status: corev1.PodStatus{}}
|
||||
)
|
||||
|
||||
func TestLogClusterVersion(t *testing.T) {
|
||||
for _, tt := range []struct {
|
||||
name string
|
||||
objects []kruntime.Object
|
||||
want interface{}
|
||||
wantErr string
|
||||
}{
|
||||
{
|
||||
name: "no cv resource returns err",
|
||||
wantErr: `clusterversions.config.openshift.io "version" not found`,
|
||||
},
|
||||
{
|
||||
name: "returns cv resource if present",
|
||||
objects: []kruntime.Object{cvv},
|
||||
want: cvv,
|
||||
},
|
||||
} {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
configcli := configfake.NewSimpleClientset(tt.objects...)
|
||||
|
||||
_, log := testlog.New()
|
||||
|
||||
m := &manager{
|
||||
log: log,
|
||||
configcli: configcli,
|
||||
}
|
||||
|
||||
got, gotErr := m.logClusterVersion(ctx)
|
||||
utilerror.AssertErrorMessage(t, gotErr, tt.wantErr)
|
||||
assert.Equal(t, tt.want, got)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestLogNodes(t *testing.T) {
|
||||
for _, tt := range []struct {
|
||||
name string
|
||||
objects []kruntime.Object
|
||||
want interface{}
|
||||
wantLogs []map[string]types.GomegaMatcher
|
||||
wantErr string
|
||||
}{
|
||||
{
|
||||
name: "returns simple node output and logs full node object",
|
||||
objects: []kruntime.Object{master0Node, master1Node, master2Node},
|
||||
want: fmt.Sprintf("%s - Ready: %s\n%s - Ready: %s\n%s - Ready: %s",
|
||||
master0Node.Name, corev1.ConditionTrue,
|
||||
master1Node.Name, corev1.ConditionFalse,
|
||||
master2Node.Name, corev1.ConditionUnknown),
|
||||
wantLogs: []map[string]types.GomegaMatcher{
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.Equal(asJson(master0Node)),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.Equal(asJson(master1Node)),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.Equal(asJson(master2Node)),
|
||||
},
|
||||
},
|
||||
},
|
||||
} {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
kubernetescli := fake.NewSimpleClientset(tt.objects...)
|
||||
|
||||
h, log := testlog.New()
|
||||
|
||||
m := &manager{
|
||||
log: log,
|
||||
kubernetescli: kubernetescli,
|
||||
}
|
||||
|
||||
got, gotErr := m.logNodes(ctx)
|
||||
utilerror.AssertErrorMessage(t, gotErr, tt.wantErr)
|
||||
require.NoError(t, testlog.AssertLoggingOutput(h, tt.wantLogs))
|
||||
assert.Equal(t, tt.want, got)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestLogClusterOperators(t *testing.T) {
|
||||
for _, tt := range []struct {
|
||||
name string
|
||||
objects []kruntime.Object
|
||||
want interface{}
|
||||
wantLogs []map[string]types.GomegaMatcher
|
||||
wantErr string
|
||||
}{
|
||||
{
|
||||
name: "returns simple CO output and logs full CO object",
|
||||
objects: []kruntime.Object{aroOperator, machineApiOperator},
|
||||
want: fmt.Sprintf("%s - Available: %s, Progressing: %s, Degraded: %s\n%s - Available: %s, Progressing: %s, Degraded: %s",
|
||||
aroOperator.Name, configv1.ConditionTrue, configv1.ConditionFalse, configv1.ConditionFalse,
|
||||
machineApiOperator.Name, configv1.ConditionFalse, configv1.ConditionUnknown, configv1.ConditionTrue),
|
||||
wantLogs: []map[string]types.GomegaMatcher{
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.Equal(asJson(aroOperator)),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.Equal(asJson(machineApiOperator)),
|
||||
},
|
||||
},
|
||||
},
|
||||
} {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
configcli := configfake.NewSimpleClientset(tt.objects...)
|
||||
|
||||
h, log := testlog.New()
|
||||
|
||||
m := &manager{
|
||||
log: log,
|
||||
configcli: configcli,
|
||||
}
|
||||
|
||||
got, gotErr := m.logClusterOperators(ctx)
|
||||
utilerror.AssertErrorMessage(t, gotErr, tt.wantErr)
|
||||
require.NoError(t, testlog.AssertLoggingOutput(h, tt.wantLogs))
|
||||
assert.Equal(t, tt.want, got)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestLogIngressControllers(t *testing.T) {
|
||||
for _, tt := range []struct {
|
||||
name string
|
||||
objects []kruntime.Object
|
||||
want interface{}
|
||||
wantLogs []map[string]types.GomegaMatcher
|
||||
wantErr string
|
||||
}{
|
||||
{
|
||||
name: "returns simple IC output and logs full IC object",
|
||||
objects: []kruntime.Object{defaultIngressController},
|
||||
want: fmt.Sprintf("%s - Available: %s, Progressing: %s, Degraded: %s",
|
||||
defaultIngressController.Name, operatorv1.ConditionTrue, operatorv1.ConditionFalse, operatorv1.ConditionFalse),
|
||||
wantLogs: []map[string]types.GomegaMatcher{
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.Equal(asJson(defaultIngressController)),
|
||||
},
|
||||
},
|
||||
},
|
||||
} {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
operatorcli := operatorfake.NewSimpleClientset(tt.objects...)
|
||||
|
||||
h, log := testlog.New()
|
||||
|
||||
m := &manager{
|
||||
log: log,
|
||||
operatorcli: operatorcli,
|
||||
}
|
||||
|
||||
got, gotErr := m.logIngressControllers(ctx)
|
||||
utilerror.AssertErrorMessage(t, gotErr, tt.wantErr)
|
||||
require.NoError(t, testlog.AssertLoggingOutput(h, tt.wantLogs))
|
||||
assert.Equal(t, tt.want, got)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestLogPodLogs(t *testing.T) {
|
||||
for _, tt := range []struct {
|
||||
name string
|
||||
objects []kruntime.Object
|
||||
want interface{}
|
||||
wantLogs []map[string]types.GomegaMatcher
|
||||
wantErr string
|
||||
}{
|
||||
{
|
||||
name: "no pods returns empty and logs nothing",
|
||||
want: []interface{}{},
|
||||
},
|
||||
{
|
||||
name: "outputs status of aro-operator pods and directly logs pod logs",
|
||||
objects: []kruntime.Object{aroOperatorMasterPod, aroOperatorWorkerPod},
|
||||
want: []interface{}{
|
||||
fmt.Sprintf("pod status %s: %v", aroOperatorMasterPod.Name, aroOperatorMasterPod.Status),
|
||||
fmt.Sprintf("pod status %s: %v", aroOperatorWorkerPod.Name, aroOperatorWorkerPod.Status),
|
||||
},
|
||||
wantLogs: []map[string]types.GomegaMatcher{
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.Equal("fake logs"),
|
||||
"pod": gomega.Equal(aroOperatorMasterPod.Name),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.Equal("fake logs"),
|
||||
"pod": gomega.Equal(aroOperatorWorkerPod.Name),
|
||||
},
|
||||
},
|
||||
},
|
||||
} {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
kubernetescli := fake.NewSimpleClientset(tt.objects...)
|
||||
|
||||
h, log := testlog.New()
|
||||
|
||||
m := &manager{
|
||||
log: log,
|
||||
kubernetescli: kubernetescli,
|
||||
}
|
||||
|
||||
got, gotErr := m.logPodLogs(ctx)
|
||||
utilerror.AssertErrorMessage(t, gotErr, tt.wantErr)
|
||||
require.NoError(t, testlog.AssertLoggingOutput(h, tt.wantLogs))
|
||||
assert.Equal(t, tt.want, got)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func asJson(r kruntime.Object) string {
|
||||
r = r.DeepCopyObject()
|
||||
a, _ := meta.Accessor(r)
|
||||
a.SetManagedFields(nil)
|
||||
|
||||
json, _ := json.Marshal(r)
|
||||
return string(json)
|
||||
}
|
||||
|
|
@ -114,15 +114,27 @@ func TestStepRunnerWithInstaller(t *testing.T) {
|
|||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.MatchRegexp(`(?s)pkg/cluster.\(\*manager\).logNodes:.*"name": "node"`),
|
||||
"msg": gomega.MatchRegexp(`"name":"node"`),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.MatchRegexp(`(?s)pkg/cluster.\(\*manager\).logClusterOperators:.*"name": "operator"`),
|
||||
"msg": gomega.MatchRegexp(`(?s)pkg/cluster.\(\*manager\).logNodes:.*node - Ready: Unknown`),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.MatchRegexp(`(?s)pkg/cluster.\(\*manager\).logIngressControllers:.*"name": "ingress-controller"`),
|
||||
"msg": gomega.MatchRegexp(`"name":"operator"`),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.MatchRegexp(`(?s)pkg/cluster.\(\*manager\).logClusterOperators:.*operator - Available: Unknown, Progressing: Unknown, Degraded: Unknown`),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.MatchRegexp(`"name":"ingress-controller"`),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.MatchRegexp(`(?s)pkg/cluster.\(\*manager\).logIngressControllers:.*ingress-controller - Available: Unknown, Progressing: Unknown, Degraded: Unknown`),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
|
|
@ -155,15 +167,27 @@ func TestStepRunnerWithInstaller(t *testing.T) {
|
|||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.MatchRegexp(`(?s)pkg/cluster.\(\*manager\).logNodes:.*"name": "node"`),
|
||||
"msg": gomega.MatchRegexp(`"name":"node"`),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.MatchRegexp(`(?s)pkg/cluster.\(\*manager\).logClusterOperators:.*"name": "operator"`),
|
||||
"msg": gomega.MatchRegexp(`(?s)pkg/cluster.\(\*manager\).logNodes:.*node - Ready: Unknown`),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.MatchRegexp(`(?s)pkg/cluster.\(\*manager\).logIngressControllers:.*"name": "ingress-controller"`),
|
||||
"msg": gomega.MatchRegexp(`"name":"operator"`),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.MatchRegexp(`(?s)pkg/cluster.\(\*manager\).logClusterOperators:.*operator - Available: Unknown, Progressing: Unknown, Degraded: Unknown`),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.MatchRegexp(`"name":"ingress-controller"`),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.MatchRegexp(`(?s)pkg/cluster.\(\*manager\).logIngressControllers:.*ingress-controller - Available: Unknown, Progressing: Unknown, Degraded: Unknown`),
|
||||
},
|
||||
},
|
||||
kubernetescli: fake.NewSimpleClientset(node),
|
||||
|
|
@ -192,15 +216,15 @@ func TestStepRunnerWithInstaller(t *testing.T) {
|
|||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.Equal(`pkg/cluster.(*manager).logNodes: null`),
|
||||
"msg": gomega.Equal(`pkg/cluster.(*manager).logNodes: `),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.Equal(`pkg/cluster.(*manager).logClusterOperators: null`),
|
||||
"msg": gomega.Equal(`pkg/cluster.(*manager).logClusterOperators: `),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
"msg": gomega.Equal(`pkg/cluster.(*manager).logIngressControllers: null`),
|
||||
"msg": gomega.Equal(`pkg/cluster.(*manager).logIngressControllers: `),
|
||||
},
|
||||
{
|
||||
"level": gomega.Equal(logrus.InfoLevel),
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче