scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-09 16:16:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #78998 from jennybuckley/apply-conflict-panic

Browse Source 
Don't dereference nil pointer in apply conflicts
This commit is contained in:
Kubernetes Prow Robot
2019-06-15 08:52:25 -07:00
committed by GitHub
parent fc33ddc285 c71583a313
commit f523c25113
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/conflict.go
View File

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