Use Scheme to get GVK of typed objects

atlassian · Feb 11, 2018 · 863c448 · 863c448
1 parent ef5e15a
commit 863c448
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/pkg/controller/controller_worker.go b/pkg/controller/controller_worker.go
@@ -119,7 +119,17 @@ func (c *BundleController) loggerForObj(obj interface{}) *zap.Logger {
 	}
 	runtimeObj, ok := metaObj.(runtime.Object)
 	if ok {
-		gvk := runtimeObj.GetObjectKind().GroupVersionKind() // TODO does this work for typed objects?
+		gvk := runtimeObj.GetObjectKind().GroupVersionKind()
+		if gvk.Kind == "" || gvk.Version == "" {
+			gvks, _, err := c.Scheme.ObjectKinds(runtimeObj)
+			if err != nil {
+				if !runtime.IsNotRegisteredError(err) {
+					logger.With(zap.Error(err)).Sugar().Warnf("Cannot get object's GVK. Type %T", runtimeObj)
+				}
+				return logger
+			}
+			gvk = gvks[0]
+		}
 		logger = logger.With(logz.Gvk(gvk))
 	}
 	return logger