Merge pull request zendesk#677 from zendesk/shender/fix_gce_k8s_error

Ignore K8s events that don't have a label
olaurendeau · Dec 8, 2015 · dabae29 · dabae29
2 parents db99808 + 4f81435
commit dabae29
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/plugins/kubernetes/app/models/watchers/cluster_pod_watcher.rb b/plugins/kubernetes/app/models/watchers/cluster_pod_watcher.rb
@@ -59,7 +59,7 @@ def handle_error(notice)
 
     def handle_notice(notice)
       debug notice.to_s
-      return if handle_error(notice)
+      return if handle_error(notice) || !notice.object.metadata.labels
       rc_name = notice.object.metadata.labels['replication_controller']
       publish(rc_name, notice) if rc_name
     end