Fixes #35783 - Remove old Pulp 2 docker port setting (#10366)

* Fixes #35783 - Remove old Pulp 2 docker port setting * Refs #35783 - delete docker pulp 2 repository service class
Katello · Dec 6, 2022 · b31ae26 · b31ae26
1 parent a06d647
commit b31ae26
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 89 deletions.
diff --git a/app/services/katello/pulp/repository/docker.rb b/app/services/katello/pulp/repository/docker.rb
diff --git a/db/migrate/20221123212341_remove_pulp_docker_registry_port_setting.rb b/db/migrate/20221123212341_remove_pulp_docker_registry_port_setting.rb
@@ -0,0 +1,5 @@
+class RemovePulpDockerRegistryPortSetting < ActiveRecord::Migration[6.1]
+  def change
+    Setting.where(name: 'pulp_docker_registry_port').destroy_all
+  end
+end
diff --git a/lib/katello/plugin.rb b/lib/katello/plugin.rb
@@ -522,12 +522,6 @@ def katello_template_setting_values(name)
         description: N_("Default download policy for Smart Proxy syncs (either 'inherit', immediate', or 'on_demand')"),
         collection: proxy_download_policies
 
-      setting 'pulp_docker_registry_port',
-        type: :integer,
-        default: 5000,
-        full_name: N_('Pulp Docker registry port'),
-        description: N_("The port used by Pulp Crane to provide Docker Registries")
-
       setting 'pulp_export_destination',
         type: :string,
         default: "/var/lib/pulp/katello-export",

diff --git a/lib/katello/repository_types/docker.rb b/lib/katello/repository_types/docker.rb
@@ -1,5 +1,4 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE) do
-  service_class Katello::Pulp::Repository::Docker
   default_managed_content_type Katello::DockerManifest::CONTENT_TYPE
   pulp3_service_class Katello::Pulp3::Repository::Docker
   pulp3_api_class Katello::Pulp3::Api::Docker