katello 4.17.0 → 4.18.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/zh_TW.po

@@ -1233,6 +1233,7 @@ msgstr ""
 msgid "Complete Sync"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
 #: app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories.html
 msgid "Completed {{ repository.last_sync_words }} ago"
 msgstr ""
@@ -3292,6 +3293,11 @@ msgid "Please make sure a Content View is selected."
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/activation-keys/new/views/activation-key-new.html
+msgid ""
+"Please select a lifecycle environment. Lifecycle environment and content "
+"view must be provided together."
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-environment-modal.html
 msgid "Please select an environment."
 msgstr "請選擇一個環境。"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js

@@ -65,9 +65,12 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
             };
 
             $scope.repository = new Repository({'product_id': $scope.$stateParams.productId, unprotected: true,
-                'checksum_type': null, 'verify_ssl_on_sync': true,
-                'download_policy': BastionConfig.defaultDownloadPolicy, 'arch': null,
-                'mirroring_policy': MirroringPolicy.defaultMirroringPolicy, 'include_tags': '', 'exclude_tags': '*-source'});
+                'checksum_type': null,
+                'verify_ssl_on_sync': true,
+                'download_policy': BastionConfig.defaultDownloadPolicy,
+                'arch': null,
+                'mirroring_policy': null,
+                'include_tags': '', 'exclude_tags': '*-source'});
 
             $scope.product = Product.get({id: $scope.$stateParams.productId}, function () {
                 $scope.page.loading = false;
@@ -99,6 +102,13 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
                         option.value = "";
                     });
                 }
+                /* eslint-disable camelcase */
+                if ($scope.repository.content_type === 'yum') {
+                    $scope.repository.mirroring_policy = BastionConfig.defaultYumMirroringPolicy;
+                } else {
+                    $scope.repository.mirroring_policy = BastionConfig.defaultNonYumMirroringPolicy;
+                }
+                /* eslint-enable camelcase */
             });
 
             $scope.handleFiles = function (element) {

data/engines/bastion_katello/lib/bastion_katello/engine.rb

@@ -36,6 +36,8 @@ module BastionKatello
             'defaultDownloadPolicy' => !Foreman.in_rake? && db_migrated && Setting['default_download_policy'],
             'remoteExecutionPresent' => true,
             'hostToolingEnabled' => true,
+            'defaultYumMirroringPolicy' => !Foreman.in_rake? && db_migrated && Setting['default_yum_mirroring_policy'],
+            'defaultNonYumMirroringPolicy' => !Foreman.in_rake? && db_migrated && Setting['default_non_yum_mirroring_policy'],
           }
         end
       )

data/lib/katello/engine.rb

@@ -220,7 +220,6 @@ module Katello
 
       ::RemoteExecutionProxySelector.prepend Katello::Concerns::RemoteExecutionProxySelectorExtensions
 
-      load 'katello/repository_types.rb'
       load 'katello/scheduled_jobs.rb'
 
       Katello::EventQueue.register_event(Katello::Events::ImportPool::EVENT_TYPE, Katello::Events::ImportPool)

data/lib/katello/permission_creator.rb

@@ -250,7 +250,7 @@ module Katello
       @plugin.permission :view_products,
                          {
                            'katello/products' => [:auto_complete, :auto_complete_search],
-                           'katello/api/v2/products' => [:index, :show, :auto_complete_search],
+                           'katello/api/v2/products' => [:index, :show, :auto_complete_search, :auto_complete_name],
                            'katello/api/v2/repositories' => [:index, :show, :repository_types, :content_types, :auto_complete_search, :cancel],
                            'katello/api/v2/packages' => [:index, :thindex, :show, :auto_complete_search, :auto_complete_name, :auto_complete_arch, :compare],
                            'katello/api/v2/srpms' => [:index, :show, :auto_complete_search, :compare],

data/lib/katello/plugin.rb

@@ -1,5 +1,4 @@
 require 'katello/permission_creator'
-require 'katello/repository_types'
 # rubocop:disable Metrics/BlockLength
 
 Foreman::Plugin.register :katello do
@@ -79,6 +78,15 @@ Foreman::Plugin.register :katello do
          :engine => Katello::Engine,
          :turbolinks => false
 
+    menu :top_menu,
+         :flatpak_remotes,
+         :caption => N_('Flatpak Remotes'),
+         :url_hash => {:controller => 'katello/api/v2/flatpak_remotes',
+                       :action => 'index'},
+         :url => '/flatpak_remotes',
+         :engine => Katello::Engine,
+         :turbolinks => false
+
     divider :top_menu, :caption => N_('Lifecycle'), :parent => :content_menu
 
     menu :top_menu,
@@ -316,7 +324,7 @@ Foreman::Plugin.register :katello do
   extend_allowed_registration_vars :lifecycle_environment_id
   extend_allowed_registration_vars :force
   extend_allowed_registration_vars :ignore_subman_errors
-
+  extend_allowed_registration_vars :setup_container_registry_certs
   extend_page "smart_proxies/show" do |cx|
     cx.add_pagelet :details_content,
                    :name => _('Storage'),
@@ -358,6 +366,8 @@ Foreman::Plugin.register :katello do
         text_method: 'name_and_url',
       }]
       download_policies = proc { hashify_parameters(::Katello::RootRepository::DOWNLOAD_POLICIES) }
+      mirroring_policies = proc { hashify_parameters(::Katello::RootRepository::MIRRORING_POLICIES) }
+      non_yum_mirroring_policies = proc { hashify_parameters(::Katello::RootRepository::NON_YUM_MIRRORING_POLICIES) }
       proxy_download_policies = proc { hashify_parameters(::SmartProxy::DOWNLOAD_POLICIES) }
       export_formats = proc { hashify_parameters(::Katello::Pulp3::ContentViewVersion::Export::FORMATS) }
 
@@ -523,6 +533,20 @@ Foreman::Plugin.register :katello do
         description: N_("Default download policy for Smart Proxy syncs (either 'inherit', immediate', or 'on_demand')"),
         collection: proxy_download_policies
 
+      setting 'default_yum_mirroring_policy',
+        type: :string,
+        default: "mirror_content_only",
+        full_name: N_('Default custom yum repository mirroring policy'),
+        description: N_("Default mirroring policy for custom yum repositories (either 'mirror_content_only', 'additive' or 'mirror_complete')"),
+        collection: mirroring_policies
+
+      setting 'default_non_yum_mirroring_policy',
+        type: :string,
+        default: "mirror_content_only",
+        full_name: N_('Default custom non-yum repository mirroring policy'),
+        description: N_("Default mirroring policy for custom non-yum repositories (either 'mirror_content_only' or 'additive')"),
+        collection: non_yum_mirroring_policies
+
       setting 'validate_host_lce_content_source_coherence',
         type: :boolean,
         default: true,

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.17.0".freeze
+  VERSION = "4.18.0.rc1".freeze
 end

data/lib/katello.rb

@@ -4,7 +4,6 @@ require "apipie-rails"
 require "activerecord-import"
 require "rabl"
 require "oauth"
-require "gettext_i18n_rails"
 require "foreman-tasks"
 require "foreman_remote_execution"
 require "rest_client"

data/lib/proxy_api/container_gateway.rb

@@ -28,5 +28,29 @@ module ProxyAPI
     rescue => e
       raise ::ProxyAPI::ProxyException.new(url, e, N_("Unable to get users"))
     end
+
+    def update_hosts(args)
+      # put '/v2/update_hosts/?'
+      @url += "/update_hosts"
+      parse put(args)
+    rescue => e
+      raise ::ProxyAPI::ProxyException.new(url, e, N_("Unable to update hosts"))
+    end
+
+    def host_repository_mapping(args)
+      # put '/v2/update_host_repository_mapping/?'
+      @url += "/host_repository_mapping"
+      parse put(args)
+    rescue => e
+      raise ::ProxyAPI::ProxyException.new(url, e, N_("Unable to refresh host-repository mapping"))
+    end
+
+    def update_host_repositories(args)
+      # put '/v2/update_host_repositories/?'
+      @url += "/update_host_repositories"
+      parse put(args)
+    rescue => e
+      raise ::ProxyAPI::ProxyException.new(url, e, N_("Unable to update host-repository mapping"))
+    end
   end
 end

data/locale/bn/katello.po

@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: katello 4.17.0.pre.master\n"
+"Project-Id-Version: katello 4.18.0.pre.master\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2017-12-19 20:14+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>, 2022\n"
@@ -810,6 +810,9 @@ msgstr ""
 msgid "Application"
 msgstr ""
 
+msgid "Application name"
+msgstr ""
+
 msgid "Apply"
 msgstr ""
 
@@ -1052,6 +1055,9 @@ msgstr ""
 msgid "Below are the repository sets currently available for this content host. For Red Hat subscriptions, additional content can be made available through the {rhrp}. Changing default settings requires subscription-manager 1.10 or newer to be installed on this host."
 msgstr ""
 
+msgid "Below you can add content overrides, which change whether a repository is enabled or disabled. Change their state one by one, or use the checkboxes and select an action to perform."
+msgstr ""
+
 msgid "Beta"
 msgstr "বিটা"
 
@@ -1211,6 +1217,9 @@ msgstr ""
 msgid "Cannot add composite versions to another composite content view"
 msgstr ""
 
+msgid "Cannot add container push repositories to a rolling content view"
+msgstr ""
+
 msgid "Cannot add content view environments from a different organization"
 msgstr ""
 
@@ -1388,6 +1397,12 @@ msgstr ""
 msgid "Change host content source"
 msgstr ""
 
+msgid "Change the status of at least one repository."
+msgstr ""
+
+msgid "Changed status"
+msgstr ""
+
 msgid "Changing a host's content source will change the Smart Proxy from which the host gets its content."
 msgstr ""
 
@@ -1682,6 +1697,9 @@ msgstr ""
 msgid "Content override search parameters"
 msgstr ""
 
+msgid "Content overrides updating."
+msgstr ""
+
 msgid "Content source"
 msgstr ""
 
@@ -1865,6 +1883,9 @@ msgstr ""
 msgid "Could not find environments for promotion"
 msgstr ""
 
+msgid "Could not find product with name '%{name}' in organization id %{org_id}."
+msgstr ""
+
 msgid "Could not locate Pulp distribution."
 msgstr ""
 
@@ -1976,6 +1997,9 @@ msgstr ""
 msgid "Create Export History"
 msgstr ""
 
+msgid "Create Flatpak Remote"
+msgstr ""
+
 msgid "Create Import History"
 msgstr ""
 
@@ -2168,6 +2192,12 @@ msgstr ""
 msgid "Default and Rolling content view versions cannot be promoted"
 msgstr ""
 
+msgid "Default custom non-yum repository mirroring policy"
+msgstr ""
+
+msgid "Default custom yum repository mirroring policy"
+msgstr ""
+
 msgid "Default download policy for Smart Proxy syncs (either 'inherit', immediate', or 'on_demand')"
 msgstr ""
 
@@ -2195,6 +2225,12 @@ msgstr ""
 msgid "Default location for subscribed hosts"
 msgstr ""
 
+msgid "Default mirroring policy for custom non-yum repositories (either 'mirror_content_only' or 'additive')"
+msgstr ""
+
+msgid "Default mirroring policy for custom yum repositories (either 'mirror_content_only', 'additive' or 'mirror_complete')"
+msgstr ""
+
 msgid "Default partitioning table for new Operating Systems created from synced content"
 msgstr ""
 
@@ -2249,6 +2285,9 @@ msgstr "মুছে ফেলুন"
 msgid "Delete Activation Key"
 msgstr ""
 
+msgid "Delete Flatpak remote?"
+msgstr ""
+
 msgid "Delete Host upon unregister"
 msgstr ""
 
@@ -2492,12 +2531,18 @@ msgstr ""
 msgid "Duration"
 msgstr "অবকাল"
 
+msgid "During incremental update, the previous content view version '%s' could not be found."
+msgstr ""
+
 msgid "ERRATA ADVISORY"
 msgstr ""
 
 msgid "Edit"
 msgstr ""
 
+msgid "Edit Flatpak Remote"
+msgstr ""
+
 msgid "Edit RPM rule"
 msgstr ""
 
@@ -2957,15 +3002,33 @@ msgstr ""
 msgid "Finished"
 msgstr ""
 
+msgid "Flatpak Remote ${name} created"
+msgstr ""
+
+msgid "Flatpak Remote Details"
+msgstr ""
+
 msgid "Flatpak Remotes"
 msgstr ""
 
+msgid "Flatpak remote could not be deleted: "
+msgstr ""
+
+msgid "Flatpak remote deleted"
+msgstr ""
+
 msgid "Flatpak remote numeric identifier"
 msgstr ""
 
 msgid "Flatpak remote repository numeric identifier"
 msgstr ""
 
+msgid "Flatpak remote scan could not be started: "
+msgstr ""
+
+msgid "Flatpak remote updated"
+msgstr ""
+
 msgid "Force"
 msgstr ""
 
@@ -3265,6 +3328,9 @@ msgstr ""
 msgid "How to order the sorted results (e.g. ASC for ascending)"
 msgstr ""
 
+msgid "ID"
+msgstr ""
+
 msgid "ID of a HTTP Proxy"
 msgstr ""
 
@@ -3993,6 +4059,9 @@ msgstr ""
 msgid "Last checkin"
 msgstr ""
 
+msgid "Last mirrored"
+msgstr ""
+
 msgid "Last published"
 msgstr ""
 
@@ -4407,6 +4476,9 @@ msgstr ""
 msgid "Manage packages"
 msgstr ""
 
+msgid "Manage repository sets"
+msgstr ""
+
 msgid "Manifest"
 msgstr ""
 
@@ -4511,12 +4583,21 @@ msgstr ""
 msgid "Minimum version"
 msgstr ""
 
+msgid "Mirror"
+msgstr ""
+
 msgid "Mirror Remote Repository"
 msgstr ""
 
+msgid "Mirror Repository"
+msgstr ""
+
 msgid "Mirror a flatpak remote repository"
 msgstr ""
 
+msgid "Mirroring will import the remote flatpak repository"
+msgstr ""
+
 msgid "Missing activation key!"
 msgstr ""
 
@@ -4559,9 +4640,18 @@ msgstr ""
 msgid "Multi-entitlement"
 msgstr ""
 
+msgid "Multi-environment activation key(s) affected"
+msgstr ""
+
+msgid "Multi-environment host(s) affected"
+msgstr ""
+
 msgid "Must be Ascii alphanumeric, '_' or '-'"
 msgstr ""
 
+msgid "Must be a vaild URL"
+msgstr ""
+
 msgid "N/A"
 msgstr ""
 
@@ -4625,6 +4715,9 @@ msgstr ""
 msgid "Name of the host"
 msgstr ""
 
+msgid "Name of the product to mirror the remote repository to"
+msgstr ""
+
 msgid "Name of the repository"
 msgstr ""
 
@@ -4733,6 +4826,9 @@ msgstr ""
 msgid "No available repository or filter updates"
 msgstr ""
 
+msgid "No change"
+msgstr ""
+
 msgid "No content"
 msgstr ""
 
@@ -5159,6 +5255,9 @@ msgstr ""
 msgid "Organization ID is required"
 msgstr ""
 
+msgid "Organization ID or title"
+msgstr ""
+
 msgid "Organization Information not provided."
 msgstr ""
 
@@ -5456,6 +5555,9 @@ msgstr "অনুমতি প্রত্যাখ্যান করা হয়
 msgid "Physical"
 msgstr ""
 
+msgid "Place symlinks to entitlement certificates on the host, enabling container/flatpak registry access without a username or password."
+msgstr ""
+
 msgid "Plan numeric identifier"
 msgstr ""
 
@@ -5504,9 +5606,6 @@ msgstr ""
 msgid "Policy to set for mirroring content.  Must be one of %s."
 msgstr ""
 
-msgid "Possible values: %s"
-msgstr ""
-
 msgid "Prefer registered through Smart Proxy for remote execution"
 msgstr ""
 
@@ -6415,6 +6514,9 @@ msgstr ""
 msgid "Review and optionally exclude hosts from your selection. Note that package actions on any image mode hosts will be transient and lost on the next reboot."
 msgstr ""
 
+msgid "Review and then click 'Set content overrides.' Status will be changed for the selected repository sets on the selected hosts."
+msgstr ""
+
 msgid "Review and then click {submitBtnText}."
 msgstr ""
 
@@ -6499,6 +6601,9 @@ msgstr ""
 msgid "Saving alternate content source..."
 msgstr ""
 
+msgid "Scan"
+msgstr ""
+
 msgid "Scan a flatpak remote"
 msgstr ""
 
@@ -6598,6 +6703,9 @@ msgstr ""
 msgid "Select a lifecycle environment from the available promotion paths to promote new version."
 msgstr ""
 
+msgid "Select a product to mirror the repository into"
+msgstr ""
+
 msgid "Select a provider to install katello-host-tools-tracer"
 msgstr ""
 
@@ -6691,6 +6799,9 @@ msgstr ""
 msgid "Select products to associate to this source."
 msgstr ""
 
+msgid "Select repository sets"
+msgstr ""
+
 msgid "Select row"
 msgstr ""
 
@@ -6739,6 +6850,9 @@ msgstr ""
 msgid "Service level to be used for autoheal"
 msgstr ""
 
+msgid "Set content overrides"
+msgstr ""
+
 msgid "Set content overrides for the host"
 msgstr ""
 
@@ -6754,6 +6868,9 @@ msgstr ""
 msgid "Set true to remove an override and reset it to 'default'"
 msgstr ""
 
+msgid "Set up container registry certs"
+msgstr ""
+
 msgid "Sets the system purpose usage"
 msgstr ""
 
@@ -7703,6 +7820,9 @@ msgstr ""
 msgid "This Content View must be set to Import-only before performing an import"
 msgstr ""
 
+msgid "This Flatpak remote will be deleted. Repositories mirrored from this remote will remain available and functional for use"
+msgstr ""
+
 msgid "This Host is not currently registered with subscription-manager."
 msgstr ""
 
@@ -7865,6 +7985,9 @@ msgstr ""
 msgid "To include or exclude specific content from the content view, create a filter. Without filters, the content view includes everything from the added repositories."
 msgstr ""
 
+msgid "To manage host content overrides, a specific organization must be selected from the organization context."
+msgstr ""
+
 msgid "To manage host packages, a specific organization must be selected from the organization context."
 msgstr ""
 
@@ -7967,6 +8090,9 @@ msgstr ""
 msgid "URL of an OSTree repository."
 msgstr ""
 
+msgid "URL:"
+msgstr ""
+
 msgid "UUID"
 msgstr ""
 
@@ -8042,6 +8168,9 @@ msgstr ""
 msgid "Unable to refresh any alternate content source. You either do not have the permission to refresh, or none of the alternate content sources exist."
 msgstr ""
 
+msgid "Unable to refresh host-repository mapping"
+msgstr ""
+
 msgid "Unable to send errata e-mail notification: %{error}"
 msgstr ""
 
@@ -8054,6 +8183,12 @@ msgstr ""
 msgid "Unable to synchronize any repository. You either do not have the permission to synchronize or the selected repositories do not have a feed url."
 msgstr ""
 
+msgid "Unable to update host-repository mapping"
+msgstr ""
+
+msgid "Unable to update hosts"
+msgstr ""
+
 msgid "Unable to update the repository list"
 msgstr ""
 
@@ -8090,6 +8225,9 @@ msgstr ""
 msgid "Unregister host %s before assigning an organization"
 msgstr ""
 
+msgid "Unregister host %s before assigning an organization."
+msgstr ""
+
 msgid "Unregister the host as a subscription consumer"
 msgstr ""
 
@@ -8360,6 +8498,9 @@ msgstr ""
 msgid "Use HTTP proxies"
 msgstr ""
 
+msgid "Use container certificates for container registry authentication. If it is set to true, container registry certificates will be installed on the host"
+msgstr ""
+
 msgid "Used to determine download concurrency of the repository in pulp3. Use value less than 20. Defaults to 10"
 msgstr ""
 
@@ -9131,6 +9272,9 @@ msgstr "প্যাকেজ ইনস্টল করা হচ্ছে..."
 msgid "interpret specified object to return only Repositories that can be associated with specified object.  Only 'content_view' & 'content_view_version' are supported."
 msgstr ""
 
+msgid "into a product. Details from the flatpak remote will automatically populate the repository fields. The repository will be available for syncing once it has been mirrored into a product."
+msgstr ""
+
 msgid "invalid: Repositories can only require one OS version."
 msgstr ""