katello 4.17.0.rc2 → 4.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2afedac5306ba09124189f94d28c8d814149fb18cd44924ea1c04e6d07c3026a
-  data.tar.gz: 0fd120dcf0ac4cee8c6b004cfe5c3e6dca48f1be36dd9125b4e85d75096b3952
+  metadata.gz: 522d23e5be01ddc111e940e111a09d858a2dfa686c9cbb17ac0c883b14f224bc
+  data.tar.gz: 6f6dc2887f0eafdd0500edeb62792318da9bd25612565fcef2027423b364d2c5
 SHA512:
-  metadata.gz: d5e07a1200cbd4053f0b18470b26179f27f47cf9aa15578a2b9481a3b16783a8d5a8385926fa5ee0c9c16b66d72f2c669fe8e8dd4c9f733b5979ca7393936537
-  data.tar.gz: df56f994d4e8830c4f8aee4fd22e3f9614e098402ac0891db2cbfa615d9117d315a2ffc45d452422252b1b4563481ee2b8717e99f8252ccc2fc28c1819b81b03
+  metadata.gz: 597e47e1205993f0223f0151f24accea76c030eb0a98536f9b9e05cb1d1f49341c69543bf79a4781b700fa948f6df53769dbaa44d6c54399f504362bd1729b68
+  data.tar.gz: 263fe1e31f8469f6a7ea74c932c1fa8bab9769200d72aca0f3a94c47d5772a4a5c8c10661ea1abe0bebdcc53b416584fa17a98c1c12e1a94e8519eab4fbf93b9

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/controllers/katello/api/v2/content_view_repositories_controller.rb

@@ -25,6 +25,11 @@ module Katello
       SQL
 
       query = Katello::Repository.readable.in_default_view.in_organization(@organization)
+      if @content_view.rolling
+        # Exclude container push repositories
+        query = query.joins(:root).where(katello_root_repositories: { is_container_push: false })
+      end
+
       query = query.with_type(params[:content_type]) if params[:content_type]
       # Use custom sort to perform the join and order since we need to order by specific content_view
       # and the ORDER BY query needs access to the katello_content_view_repositories table

data/app/controllers/katello/api/v2/repositories_controller.rb

@@ -719,6 +719,7 @@ Alternatively, use the 'force' parameter to regenerate metadata locally. On the
       if is_available_for
         params[:library] = true
         sub_query = ContentViewRepository.where(:content_view_id => content_view_id).pluck(:repository_id)
+        sub_query += Repository.where(root: RootRepository.where(is_container_push: true)).pluck(:id) if ContentView.find(content_view_id).rolling
         query = query.where("#{Repository.table_name}.id not in (#{sub_query.join(',')})") unless sub_query.empty?
       elsif environment_id
         version = ContentViewVersion.in_environment(environment_id).where(:content_view_id => content_view_id)

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

@@ -6,6 +6,11 @@ module Actions
           content_view.save!
           if content_view.rolling?
             plan_action(AddToEnvironment, content_view.create_new_version, content_view.organization.library)
+            repository_ids = content_view.repository_ids
+            if repository_ids.any?
+              content_view.reload
+              plan_action(AddRollingRepoClone, content_view, repository_ids)
+            end
           end
         end
 

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

@@ -88,6 +88,9 @@ 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

data/app/models/katello/content_view_repository.rb

@@ -18,6 +18,7 @@ module Katello
     validates_lengths_from_database
     validates :repository_id, :uniqueness => {:scope => :content_view_id, :message => N_("already belongs to the content view") }
     validate :content_view_composite
+    validate :content_view_rolling
     validate :ensure_repository_type
     validate :check_repo_membership
 
@@ -29,6 +30,12 @@ module Katello
       end
     end
 
+    def content_view_rolling
+      if content_view.rolling? && repository.root.is_container_push?
+        errors.add(:base, _("Cannot add container push repositories to a rolling content view"))
+      end
+    end
+
     def ensure_repository_type
       unless allowed_repository_types.include?(repository.content_type)
         errors.add(:base, _("Cannot add %s repositories to a content view.") % repository.content_type)

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.rc2".freeze
+  VERSION = "4.17.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.17.0.rc2
+  version: 4.17.1
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-02 00:00:00.000000000 Z
+date: 2025-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2160,6 +2160,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
@@ -5544,11 +5545,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman