Skip to content
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

Jump to bottom

Fixes #37668 - enable container push by default #11084

Merged
merged 1 commit into from
Jul 19, 2024
Merged

Fixes #37668 - enable container push by default #11084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 0 additions & 10 deletions app/controllers/katello/api/registry/registry_proxies_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ def registry_authorize

def container_push_prop_validation(props = nil)
# Handle validation and repo creation for container pushes before talking to pulp
return false unless confirm_push_settings
props = parse_blob_push_props if props.nil?
return false unless check_blob_push_field_syntax(props)

Expand Down Expand Up @@ -773,15 +772,6 @@ def confirm_settings
:locals => { :message => "Registry not configured" })
end

def confirm_push_settings
return true if SETTINGS.dig(:katello, :container_image_registry, :allow_push)
render_podman_error(
"UNSUPPORTED",
_("Registry push is not enabled. To enable, add ':katello:'->':container_image_registry:'->':allow_push: true' in the katello settings file."),
:unprocessable_entity
)
end

def request_url
request.protocol + request.host_with_port
end
Expand Down
1 change: 0 additions & 1 deletion test/controllers/api/registry/registry_proxies_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ def setup_permissions
setup_permissions
setup_controller_defaults_api

SETTINGS[:katello][:container_image_registry] = {crane_url: 'https://localhost:5000', crane_ca_cert_file: '/etc/pki/katello/certs/katello-default-ca.crt', allow_push: true}
File.delete("#{Rails.root}/tmp/manifest.json") if File.exist?("#{Rails.root}/tmp/manifest.json")
end

Expand Down
Loading