katello 4.17.0 → 4.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c680d70aff055930ae2682d03f339d169d0e8925bd750b3589814aa575b38ae6
-  data.tar.gz: 9bc9ea09232f58f7a34fee366d45d0769bfbe8678833e63f3c533e001b23c20d
+  metadata.gz: 89755fa3c2987395a5af752bbf273da998d09d4f0f45029915596c04ecf60eb1
+  data.tar.gz: 18d7cebcfd3dc55158d2eaec48db546d9b6253ddd9d645c4560a4182dd68e19f
 SHA512:
-  metadata.gz: d866d7231780c82c6f437d23367cfd72292db1ba8ed5e4bfb32c9f323b8454be3f06833cb15823f9147afdff35f828d1d07363f83a9f0b2421e6f74de9f49f40
-  data.tar.gz: 328ff0812895e6201f486b5ae01459b1710dbf6532a6ac1c5164c5263a8a3843d24d1fa9301471498c623e4edcbaabd16d955ba06985af02a0a1de4918145b6e
+  metadata.gz: 9e1649be7b107364a96ddd4cd07b82b048dc50ef7046e2570ea0ca38bd5bd787360d9a072cdb77fc62fa20f20ed129f6940d9ebfbebfd50f3972c2f4bffb866d
+  data.tar.gz: cd12cfad7c854933a4a8418715b0d86bd920f0840d4acf42c314790e89ad531a21b258cf2fdad84c8808aa138f7f236d143c65d1d60bc1ca8a479536496ad7b8

data/app/controllers/katello/api/registry/registry_proxies_controller.rb

@@ -560,6 +560,8 @@ module Katello
 
     def check_blob
       pulp_response = Resources::Registry::Proxy.get(@_request.fullpath, 'Accept' => request.headers['Accept'])
+      response.headers['Content-Type'] = pulp_response.headers[:content_type] if pulp_response.headers[:content_type]
+      response.headers['Content-Length'] = pulp_response.headers[:content_length] if pulp_response.headers[:content_length]
       head pulp_response.code
     end
 

data/app/lib/actions/helpers/smart_proxy_sync_helper.rb

@@ -0,0 +1,12 @@
+module Actions
+  module Helpers
+    module SmartProxySyncHelper
+      def schedule_async_repository_proxy_sync(repository)
+        return unless Setting[:foreman_proxy_content_auto_sync]
+        if SmartProxy.unscoped.pulpcore_proxies_with_environment(repository.environment).exists?
+          ForemanTasks.async_task(::Actions::Katello::Repository::CapsuleSync, repository)
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/content_view/add_rolling_repo_clone.rb

@@ -2,6 +2,8 @@ module Actions
   module Katello
     module ContentView
       class AddRollingRepoClone < Actions::EntryAction
+        include Helpers::SmartProxySyncHelper
+
         def plan(content_view, repository_ids)
           library = content_view.organization.library
           clone_ids = []
@@ -27,10 +29,8 @@ module Actions
         end
 
         def run
-          if Setting[:foreman_proxy_content_auto_sync]
-            ::Katello::Repository.where(id: input[:repository_ids]).each do |repo|
-              ForemanTasks.async_task(::Actions::Katello::Repository::CapsuleSync, repo)
-            end
+          ::Katello::Repository.where(id: input[:repository_ids]).each do |repository|
+            schedule_async_repository_proxy_sync(repository)
           end
         end
       end

data/app/lib/actions/katello/content_view/remove_rolling_repo_clone.rb

@@ -20,7 +20,15 @@ module Actions
         end
 
         def run
-          ::Katello::Repository.where(id: input[:repository_ids]).destroy_all
+          ::Katello::Repository.where(id: input[:repository_ids]).each do |repository|
+            SmartProxy.unscoped.with_repo(repository).each do |smart_proxy|
+              next if smart_proxy.pulp_primary?
+
+              smart_proxy.content_counts&.dig("content_view_versions", repository.content_view_version_id.to_s, "repositories")&.delete(repository.id.to_s)
+              smart_proxy.save
+            end
+            repository.destroy!
+          end
         end
       end
     end

data/app/lib/actions/katello/repository/destroy.rb

@@ -88,13 +88,17 @@ module Actions
         def handle_custom_content(repository, remove_from_content_view_versions)
           #if this is the last instance of a custom repo or a deb repo using structured APT, destroy the content
           if remove_from_content_view_versions || repository.root.repositories.where.not(id: repository.id).empty? || repository.deb_using_structured_apt?
+            # Never destroy content for structured apt rolling repo clones, because it belongs to the library instance
+            return if repository.deb_using_structured_apt? && repository.content_view.rolling?
+
             plan_action(::Actions::Katello::Product::ContentDestroy, repository)
           end
         end
 
         def handle_redhat_content(repository)
-          if repository.content_view.content_view_environment(repository.environment)
-            plan_action(Candlepin::Environment::SetContent, repository.content_view, repository.environment, repository.content_view.content_view_environment(repository.environment))
+          content_view_environment = repository.content_view.content_view_environment(repository.environment)
+          if content_view_environment && !repository.content_view.rolling?
+            plan_action(Candlepin::Environment::SetContent, repository.content_view, repository.environment, content_view_environment)
           end
         end
 

data/app/lib/actions/katello/repository/import_upload.rb

@@ -4,6 +4,7 @@ module Actions
     module Repository
       class ImportUpload < Actions::EntryAction
         include Helpers::RollingCVRepos
+        include Helpers::SmartProxySyncHelper
 
         # rubocop:disable Metrics/MethodLength
         def plan(repository, uploads, options = {})
@@ -63,9 +64,7 @@ module Actions
 
         def run
           repository = ::Katello::Repository.find(input[:repository_id])
-          if input[:sync_capsule] && (Setting[:foreman_proxy_content_auto_sync])
-            ForemanTasks.async_task(Katello::Repository::CapsuleSync, repository)
-          end
+          schedule_async_repository_proxy_sync(repository) if input[:sync_capsule]
           output[:upload_results] = results_to_json(input[:upload_results])
         rescue ::Katello::Errors::CapsuleCannotBeReached # skip any capsules that cannot be connected to
         end

data/app/lib/actions/katello/repository/sync.rb

@@ -6,6 +6,7 @@ module Actions
         extend ApipieDSL::Class
         include Helpers::Presenter
         include Helpers::RollingCVRepos
+        include Helpers::SmartProxySyncHelper
         include ::Actions::ObservableAction
         middleware.use Actions::Middleware::ExecuteIfContentsChanged
 
@@ -72,7 +73,7 @@ module Actions
             update_rolling_content_views_async(repo, input[:contents_changed])
           end
           repo.clear_smart_proxy_sync_histories if input[:contents_changed]
-          ForemanTasks.async_task(Repository::CapsuleSync, repo) if Setting[:foreman_proxy_content_auto_sync]
+          schedule_async_repository_proxy_sync(repo)
         rescue ::Katello::Errors::CapsuleCannotBeReached # skip any capsules that cannot be connected to
         end
 

data/app/lib/actions/katello/repository/upload_files.rb

@@ -7,6 +7,7 @@ module Actions
     module Repository
       class UploadFiles < Actions::EntryAction
         include Helpers::RollingCVRepos
+        include Helpers::SmartProxySyncHelper
 
         def plan(repository, files, content_type = nil, options = {})
           action_subject(repository)
@@ -52,7 +53,7 @@ module Actions
 
         def run
           repository = ::Katello::Repository.find(input[:repository][:id])
-          ForemanTasks.async_task(Repository::CapsuleSync, repository) if Setting[:foreman_proxy_content_auto_sync]
+          schedule_async_repository_proxy_sync(repository)
         rescue ::Katello::Errors::CapsuleCannotBeReached # skip any capsules that cannot be connected to
         end
 

data/app/models/katello/deb.rb

@@ -4,8 +4,6 @@ module Katello
 
     CONTENT_TYPE = 'deb'.freeze
 
-    has_many :repository_debs, :class_name => "Katello::RepositoryDeb", :dependent => :destroy, :inverse_of => :deb
-    has_many :repositories, :through => :repository_debs, :class_name => "Katello::Repository"
     has_many :content_facet_applicable_debs, :class_name => "Katello::ContentFacetApplicableDeb",
              :dependent => :destroy, :inverse_of => :deb
     has_many :content_facets, :through => :content_facet_applicable_debs, :class_name => "Katello::Host::ContentFacet"

data/app/views/foreman/job_templates/install_packages_by_search_query_-_katello_ansible_default.erb

@@ -19,23 +19,15 @@ template_inputs:
 - hosts: all
   tasks:
 <%= indent(4) { snippet('check_bootc_status') } %>
-    - name: Enable bootc overlay
-      shell:
-        cmd: 'bootc usr-overlay'
-      register: out
-      ignore_errors: true
-      when: is_bootc_host
-    - debug: var=out
-    - name: Install packages via dnf for image mode machines
-      package:
-        use: 'dnf'
 <% if package_names.empty? -%>
-        name: []
+    - name: Install all packages transiently for image mode machines
+      shell: "dnf --transient install -y '*'"
+      when: is_bootc_host
 <% else -%>
-        name: <%= indent(10) { to_yaml(package_names).gsub(/---/, "") } -%>
-        state: present
-<% end -%>
+    - name: Install packages transiently for image mode machines
+      shell: "dnf --transient install -y <%= package_names.join(' ') %>"
       when: is_bootc_host
+<% end -%>
     - name: Install packages normally
       package:
 <% if package_names.empty? -%>

data/app/views/foreman/job_templates/remove_packages_by_search_query_-_katello_ansible_default.erb

@@ -19,21 +19,8 @@ template_inputs:
 - hosts: all
   tasks:
 <%= indent(4) { snippet('check_bootc_status') } %>
-    - name: Enable bootc overlay
-      shell:
-        cmd: 'bootc usr-overlay'
-      register: out
-      ignore_errors: true
-      when: is_bootc_host
-    - debug: var=out
-    - name: Remove packages via dnf for image mode machines
-      package:
-        name:
-<% package_names.each do |package_name| -%>
-          - <%= package_name %>
-<% end -%>
-        state: absent
-        use: 'dnf'
+    - name: Remove packages transiently for image mode machines
+      shell: "dnf --transient remove -y <%= package_names.join(' ') %>"
       when: is_bootc_host
     - name: Remove packages normally
       package:

data/app/views/foreman/job_templates/update_packages_by_search_query_-_katello_ansible_default.erb

@@ -28,20 +28,12 @@ template_inputs:
 - hosts: all
   tasks:
 <%= indent(4) { snippet('check_bootc_status') } %>
-    - name: Enable bootc overlay
-      shell:
-        cmd: 'bootc usr-overlay'
-      register: out
-      ignore_errors: true
+    - name: Update packages transiently for image mode machines
+      shell: |
+        dnf --transient install -y <%= package_names.join(' ') %>
+        dnf --transient upgrade -y --best <%= package_names.join(' ') %>
       when: is_bootc_host
-    - debug: var=out
-    - name: Install packages via dnf for image mode machines
-      package:
-        name: <%= indent(10) { to_yaml(package_names).gsub(/---/, "") } -%>
-        state: latest
-        use: 'dnf'
-      when: is_bootc_host
-    - name: Install packages normally
+    - name: Update packages normally
       package:
         name: <%= indent(10) { to_yaml(package_names).gsub(/---/, "") } -%>
         state: latest

data/db/migrate/20240924161240_katello_recreate_evr_constructs.rb

@@ -1,5 +1,23 @@
 class KatelloRecreateEvrConstructs < ActiveRecord::Migration[6.1]
+  def fix_installed_package_dupes
+    # Remove duplicate installed packages and host installed packages.
+    duplicated_nvreas = ::Katello::InstalledPackage.group(:nvrea).having('count(*) > 1').pluck(:nvrea)
+    duplicated_nvreas.each do |nvrea|
+      packages_relation = ::Katello::InstalledPackage.where(nvrea: nvrea).order(:id)
+      original_package = packages_relation.first
+      duplicate_package_ids = packages_relation.offset(1).pluck(:id)
+      hosts_with_original_package = ::Katello::HostInstalledPackage.where(installed_package_id: original_package.id).pluck(:host_id)
+      if hosts_with_original_package.any?
+        ::Katello::HostInstalledPackage.where(host_id: hosts_with_original_package, installed_package_id: duplicate_package_ids).delete_all
+      end
+      ::Katello::HostInstalledPackage.where(installed_package_id: duplicate_package_ids).update_all(installed_package_id: original_package.id)
+      ::Katello::InstalledPackage.where(id: duplicate_package_ids).delete_all
+    end
+  end
+
   def up
+    fix_installed_package_dupes
+
     if !extension_enabled?('evr')
       return
     else
@@ -147,6 +165,8 @@ class KatelloRecreateEvrConstructs < ActiveRecord::Migration[6.1]
                                                          rpmver_array(coalesce(release,'empty'))::evr_array_item[])::evr_t);
       SQL
 
+      add_index :katello_rpms, [:name, :arch, :evr]
+
       create_trigger :evr_insert_trigger_katello_rpms, on: :katello_rpms
       create_trigger :evr_update_trigger_katello_rpms, on: :katello_rpms
       create_trigger :evr_insert_trigger_katello_installed_packages, on: :katello_installed_packages

data/db/migrate/20250714190050_add_missing_rpms_evr_index.rb

@@ -0,0 +1,14 @@
+class AddMissingRpmsEvrIndex < ActiveRecord::Migration[7.0]
+  def up
+    # Re-add the katello_rpms EVR index dropped erroneously by 20240924161240.
+    unless index_exists?(:katello_rpms, [:name, :arch, :evr])
+      add_index :katello_rpms, [:name, :arch, :evr]
+    end
+  end
+
+  def down
+    if index_exists?(:katello_rpms, [:name, :arch, :evr])
+      remove_index :katello_rpms, [:name, :arch, :evr]
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.17.0".freeze
+  VERSION = "4.17.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.17.0
+  version: 4.17.2
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-10 00:00:00.000000000 Z
+date: 2025-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,6 +87,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '9.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 11.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,6 +97,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '9.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 11.0.1
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +107,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 16.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -108,6 +117,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 16.2.0
 - !ruby/object:Gem::Dependency
   name: dynflow
   requirement: !ruby/object:Gem::Requirement
@@ -800,6 +812,7 @@ files:
 - app/lib/actions/helpers/output_propagator.rb
 - app/lib/actions/helpers/presenter.rb
 - app/lib/actions/helpers/rolling_cv_repos.rb
+- app/lib/actions/helpers/smart_proxy_sync_helper.rb
 - app/lib/actions/helpers/smart_proxy_sync_history_helper.rb
 - app/lib/actions/katello/activation_key/create.rb
 - app/lib/actions/katello/activation_key/destroy.rb
@@ -2160,6 +2173,7 @@ files:
 - db/migrate/20250215143303_drop_katello_yum_metadata_file.rb
 - db/migrate/20250409120843_fix_file_download_policy.rb
 - db/migrate/20250410155300_change_ansible_templates_category.rb
+- db/migrate/20250714190050_add_missing_rpms_evr_index.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -5548,7 +5562,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman