diff --git a/go.mod b/go.mod index 0c2c88d90..b52e6fd7e 100644 --- a/go.mod +++ b/go.mod @@ -31,9 +31,9 @@ require ( golang.org/x/text v0.28.0 gopkg.in/evanphx/json-patch.v4 v4.13.0 k8s.io/api v0.0.0-20250910154843-1fa0d26cdf76 - k8s.io/apimachinery v0.0.0-20250910154559-505905675348 + k8s.io/apimachinery v0.0.0-20250910225611-100e5eee9b94 k8s.io/cli-runtime v0.0.0-20250910163532-99cfbcf4fd65 - k8s.io/client-go v0.0.0-20250910155245-bf9c276af973 + k8s.io/client-go v0.0.0-20250910225604-81eaeec477e6 k8s.io/component-base v0.0.0-20250910160652-c223836092f2 k8s.io/component-helpers v0.0.0-20250910160901-2e4efeae85b2 k8s.io/klog/v2 v2.130.1 @@ -92,3 +92,5 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect sigs.k8s.io/kustomize/api v0.20.1 // indirect ) + +replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20250911000617-8ba2fe21578c diff --git a/go.sum b/go.sum index 7562d893d..b7063c8db 100644 --- a/go.sum +++ b/go.sum @@ -199,12 +199,12 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= k8s.io/api v0.0.0-20250910154843-1fa0d26cdf76 h1:LClGpQ84ltOdzxjziPEYm2NytS8wlLsNWuRjFZPqs04= k8s.io/api v0.0.0-20250910154843-1fa0d26cdf76/go.mod h1:PJ8lBYC0ACxXtw8039EoZbQpH1jObX2uJcQq+AtMFbM= -k8s.io/apimachinery v0.0.0-20250910154559-505905675348 h1:a3sxx4Oe6kASeOXy+jKuNT10on+c4MYCYaaNM2GokMQ= -k8s.io/apimachinery v0.0.0-20250910154559-505905675348/go.mod h1:e4PlUo2z96rImpZLr3O4JWowzW30ALyjsbqt07xJKSM= +k8s.io/apimachinery v0.0.0-20250910225611-100e5eee9b94 h1:0/+PV1z/hEqYcNLwL61R7uPoDqqqA521Yt61zjI2eBk= +k8s.io/apimachinery v0.0.0-20250910225611-100e5eee9b94/go.mod h1:e4PlUo2z96rImpZLr3O4JWowzW30ALyjsbqt07xJKSM= k8s.io/cli-runtime v0.0.0-20250910163532-99cfbcf4fd65 h1:FBmZq4y2WwDO6IpetWBPPtYM5f6h3hQ8QkopQHXr4tg= k8s.io/cli-runtime v0.0.0-20250910163532-99cfbcf4fd65/go.mod h1:ftwjPiiX1V4Y8F/oYu17xDl993jnhRtwaUbwFagVLKs= -k8s.io/client-go v0.0.0-20250910155245-bf9c276af973 h1:1Hx4OuHlgMhbbm7fg5X6xgNm3NkOcpcQzg0v35l/Oow= -k8s.io/client-go v0.0.0-20250910155245-bf9c276af973/go.mod h1:R92FsjN8sRsbhdBKhMtjjDS326YQW/kMnpn+bGC0dKA= +k8s.io/client-go v0.0.0-20250910225604-81eaeec477e6 h1:uWrq2S/NM09NHrVWWKqcyHtatehrJVSHYvs5SmgFG6o= +k8s.io/client-go v0.0.0-20250910225604-81eaeec477e6/go.mod h1:R92FsjN8sRsbhdBKhMtjjDS326YQW/kMnpn+bGC0dKA= k8s.io/component-base v0.0.0-20250910160652-c223836092f2 h1:eOZPHLeVJhrlHp1wHcRlXFUg4op5DlC4adsyewQ5/Y4= k8s.io/component-base v0.0.0-20250910160652-c223836092f2/go.mod h1:+w9flDqeJ07iA7LUTSALmJ+axwia3OGAki7dR5Lbnq0= k8s.io/component-helpers v0.0.0-20250910160901-2e4efeae85b2 h1:RKOBP/vTbA7/wnEeciICv0eLoS7vOn4y4+1Vf2Ca3bU= diff --git a/pkg/describe/describe.go b/pkg/describe/describe.go index 083b6ab80..367f1dfe1 100644 --- a/pkg/describe/describe.go +++ b/pkg/describe/describe.go @@ -4361,12 +4361,16 @@ func DescribeEvents(el *corev1.EventList, w PrefixWriter) { if source == "" { source = e.ReportingController } + message := strings.TrimSpace(e.Message) + if len(e.InvolvedObject.FieldPath) > 0 { + message = fmt.Sprintf("%s: %s", e.InvolvedObject.FieldPath, message) + } w.Write(LEVEL_1, "%v\t%v\t%s\t%v\t%v\n", e.Type, e.Reason, interval, source, - strings.TrimSpace(e.Message), + message, ) } }