Skip to content

Commit 66e2c50

Browse files
committed
Record events for cluster operator status
1 parent 0f94992 commit 66e2c50

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

pkg/operator/status.go

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55
"reflect"
66
"strings"
77

8+
v1 "k8s.io/api/core/v1"
9+
810
"github.com/golang/glog"
911

1012
osconfigv1 "github.com/openshift/api/config/v1"
@@ -39,10 +41,18 @@ func (optr *Operator) statusProgressing() error {
3941
return err
4042
}
4143
var isProgressing osconfigv1.ConditionStatus
44+
45+
co, err := optr.getOrCreateClusterOperator()
46+
if err != nil {
47+
glog.Errorf("Failed to get or create Cluster Operator: %v", err)
48+
return err
49+
}
50+
4251
var message string
4352
if !reflect.DeepEqual(desiredVersions, currentVersions) {
4453
glog.V(2).Info("Syncing status: progressing")
4554
message = fmt.Sprintf("Progressing towards %s", optr.printOperandVersions())
55+
optr.eventRecorder.Eventf(co, v1.EventTypeNormal, "Status upgrade", message)
4656
isProgressing = osconfigv1.ConditionTrue
4757
} else {
4858
glog.V(2).Info("Syncing status: re-syncing")
@@ -67,11 +77,6 @@ func (optr *Operator) statusProgressing() error {
6777
},
6878
}
6979

70-
co, err := optr.getOrCreateClusterOperator()
71-
if err != nil {
72-
glog.Errorf("Failed to get or create Cluster Operator: %v", err)
73-
return err
74-
}
7580
return optr.syncStatus(co, conds)
7681
}
7782

@@ -145,6 +150,7 @@ func (optr *Operator) statusFailing(error string) error {
145150
if err != nil {
146151
return err
147152
}
153+
optr.eventRecorder.Eventf(co, v1.EventTypeWarning, "Status failing", error)
148154
glog.V(2).Info("Syncing status: failing")
149155
return optr.syncStatus(co, conds)
150156
}

pkg/operator/status_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package operator
22

33
import (
4+
"testing"
5+
46
osconfigv1 "github.com/openshift/api/config/v1"
57
fakeconfigclientset "github.com/openshift/client-go/config/clientset/versioned/fake"
68
"github.com/stretchr/testify/assert"
79
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
8-
"testing"
10+
"k8s.io/client-go/tools/record"
911
)
1012

1113
func TestPrintOperandVersions(t *testing.T) {
@@ -61,6 +63,7 @@ func TestOperatorStatusProgressing(t *testing.T) {
6163
Version: "1.0",
6264
},
6365
},
66+
eventRecorder: record.NewFakeRecorder(5),
6467
}
6568
for i, tc := range tCases {
6669
co := &osconfigv1.ClusterOperator{ObjectMeta: metav1.ObjectMeta{Name: clusterOperatorName}}

0 commit comments

Comments
 (0)