katello 4.17.0.rc2 → 4.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2afedac5306ba09124189f94d28c8d814149fb18cd44924ea1c04e6d07c3026a
-  data.tar.gz: 0fd120dcf0ac4cee8c6b004cfe5c3e6dca48f1be36dd9125b4e85d75096b3952
+  metadata.gz: c680d70aff055930ae2682d03f339d169d0e8925bd750b3589814aa575b38ae6
+  data.tar.gz: 9bc9ea09232f58f7a34fee366d45d0769bfbe8678833e63f3c533e001b23c20d
 SHA512:
-  metadata.gz: d5e07a1200cbd4053f0b18470b26179f27f47cf9aa15578a2b9481a3b16783a8d5a8385926fa5ee0c9c16b66d72f2c669fe8e8dd4c9f733b5979ca7393936537
-  data.tar.gz: df56f994d4e8830c4f8aee4fd22e3f9614e098402ac0891db2cbfa615d9117d315a2ffc45d452422252b1b4563481ee2b8717e99f8252ccc2fc28c1819b81b03
+  metadata.gz: d866d7231780c82c6f437d23367cfd72292db1ba8ed5e4bfb32c9f323b8454be3f06833cb15823f9147afdff35f828d1d07363f83a9f0b2421e6f74de9f49f40
+  data.tar.gz: 328ff0812895e6201f486b5ae01459b1710dbf6532a6ac1c5164c5263a8a3843d24d1fa9301471498c623e4edcbaabd16d955ba06985af02a0a1de4918145b6e

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/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/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.17.0.rc2".freeze
+  VERSION = "4.17.0".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.0
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-02 00:00:00.000000000 Z
+date: 2025-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -5544,11 +5544,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