Merge pull request #181 from zeari/container_events_to_pod

Make container events belong to pod
ManageIQ · Dec 21, 2017 · ba505c1 · ba505c1
2 parents 139850b + 419f802
commit ba505c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/app/models/manageiq/providers/kubernetes/container_manager/event_catcher_mixin.rb b/app/models/manageiq/providers/kubernetes/container_manager/event_catcher_mixin.rb
@@ -93,7 +93,6 @@ def extract_event_data(event)
     when 'Pod'
       /^spec.containers{(?<container_name>.*)}$/ =~ event_data[:fieldpath]
       unless container_name.nil?
-        event_type_prefix = "CONTAINER"
         event_data[:container_name] = container_name
       end
       event_data[:container_group_name] = event_data[:name]

diff --git a/spec/models/manageiq/providers/kubernetes/container_manager/event_catcher_mixin_spec.rb b/spec/models/manageiq/providers/kubernetes/container_manager/event_catcher_mixin_spec.rb
@@ -63,7 +63,7 @@ def initialize(ems = nil)
         }
       end
 
-      it 'extracts CONTAINER_KILLING data' do
+      it 'extracts POD_KILLING data' do
         expected_data = {
           :timestamp            => '2016-07-21T20:01:56Z',
           :kind                 => 'Pod',
@@ -77,7 +77,7 @@ def initialize(ems = nil)
           :container_name       => 'heapster',
           :container_group_name => 'heapster-aas69',
           :container_namespace  => 'openshift-infra',
-          :event_type           => 'CONTAINER_KILLING'
+          :event_type           => 'POD_KILLING'
         }
         event = array_recursive_ostruct(:object => kubernetes_event)
         expect(test_class.new.extract_event_data(event)).to eq(expected_data)