Skip to content

Drop Pulp 2 Smart Proxy status code #10721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ekohl wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Drop Pulp 2 Smart Proxy status code #10721

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fb8f15
Fixes #37388 - Drop Pulp 2 related code
ekohl Jul 18, 2024
dab107b
Refs #37388 - remove use of find_resource that broke callback chain
ianballou Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/katello/concerns/smart_proxies_controller_extensions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ def action_permission
helper 'bastion/layout'

append_view_path('app/views/foreman')
before_action :find_resource, :only => [:pulp_storage]

def pulp_storage
find_resource
@storage = @smart_proxy.pulp_disk_usage
respond_to do |format|
format.html { render :layout => false }
Expand Down
5 changes: 4 additions & 1 deletion app/models/katello/concerns/smart_proxy_extensions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'proxy_api'
require 'proxy_api/container_gateway'

module Katello
Expand Down Expand Up @@ -91,6 +90,10 @@ def self.pulp_primary!
pulp_primary || fail(_("Could not find a smart proxy with pulp feature."))
end

def self.default_capsule
Copy link
Member Author

@ekohl ekohl Aug 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is this used?

Copy link
Member

@ianballou ianballou Aug 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Funny enough, the foreman_rh_cloud plugin uses it. It should switch to using pulp_primary ideally.

pulp_primary
end

def self.with_environment(environment)
pulpcore_proxies_with_environment(environment).try(:uniq)
end
Expand Down
Loading