kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't dereference nil pointer in conflicts 

Kubernetes-commit: c71583a31368d1e4e71cd458d6961d8fec2265f1
This commit is contained in:
jennybuckley 2019-06-13 14:42:19 -07:00 committed by Kubernetes Publisher
parent e2a1114d49
commit e67aadb10a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/endpoints/handlers/fieldmanager/internal/conflict.go
View File

@ -76,6 +76,9 @@ func printManager(manager string) string {
return fmt.Sprintf("%q", manager)
}
if encodedManager.Operation == metav1.ManagedFieldsOperationUpdate {
if encodedManager.Time == nil {
return fmt.Sprintf("%q using %v", encodedManager.Manager, encodedManager.APIVersion)
}
return fmt.Sprintf("%q using %v at %v", encodedManager.Manager, encodedManager.APIVersion, encodedManager.Time.UTC().Format(time.RFC3339))
}
return fmt.Sprintf("%q", encodedManager.Manager)