foreman_kernel_care 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f86d4ec92298514c54e1e1969fa5a2fb7cd7c03ab73231d86254cc3bc7fef433
-  data.tar.gz: bf641ebb676ef91fffb9a0fabb9def7321352dd721483404b0a85b27a8c76e01
+  metadata.gz: 947deca95e8a08c814f7b99190ac2a6c8b06fcf7c4f2ed6a66d29085e92b7d74
+  data.tar.gz: 80bc80494c32c62476008e06a64ec1d6a5c0772fa4dd32fe9a9769347e714d96
 SHA512:
-  metadata.gz: ba271df050549eacca5d79ed6383e7b5a7e822dc9940d06a3ca238c5224c4746e621c3d455806513c8e5d00470e31692f4fa5129523b30344ff8c257bff208ce
-  data.tar.gz: 861ca0eba4d135a8ad5643175cee8cfba7b5043691c6eaaaf7dad811b484fd252d027098a73474b94c48e6424cc1b46c6fa0e1e3a59dcb56fc7140a5825183f9
+  metadata.gz: 2e6574273325790a40827dbbe2af947e5c44536969d02590fffe54a547d5446f84fff5476cf605de7cca6b728b0b5237b3f60b44f76fc74472cce91efdea02a8
+  data.tar.gz: 00607be4c09856522537fafa43584018245e864f8db18b5e521d6b8fe1d31ba6f12c78cdaacb7c7bf7ab089dff11d02d4cad2e2052449f0afd1f91e4b079c4c9

data/app/controllers/concerns/foreman_kernel_care/foreman_tasks.rb

@@ -12,7 +12,9 @@ module ForemanKernelCare
         complete_output = ''
         result = payload[:data].to_unsafe_h['result']
         result.each { |x| complete_output += x['output'] }
-        kcare, kernel = complete_output.split(/\n/).values_at(1, 3)
+        kernel, kcare = complete_output.split(/\n/)
+        kernel = kernel.gsub('Installed kernel version: ', '')
+        kcare = kcare.gsub('Patched kernel version: ', '')
         version, release = kcare.strip.split('-')
         next if version.empty? || release.empty?
         job_invocation = ::JobInvocation.where(:task_id => foreman_task.parent_task_id).first

data/app/models/concerns/foreman_kernel_care/host_managed_extensions.rb

@@ -48,8 +48,13 @@ module ForemanKernelCare
       end
     end
 
+    def kernelcare?
+      !installed_packages.select { |package| package.name == 'kernelcare' }.empty? ||
+        !installed_debs.select { |package| package.name == 'kernelcare' }.empty?
+    end
+
     class ::Host::Managed::Jail < Safemode::Jail
-      allow :installed_debs
+      allow :installed_debs, :kernelcare?
     end
 
     protected
@@ -81,7 +86,7 @@ module ForemanKernelCare
 
     def create_new_yum_kernel_packages(packages, version, release)
       new_kernels = packages.map do |p|
-        ::Katello::Pulp::SimplePackage.new({
+        ::Katello::SimplePackage.new({
           arch: p.arch,
           epoch: p.epoch,
           version: version,
@@ -138,10 +143,5 @@ module ForemanKernelCare
       self.installed_deb_ids = new_installed_debs.concat(new_patched_kernel_ids)
       save!
     end
-
-    def kernelcare?
-      !installed_packages.select { |package| package.name == 'kernelcare' }.empty? ||
-        !installed_debs.select { |package| package.name == 'kernelcare' }.empty?
-    end
   end
 end

data/app/services/concerns/foreman_kernel_care/profiles_uploader.rb

@@ -0,0 +1,15 @@
+module ForemanKernelCare
+  module ProfilesUploader
+    extend ActiveSupport::Concern
+
+    def import_deb_package_profile(profile)
+      if @host.kernelcare?
+        composer = ::JobInvocationComposer.for_feature(:kernel_version, @host)
+        composer.triggering.mode = :future
+        composer.trigger!
+      end
+
+      super(profile)
+    end
+  end
+end

data/app/views/foreman_kernel_care/job_templates/kernel_version.erb

@@ -9,7 +9,7 @@ feature: kernel_version
 %>
 <%
   unless @host.installed_packages.map{ |package| package.name }.include?('kernelcare') || @host.installed_debs.map{ |package| package.name }.include?('kernelcare')
-    render_error(N_('Unsupported host.'))
+    render_error(N_('The "kernelcare" package is not installed on your managed host which is required by this job template.'))
   end
 %>
 

data/app/views/foreman_kernel_care/job_templates/update_kernel.erb

@@ -10,7 +10,7 @@ feature: update_kernel
 
 <%
   unless @host.installed_packages.map{ |package| package.name }.include?('kernelcare') || @host.installed_debs.map{ |package| package.name }.include?('kernelcare')
-    render_error(N_('Unsupported host.'))
+    render_error(N_('The "kernelcare" package is not installed on your managed host which is required by this job template.'))
   end
 %>
 

data/app/views/foreman_kernel_care/job_templates/view_newest_patch.erb

@@ -3,12 +3,12 @@ kind: job_template
 name: LivePatching - View newest Patch
 model: JobTemplate
 job_category: LivePatching - Script Default
-description_format: "Get patched kernel version"
+description_format: "View available patches"
 provider_type: script
 %>
 <%
   unless @host.installed_packages.map{ |package| package.name }.include?('kernelcare') || @host.installed_debs.map{ |package| package.name }.include?('kernelcare')
-    render_error(N_('Unsupported host.'))
+    render_error(N_('The "kernelcare" package is not installed on your managed host which is required by this job template.'))
   end
 %>
 

data/lib/foreman_kernel_care/engine.rb

@@ -8,6 +8,7 @@ module ForemanKernelCare
     engine_name 'foreman_kernel_care'
 
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
+    config.autoload_paths += Dir["#{config.root}/app/services/concerns"]
 
     initializer 'foreman_kernel_care.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_kernel_care do
@@ -19,6 +20,7 @@ module ForemanKernelCare
     # make sure the plugin is initialized before katello loads the host extensions
     initializer 'foreman_kernel_care.load_kernelcare_override', :before => :finisher_hook, :after => ['katello.register_plugin', 'foreman_tasks.register_plugin'] do
       ::Katello::Concerns::HostManagedExtensions.prepend ForemanKernelCare::HostManagedExtensions
+      ::Katello::Host::ProfilesUploader.prepend ForemanKernelCare::ProfilesUploader
       ::ForemanTasks::Api::TasksController.prepend ForemanKernelCare::ForemanTasks
     end
 

data/lib/foreman_kernel_care/version.rb

@@ -1,3 +1,3 @@
 module ForemanKernelCare
-  VERSION = '1.2.0'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/test/factories/foreman_kernel_care_factories.rb

@@ -19,7 +19,7 @@ FactoryBot.modify do
           :epoch => '1',
           :nvra => 'kernelcare-2.54-1.el7.x86_64'
         }
-        host.import_package_profile([::Katello::Pulp::SimplePackage.new(package_json)])
+        host.import_package_profile([::Katello::SimplePackage.new(package_json)])
       end
     end
   end

data/test/unit/host_managed_extensions_test.rb

@@ -18,7 +18,7 @@ module ForemanKernelCare
       package_json = { :name => 'kernel', :version => '1',
                        :release => '1.el7', :arch => 'x86_64', :epoch => '1',
                        :nvra => 'kernel-1-1.el7.x86_64' }
-      host.import_package_profile([::Katello::Pulp::SimplePackage.new(package_json)])
+      host.import_package_profile([::Katello::SimplePackage.new(package_json)])
       nvra = 'kernel-1-1.el7.x86_64'
       host.reload
       version = '2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_kernel_care
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Maxim Petukhov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-28 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 4.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +99,7 @@ files:
 - Rakefile
 - app/controllers/concerns/foreman_kernel_care/foreman_tasks.rb
 - app/models/concerns/foreman_kernel_care/host_managed_extensions.rb
+- app/services/concerns/foreman_kernel_care/profiles_uploader.rb
 - app/views/foreman_kernel_care/job_templates/install_kernelcare.erb
 - app/views/foreman_kernel_care/job_templates/kernel_version.erb
 - app/views/foreman_kernel_care/job_templates/update_kernel.erb
@@ -132,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Plugin for KernelCare