github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

chore: Order ScalingReplicaSet message from->to

Browse Source 
* change format of event
* include `from 0` for new replicas
* update describe tests to reflect current output

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
This commit is contained in:
Josh Soref 2024-05-24 12:18:06 -04:00
parent e0e6c9633d
commit 502c05ed01
4 changed files with 47 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/deployment/sync.go
View File

@ -275,7 +275,7 @@ func (dc *DeploymentController) getNewReplicaSet(ctx context.Context, d *apps.De
return nil, err
}
if !alreadyExists && newReplicasCount > 0 {
dc.eventRecorder.Eventf(d, v1.EventTypeNormal, "ScalingReplicaSet", "Scaled up replica set %s to %d", createdRS.Name, newReplicasCount)
dc.eventRecorder.Eventf(d, v1.EventTypeNormal, "ScalingReplicaSet", "Scaled up replica set %s from 0 to %d", createdRS.Name, newReplicasCount)
}
needsUpdate := deploymentutil.SetDeploymentRevision(d, newRevision)
@ -426,7 +426,7 @@ func (dc *DeploymentController) scaleReplicaSet(ctx context.Context, rs *apps.Re
rs, err = dc.client.AppsV1().ReplicaSets(rsCopy.Namespace).Update(ctx, rsCopy, metav1.UpdateOptions{})
if err == nil && sizeNeedsUpdate {
scaled = true
dc.eventRecorder.Eventf(deployment, v1.EventTypeNormal, "ScalingReplicaSet", "Scaled %s replica set %s to %d from %d", scalingOperation, rs.Name, newScale, oldScale)
dc.eventRecorder.Eventf(deployment, v1.EventTypeNormal, "ScalingReplicaSet", "Scaled %s replica set %s from %d to %d", scalingOperation, rs.Name, oldScale, newScale)
}
}
return scaled, rs, err

29
staging/src/k8s.io/kubectl/pkg/cmd/events/event_printer_test.go
View File

@ -18,11 +18,12 @@ package events
import (
"bytes"
"testing"
"time"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"testing"
"time"
)
func TestPrintObj(t *testing.T) {
@ -50,7 +51,7 @@ func TestPrintObj(t *testing.T) {
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled up replica set bar-002 to 1",
Message: "Scaled up replica set bar-002 from 0 to 1",
ReportingController: "deployment-controller",
EventTime: metav1.NewMicroTime(time.Now().Add(-20 * time.Minute)),
Series: &corev1.EventSeries{
@ -59,7 +60,7 @@ func TestPrintObj(t *testing.T) {
},
},
expected: `LAST SEEN TYPE REASON OBJECT MESSAGE
12m (x3 over 20m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 to 1
12m (x3 over 20m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 from 0 to 1
`,
},
{
@ -83,7 +84,7 @@ func TestPrintObj(t *testing.T) {
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled up replica set bar-002 to 1",
Message: "Scaled up replica set bar-002 from 0 to 1",
ReportingController: "deployment-controller",
EventTime: metav1.NewMicroTime(time.Now().Add(-20 * time.Minute)),
Series: &corev1.EventSeries{
@ -105,7 +106,7 @@ func TestPrintObj(t *testing.T) {
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled up replica set bar-002 to 1",
Message: "Scaled up replica set bar-002 from 0 to 1",
ReportingController: "deployment-controller",
EventTime: metav1.NewMicroTime(time.Now().Add(-15 * time.Minute)),
Series: &corev1.EventSeries{
@ -116,8 +117,8 @@ func TestPrintObj(t *testing.T) {
},
},
expected: `NAMESPACE LAST SEEN TYPE REASON OBJECT MESSAGE
foo 12m (x3 over 20m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 to 1
bar 11m (x3 over 15m) Normal ScalingReplicaSet Deployment/bar2 Scaled up replica set bar-002 to 1
foo 12m (x3 over 20m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 from 0 to 1
bar 11m (x3 over 15m) Normal ScalingReplicaSet Deployment/bar2 Scaled up replica set bar-002 from 0 to 1
`,
},
{
@ -139,7 +140,7 @@ bar 11m (x3 over 15m) Normal ScalingReplicaSet Deployment/bar2 Scaled up replica
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled up replica set bar-002 to 1",
Message: "Scaled up replica set bar-002 from 0 to 1",
ReportingController: "deployment-controller",
EventTime: metav1.NewMicroTime(time.Now().Add(-20 * time.Minute)),
Series: &corev1.EventSeries{
@ -147,7 +148,7 @@ bar 11m (x3 over 15m) Normal ScalingReplicaSet Deployment/bar2 Scaled up replica
LastObservedTime: metav1.NewMicroTime(time.Now().Add(-12 * time.Minute)),
},
},
expected: "12m (x3 over 20m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 to 1\n",
expected: "12m (x3 over 20m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 from 0 to 1\n",
},
{
printer: EventPrinter{
@ -168,7 +169,7 @@ bar 11m (x3 over 15m) Normal ScalingReplicaSet Deployment/bar2 Scaled up replica
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled up replica set bar-002 to 1",
Message: "Scaled up replica set bar-002 from 0 to 1",
ReportingController: "deployment-controller",
EventTime: metav1.NewMicroTime(time.Now().Add(-20 * time.Minute)),
Series: &corev1.EventSeries{
@ -177,7 +178,7 @@ bar 11m (x3 over 15m) Normal ScalingReplicaSet Deployment/bar2 Scaled up replica
},
},
expected: `NAMESPACE LAST SEEN TYPE REASON OBJECT MESSAGE
foo 12m (x3 over 20m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 to 1
foo 12m (x3 over 20m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 from 0 to 1
`,
},
{
@ -199,7 +200,7 @@ foo 12m (x3 over 20m) Normal ScalingReplicaSet Deployment/bar Scaled up replica
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled up replica set bar-002 to 1",
Message: "Scaled up replica set bar-002 from 0 to 1",
ReportingController: "deployment-controller",
EventTime: metav1.NewMicroTime(time.Now().Add(-20 * time.Minute)),
Series: &corev1.EventSeries{
@ -207,7 +208,7 @@ foo 12m (x3 over 20m) Normal ScalingReplicaSet Deployment/bar Scaled up replica
LastObservedTime: metav1.NewMicroTime(time.Now().Add(-12 * time.Minute)),
},
},
expected: `foo 12m (x3 over 20m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 to 1
expected: `foo 12m (x3 over 20m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 from 0 to 1
`,
},
{

20
staging/src/k8s.io/kubectl/pkg/cmd/events/events_test.go
View File

@ -50,7 +50,7 @@ func getFakeEvents() *corev1.EventList {
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled up replica set bar-002 to 1",
Message: "Scaled up replica set bar-002 from 0 to 1",
ReportingController: "deployment-controller",
EventTime: metav1.NewMicroTime(time.Now().Add(-30 * time.Minute)),
Series: &corev1.EventSeries{
@ -72,7 +72,7 @@ func getFakeEvents() *corev1.EventList {
},
Type: corev1.EventTypeWarning,
Reason: "ScalingReplicaSet",
Message: "Scaled up replica set bar-002 to 1",
Message: "Scaled up replica set bar-002 from 0 to 1",
ReportingController: "deployment-controller",
EventTime: metav1.NewMicroTime(time.Now().Add(-28 * time.Minute)),
Series: &corev1.EventSeries{
@ -94,7 +94,7 @@ func getFakeEvents() *corev1.EventList {
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled up replica set bar-002 to 1",
Message: "Scaled up replica set bar-002 from 0 to 1",
ReportingController: "deployment-controller",
EventTime: metav1.NewMicroTime(time.Now().Add(-25 * time.Minute)),
Series: &corev1.EventSeries{
@ -135,9 +135,9 @@ func TestEventIsSorted(t *testing.T) {
}
expected := `NAMESPACE LAST SEEN TYPE REASON OBJECT MESSAGE
foo 20m (x3 over 30m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 to 1
foo 18m (x3 over 28m) Warning ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 to 1
otherfoo 15m (x3 over 25m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 to 1
foo 20m (x3 over 30m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 from 0 to 1
foo 18m (x3 over 28m) Warning ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 from 0 to 1
otherfoo 15m (x3 over 25m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 from 0 to 1
`
if e, a := expected, buf.String(); e != a {
t.Errorf("expected\n%v\ngot\n%v", e, a)
@ -172,9 +172,9 @@ func TestEventNoHeaders(t *testing.T) {
t.Fatal(err)
}
expected := `foo 20m (x3 over 30m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 to 1
foo 18m (x3 over 28m) Warning ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 to 1
otherfoo 15m (x3 over 25m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 to 1
expected := `foo 20m (x3 over 30m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 from 0 to 1
foo 18m (x3 over 28m) Warning ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 from 0 to 1
otherfoo 15m (x3 over 25m) Normal ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 from 0 to 1
`
if e, a := expected, buf.String(); e != a {
t.Errorf("expected\n%v\ngot\n%v", e, a)
@ -211,7 +211,7 @@ func TestEventFiltered(t *testing.T) {
}
expected := `NAMESPACE LAST SEEN TYPE REASON OBJECT MESSAGE
foo 18m (x3 over 28m) Warning ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 to 1
foo 18m (x3 over 28m) Warning ScalingReplicaSet Deployment/bar Scaled up replica set bar-002 from 0 to 1
`
if e, a := expected, buf.String(); e != a {
t.Errorf("expected\n%v\ngot\n%v", e, a)

40
staging/src/k8s.io/kubectl/pkg/describe/describe_test.go
View File

@ -2557,7 +2557,7 @@ func TestDescribeDeployment(t *testing.T) {
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled up replica set bar-002 to 1",
Message: "Scaled up replica set bar-002 from 0 to 1",
ReportingController: "deployment-controller",
EventTime: metav1.NewMicroTime(time.Now().Add(-20 * time.Minute)),
Series: &corev1.EventSeries{
@ -2578,7 +2578,7 @@ func TestDescribeDeployment(t *testing.T) {
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled up replica set bar-001 to 2",
Message: "Scaled up replica set bar-001 from 0 to 2",
Source: corev1.EventSource{
Component: "deployment-controller",
},
@ -2597,7 +2597,7 @@ func TestDescribeDeployment(t *testing.T) {
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled up replica set bar-002 to 1",
Message: "Scaled up replica set bar-002 from 0 to 1",
Source: corev1.EventSource{
Component: "deployment-controller",
},
@ -2616,7 +2616,7 @@ func TestDescribeDeployment(t *testing.T) {
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled down replica set bar-002 to 1",
Message: "Scaled down replica set bar-002 from 2 to 1",
ReportingController: "deployment-controller",
EventTime: metav1.NewMicroTime(time.Now().Add(-1 * time.Minute)),
},
@ -2627,10 +2627,10 @@ func TestDescribeDeployment(t *testing.T) {
"OldReplicaSets: bar-001 (2/2 replicas created)",
"NewReplicaSet: bar-002 (1/1 replicas created)",
"Events:\n",
"Normal ScalingReplicaSet 12m (x3 over 20m) deployment-controller Scaled up replica set bar-002 to 1",
"Normal ScalingReplicaSet 10m deployment-controller Scaled up replica set bar-001 to 2",
"Normal ScalingReplicaSet 2m deployment-controller Scaled up replica set bar-002 to 1",
"Normal ScalingReplicaSet 60s deployment-controller Scaled down replica set bar-002 to 1",
"Normal ScalingReplicaSet 12m (x3 over 20m) deployment-controller Scaled up replica set bar-002 from 0 to 1",
"Normal ScalingReplicaSet 10m deployment-controller Scaled up replica set bar-001 from 0 to 2",
"Normal ScalingReplicaSet 2m deployment-controller Scaled up replica set bar-002 from 0 to 1",
"Normal ScalingReplicaSet 60s deployment-controller Scaled down replica set bar-002 from 2 to 1",
},
},
{
@ -2817,7 +2817,7 @@ func TestDescribeDeployment(t *testing.T) {
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled up replica set bar-002 to 1",
Message: "Scaled up replica set bar-002 from 0 to 1",
ReportingController: "deployment-controller",
EventTime: metav1.NewMicroTime(time.Now().Add(-20 * time.Minute)),
Series: &corev1.EventSeries{
@ -2838,7 +2838,7 @@ func TestDescribeDeployment(t *testing.T) {
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled up replica set bar-001 to 2",
Message: "Scaled up replica set bar-001 from 0 to 2",
Source: corev1.EventSource{
Component: "deployment-controller",
},
@ -2857,7 +2857,7 @@ func TestDescribeDeployment(t *testing.T) {
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled up replica set bar-002 to 1",
Message: "Scaled up replica set bar-002 from 0 to 1",
Source: corev1.EventSource{
Component: "deployment-controller",
},
@ -2876,7 +2876,7 @@ func TestDescribeDeployment(t *testing.T) {
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled down replica set bar-002 to 1",
Message: "Scaled down replica set bar-002 from 2 to 1",
ReportingController: "deployment-controller",
EventTime: metav1.NewMicroTime(time.Now().Add(-1 * time.Minute)),
}, &corev1.Event{
@ -2893,7 +2893,7 @@ func TestDescribeDeployment(t *testing.T) {
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled up replica set bar-002 to 2",
Message: "Scaled up replica set bar-002 from 0 to 2",
ReportingController: "deployment-controller",
EventTime: metav1.NewMicroTime(time.Now().Add(-15 * time.Second)),
}, &corev1.Event{
@ -2910,7 +2910,7 @@ func TestDescribeDeployment(t *testing.T) {
},
Type: corev1.EventTypeNormal,
Reason: "ScalingReplicaSet",
Message: "Scaled down replica set bar-001 to 0",
Message: "Scaled down replica set bar-001 from 2 to 0",
ReportingController: "deployment-controller",
EventTime: metav1.NewMicroTime(time.Now().Add(-3 * time.Second)),
},
@ -2921,12 +2921,12 @@ func TestDescribeDeployment(t *testing.T) {
"OldReplicaSets: bar-001 (0/0 replicas created)",
"NewReplicaSet: bar-002 (2/2 replicas created)",
"Events:\n",
"Normal ScalingReplicaSet 12m (x3 over 20m) deployment-controller Scaled up replica set bar-002 to 1",
"Normal ScalingReplicaSet 10m deployment-controller Scaled up replica set bar-001 to 2",
"Normal ScalingReplicaSet 2m deployment-controller Scaled up replica set bar-002 to 1",
"Normal ScalingReplicaSet 60s deployment-controller Scaled down replica set bar-002 to 1",
"Normal ScalingReplicaSet 15s deployment-controller Scaled up replica set bar-002 to 2",
"Normal ScalingReplicaSet 3s deployment-controller Scaled down replica set bar-001 to 0",
"Normal ScalingReplicaSet 12m (x3 over 20m) deployment-controller Scaled up replica set bar-002 from 0 to 1",
"Normal ScalingReplicaSet 10m deployment-controller Scaled up replica set bar-001 from 0 to 2",
"Normal ScalingReplicaSet 2m deployment-controller Scaled up replica set bar-002 from 0 to 1",
"Normal ScalingReplicaSet 60s deployment-controller Scaled down replica set bar-002 from 2 to 1",
"Normal ScalingReplicaSet 15s deployment-controller Scaled up replica set bar-002 from 0 to 2",
"Normal ScalingReplicaSet 3s deployment-controller Scaled down replica set bar-001 from 2 to 0",
},
},
}