From c71583a31368d1e4e71cd458d6961d8fec2265f1 Mon Sep 17 00:00:00 2001
From: jennybuckley <jennybuckley@google.com>
Date: Thu, 13 Jun 2019 14:42:19 -0700
Subject: [PATCH] Don't dereference nil pointer in conflicts

---
 .../pkg/endpoints/handlers/fieldmanager/internal/conflict.go   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/conflict.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/conflict.go
index 282fe80fbbe..51ae64c6eb6 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/conflict.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/conflict.go
@@ -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)