katello 4.12.0.rc3 → 4.13.0.rc1

data/app/services/katello/pulp3/repository.rb

@@ -91,16 +91,21 @@ module Katello
       end
 
       def remote_partial_update
-        if remote_options[:url]&.start_with?('uln')
-          api.remotes_uln_api.partial_update(repo.remote_href, remote_options)
-        else
-          api.remotes_api.partial_update(repo.remote_href, remote_options)
+        url_type = remote_options[:url]&.start_with?('uln') ? 'uln' : 'default'
+        remote_type = repo.remote_href.start_with?('/pulp/api/v3/remotes/rpm/uln/') ? 'uln' : 'default'
+        href = repo.remote_href
+
+        if url_type == remote_type
+          api.get_remotes_api(href: href).partial_update(href, remote_options)
+        else # We need to recreate a remote of the correct type!
+          create_remote
+          delete_remote(href: href)
         end
       end
 
       def delete_remote(options = {})
         options[:href] ||= repo.remote_href
-        ignore_404_exception { remote_options[:url]&.start_with?('uln') ? api.remotes_uln_api.delete(options[:href]) : api.remotes_api.delete(options[:href]) } if options[:href]
+        ignore_404_exception { api.get_remotes_api(href: options[:href]).delete(options[:href]) } if options[:href]
       end
 
       def self.instance_for_type(repo, smart_proxy)
@@ -139,7 +144,7 @@ module Katello
       end
 
       def get_remote(href = repo.remote_href)
-        repo.url&.start_with?('uln') ? api.remotes_uln_api.read(href) : api.remotes_api.read(href)
+        api.get_remotes_api(href: href).read(href)
       end
 
       def get_distribution(href = distribution_reference.href)
@@ -210,6 +215,10 @@ module Katello
         api.publications_api.create(publication_data)
       end
 
+      def delete_publication
+        ignore_404_exception { api.publications_api.delete(repo.publication_href) } if repo.publication_href
+      end
+
       def publication_options(repository_version)
         {
           repository_version: repository_version
@@ -329,6 +338,17 @@ module Katello
 
       def delete_version
         ignore_404_exception { api.repository_versions_api.delete(repo.version_href) } unless version_zero?
+      rescue api.api_exception_class => e
+        if e.message.include?("are currently being used to distribute content")
+          Rails.logger.warn "Exception when calling repository_versions_api->delete: #{e}"
+          publication_href = repo.publication_href
+          Rails.logger.warn "Trying to delete publication #{publication_href} for repository #{repo.id}}"
+          Rails.logger.error "Could not delete version: #{repo.version_href} because conflicting publication could not be looked up" unless publication_href
+          if publication_href
+            ignore_404_exception { api.publications_api.delete(publication_href) }
+            ignore_404_exception { api.repository_versions_api.delete(repo.version_href) }
+          end
+        end
       end
 
       def create_version(options = {})

data/app/services/katello/pulp3/repository_mirror.rb

@@ -24,11 +24,9 @@ module Katello
       def refresh_entities
         href = remote_href
         if href
-          if remote_options[:url]&.start_with?('uln')
-            [api.remotes_uln_api.partial_update(href, remote_options)]
-          else
-            [api.remotes_api.partial_update(href, remote_options)]
-          end
+          # Do not consider remotes_uln_api, since the Katello server is not a ULN server. Even if the sync
+          # to Katello used ULN, the sync from Katello server to smart proxy will use a normal RPM remote!
+          [api.remotes_api.partial_update(href, remote_options)]
         else
           create_remote
           []
@@ -111,13 +109,10 @@ module Katello
       end
 
       def create_remote
-        if remote_options[:url]&.start_with?('uln')
-          remote_file_data = @repo_service.api.class.remote_uln_class.new(remote_options)
-          api.remotes_uln_api.create(remote_file_data)
-        else
-          remote_file_data = @repo_service.api.remote_class.new(remote_options)
-          api.remotes_api.create(remote_file_data)
-        end
+        # Do not consider remotes_uln_api, since the Katello server is not a ULN server. Even if the sync
+        # to Katello used ULN, the sync from Katello server to smart proxy will use a normal RPM remote!
+        remote_file_data = @repo_service.api.remote_class.new(remote_options)
+        api.remotes_api.create(remote_file_data)
       end
 
       def compute_remote_options
@@ -240,6 +235,12 @@ module Katello
         distribution_data = api.distribution_class.new(distribution_options(path))
         repo_service.distributions_api.create(distribution_data)
       end
+
+      def repair
+        data = api.repair_class.new
+        fail "Could not lookup a version_href for repo #{repo_service.repo.id}" if version_href.nil?
+        api.repository_versions_api.repair(version_href, data)
+      end
     end
   end
 end

data/app/services/katello/pulp3/service_common.rb

@@ -9,11 +9,7 @@ module Katello
           remote_file_data = api.remote_class.new(remote_options)
         end
         reformat_api_exception do
-          if remote_options[:url]&.start_with?('uln')
-            response = api.remotes_uln_api.create(remote_file_data)
-          else
-            response = api.remotes_api.create(remote_file_data)
-          end
+          response = api.get_remotes_api(url: remote_options[:url]).create(remote_file_data)
         end
         response
       end
@@ -37,11 +33,7 @@ module Katello
         end
 
         reformat_api_exception do
-          if remote_options[:url]&.start_with?('uln')
-            response = api.remotes_uln_api.create(remote_file_data)
-          else
-            response = api.remotes_api.create(remote_file_data)
-          end
+          response = api.get_remotes_api(url: remote_options[:url]).create(remote_file_data)
           #delete is async, but if its not properly deleted, orphan cleanup will take care of it later
           delete_remote(href: response.pulp_href)
         end

data/app/services/katello/pulp3/smart_proxy_repository.rb

@@ -35,13 +35,11 @@ module Katello
 
       def delete_orphan_repository_versions
         tasks = []
-
         orphan_repository_versions.each do |api, version_hrefs|
           tasks << version_hrefs.collect do |href|
             api.repository_versions_api.delete(href)
           end
         end
-
         tasks.flatten
       end
 

data/app/services/katello/ui_notifications/subscriptions/manifest_expire_soon_warning.rb

@@ -0,0 +1,75 @@
+module Katello
+  module UINotifications
+    module Subscriptions
+      class ManifestExpireSoonWarning
+        class << self
+          def deliver!
+            ::Organization.unscoped.all.each do |organization|
+              if (notification = existing_notification(organization))
+                days_remaining = organization.manifest_expire_days_remaining
+                if days_remaining == 0 || days_remaining > Setting[:expire_soon_days].to_i
+                  # if the manifest has already expired, delete the notification;
+                  # user will have a ManifestExpiredWarning instead.
+                  # If user changes the expire_soon_days setting, remove notifications
+                  # that are no longer relevant.
+                  Rails.logger.debug("ManifestExpireSoonWarning: deleting notification for #{organization.name}")
+                  notification.destroy
+                  next
+                end
+                # don't update if the message hasn't changed
+                next unless message(organization).to_s !=
+                  notification.message.to_s
+                notification.update(
+                  :message => message(organization),
+                  :actions => actions
+                )
+              else
+                next unless organization.manifest_expiring_soon?
+                ::Notification.create!(
+                  :subject => organization,
+                  :initiator => User.anonymous_admin,
+                  :audience => Notification::AUDIENCE_SUBJECT,
+                  :message => message(organization),
+                  :actions => actions,
+                  :notification_blueprint => blueprint
+                )
+              end
+            end
+          end
+
+          def existing_notification(subject)
+            matching_notification = Notification.unscoped.find_by(:subject => subject, :notification_blueprint => blueprint)
+            return false if matching_notification.blank?
+            matching_notification
+          end
+
+          def message(organization)
+            ::UINotifications::StringParser.new(
+              blueprint.message,
+              :manifest_expire_date => organization.manifest_expiration_date&.to_date,
+              :subject => organization,
+              :days_remaining => organization.manifest_expire_days_remaining
+            )
+          end
+
+          def actions
+            {
+              :links => [
+                {
+                  :href => "/subscriptions",
+                  :title => _('Subscriptions'),
+                  :external => false
+                }
+              ]
+            }
+          end
+
+          def blueprint
+            @blueprint ||= NotificationBlueprint.unscoped.find_by(
+              :name => 'manifest_expire_soon_warning')
+          end
+        end
+      end
+    end
+  end
+end

data/app/views/foreman/job_templates/update_package_-_katello_ansible_default.erb

@@ -13,4 +13,8 @@ provider_type: Ansible
 kind: job_template
 %>
 
-<%= render_template('Run Command - Ansible Default', :command => "yum -y update #{input('package')}") %>
+<%
+pkgs = input('package')
+pkgs = '"*"' if pkgs.empty?
+-%>
+<%= render_template('Package Action - Ansible Default', :state => 'latest', :name => pkgs) %>

data/app/views/foreman/job_templates/update_packages_by_search_query_-_katello_ansible_default.erb

@@ -3,7 +3,7 @@ kind: job_template
 name: Update packages by search query - Katello Ansible Default
 job_category: Katello
 description_format: 'Update package(s) %{Packages search query}'
-feature: katello_package_remove_by_search
+feature: katello_package_update_by_search
 provider_type: Ansible
 template_inputs:
 - name: Packages search query
@@ -22,7 +22,7 @@ template_inputs:
   versions: input('Selected update versions')
 ) -%>
 <% if package_names.empty? -%>
-<%= render_template('Run Command - Ansible Default', :command => "yum -y update") %>
+<%= render_template('Package Action - Ansible Default', :state => 'latest', :name => '"*"') %>
 <% else -%>
 ---
 - hosts: all

data/app/views/foreman/job_templates/upload_profile.erb

@@ -0,0 +1,16 @@
+<%#
+kind: job_template
+name: Upload profile - Katello Script Default
+job_category: Katello
+model: JobTemplate
+provider_type: script
+description_format: Upload package profile for a host
+feature: katello_upload_profile
+%>
+#!/bin/sh
+<% if @host.operatingsystem.family == 'Redhat' -%>
+dnf uploadprofile --force-upload
+<% else -%>
+package-profile-upload --force-upload
+<% end -%>
+subscription-manager repos

data/app/views/katello/api/v2/content_view_filter_rules/show.json.rabl

@@ -15,4 +15,13 @@ attributes :architecture, :if => lambda { |rule| rule.respond_to?(:architecture)
 attributes :types, :if => lambda { |rule| rule.respond_to?(:types) && !rule.types.blank? }
 attributes :date_type, :if => lambda { |rule| rule.respond_to?(:date_type) }
 attributes :module_stream_id, :if => lambda { |rule| rule.respond_to?(:module_stream_id) && !rule.module_stream_id.blank? }
+if @resource&.try(:module_stream)
+  node :module_stream do |rule|
+    {
+      :module_stream_id => rule.module_stream.id,
+      :module_stream_name => rule.module_stream.name,
+      :module_stream_stream => rule.module_stream.stream
+    }
+  end
+end
 extends 'katello/api/v2/common/timestamps'

data/app/views/katello/api/v2/docker_manifests/show.json.rabl

@@ -1,6 +1,7 @@
 object @resource
 
 attributes :id, :schema_version, :digest, :manifest_type
+attributes :annotations, :labels, :is_bootable, :is_flatpak
 
 child :docker_tags => :tags do
   attributes :associated_meta_tag_identifier => :id

data/app/views/katello/api/v2/hosts/host_collections.json.rabl

@@ -1,3 +1,7 @@
 child :host_collections => :host_collections do
-  attributes :id, :name, :description, :max_hosts, :unlimited_hosts, :total_hosts
+  attributes :id, :name, :description, :max_hosts, :unlimited_hosts
+
+  node :total_hosts do |host_collection|
+    host_collection.total_hosts(cached: true)
+  end
 end

data/app/views/katello/api/v2/organizations/show.json.rabl

@@ -3,10 +3,18 @@ object @organization
 extends "api/v2/taxonomies/show"
 
 attributes :task_id, :label, :redhat_repository_url
-
+attributes :manifest_expiration_date, :manifest_expire_days_remaining
 attributes :system_purposes, :system_purposes
 attributes :service_levels, :service_level
 
+node :manifest_expiring_soon do |org|
+  org.manifest_expiring_soon?
+end
+
+node :manifest_expired do |org|
+  org.manifest_expired?
+end
+
 node :simple_content_access do |org|
   org.simple_content_access?
 end

data/app/views/katello/hosts/_errata_counts.html.erb

@@ -43,7 +43,7 @@
 <% end %>
 <% if host.operatingsystem_name&.match(/Debian|Ubuntu/) %>
 <% if Setting["host_details_ui"] %>
-<a href="/new/hosts/<%= host.name %>#/Content/packages?status=Upgradable">
+<a href="/new/hosts/<%= host.name %>#/Content/debs?status=Upgradable">
 <% else %>
 <a href="/content_hosts/<%= host.id %>/debs/applicable">
 <% end %>

data/app/views/overrides/activation_keys/_host_environment_select.html.erb

@@ -8,7 +8,7 @@
 
 <% if edit_action? && !using_hostgroups_page? && !using_discovered_hosts_page? %>
   <div style="margin-left: 270px">
-    <%= link_to _("Change content source"), "/change_host_content_source?host_id=#{@host.id}" %>
+    <%= link_to _("Change content source"), "/change_host_content_source?fromPage=hostEdit&host_id=#{@host.id}&initialContentSourceId=#{@host.content_source_id}" %>
   </div>
 <% end %>
 

data/app/views/overrides/activation_keys/_host_media_type_select.html.erb

@@ -16,19 +16,29 @@
 %>
 
 <div class="clear-fix" id="media_selection_section">
-  <div class="form-group ">
-     <label class="col-md-2 control-label" for="use_install_media"><%= _('Media Selection') %></label>
+  <div class="form-group">
+     <label class="col-md-2 control-label" for="use_install_media">
+        <%= _('Media Selection') %>
+     </label>
      <div class="col-md-4">
         <label class="radio-inline">
-          <input data-media-selector="true" id="host_use_synced_content" name="media_selector" value="synced_content" type="radio" <%= synced_content_radio  %> <%= synced_content_disabled %>/> <%= _('Synced Content') %>
+          <input data-media-selector="true" id="host_use_synced_content" name="media_selector" value="synced_content" type="radio" 
+            <%= synced_content_radio  %> 
+            <%= synced_content_disabled %>
+          /> 
+          <%= _('Synced Content') %>
         </label>
+        <%= popover("", _("To enable the synced content option, this host must use a content source, content view, and lifecycle environment which contain synced kickstart repositories for the selected architecture and operating system.")) %>
         <label class="radio-inline">
-          <input data-media-selector="true" id="host_use_install_media" name="media_selector" value="install_media" type="radio" <%= install_media_radio  %> <%= install_media_disabled  %>/> <%= _('All Media') %>
+          <input data-media-selector="true" id="host_use_install_media" name="media_selector" value="install_media" type="radio" 
+            <%= install_media_radio  %> 
+            <%= install_media_disabled  %>
+          /> 
+          <%= _('All Media') %>
         </label>
         <span class="help-block">
           <%= _("Select the installation media that will be used to provision this host. Choose 'Synced Content' for Synced Kickstart Repositories or 'All Media' for other media.") %>
         </span>
       </div>
-     <span class="help-block help-inline"></span>
   </div>
 </div>

data/app/views/overrides/activation_keys/_host_tab_pane.html.erb

@@ -1,31 +1,3 @@
-
-<%= javascript "katello/hosts/activation_key_edit" %>
-
-
 <div class="tab-pane" id="activation_keys">
-  <div id="ak-load-error" class="alert alert-danger" style="display: none;">
-    <%= _("There was a problem retrieving Activation Key data from the server.") %>
-  </div>
-
-  <%= field(f, _("Activation Keys"),
-            :help_inline => _("The value will be available in templates as @host.params['#{kt_ak_label}']")) do
-    react_component('TypeAheadSelect', { id: 'kt_activation_keys', multiple: true, allowNew: true })
-  end %>
-
-  <div class="alert alert-info">
-    <p><b><%= _('Subscriptions information based on selected activation keys:') %></b></p>
-    <ul id="ak-subscriptions-info"></ul>
-
-    <div id="ak-subscriptions-spinner" style="display: none">
-      <%= image_tag "spinner.gif" %>
-    </div>
-
-    <p><%= _('Activation keys and subscriptions can be managed') %>
-      <b><a href="/activation_keys" target="_blank"> <%= _('here.') %></a></b>
-    </p>
-    <p translate>
-    Activation keys may be used during <a href="/hosts/register">system registration.</a>
-  </p>
-    <p><a href="" id="ak_refresh_subscriptions"><%= _('Reload data') %></a></p>
-  </div>
+  <%= react_component('ActivationKeysSearch')%> 
 </div>

data/config/routes/api/registry.rb

@@ -10,16 +10,12 @@ Katello::Engine.routes.draw do
       match '/v2/token' => 'registry_proxies#token', :via => :get
       match '/v2/token' => 'registry_proxies#token', :via => :post
       match '/v2/*repository/manifests/:tag' => 'registry_proxies#pull_manifest', :via => :get
-      # Push-related routes are disabled until there is support for pushing to Pulp 3.
-      # match '/v2/*repository/manifests/:tag' => 'registry_proxies#push_manifest', :via => :put
+      match '/v2/*repository/manifests/:tag' => 'registry_proxies#push_manifest', :via => :put
       match '/v2/*repository/blobs/:digest' => 'registry_proxies#pull_blob', :via => :get
       match '/v2/*repository/blobs/:digest' => 'registry_proxies#check_blob', :via => :head
-      # match '/v2/*repository/blobs/uploads' => 'registry_proxies#start_upload_blob', :via => :post
-      # match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#chunk_upload_blob', :via => :post
-      # match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#finish_upload_blob', :via => :put
-      # match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#upload_blob', :via => :patch
-      # match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#status_upload_blob', :via => :get
-      # match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#cancel_upload_blob', :via => :delete
+      match '/v2/*repository/blobs/uploads' => 'registry_proxies#start_upload_blob', :via => :post
+      match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#finish_upload_blob', :via => :put
+      match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#upload_blob', :via => :patch
       match '/v2/_catalog' => 'registry_proxies#catalog', :via => :get
       match '/v2/*repository/tags/list' => 'registry_proxies#tags_list', :via => :get
       match '/v2' => 'registry_proxies#ping', :via => :get

data/config/routes/api/v2.rb

@@ -29,6 +29,7 @@ Katello::Engine.routes.draw do
               get :sync, :action => :sync_status
               delete :sync, :action => :cancel_sync
               post :reclaim_space
+              post :verify_checksum
               post '/lifecycle_environments' => 'capsule_content#add_lifecycle_environment'
               delete '/lifecycle_environments/:environment_id' => 'capsule_content#remove_lifecycle_environment'
             end
@@ -149,6 +150,7 @@ Katello::Engine.routes.draw do
             post :promote
             post :export
             put :republish_repositories
+            post :verify_checksum
           end
           collection do
             get :auto_complete_search

data/db/migrate/20240423112842_add_fields_to_katello_docker_manifest.rb

@@ -0,0 +1,8 @@
+class AddFieldsToKatelloDockerManifest < ActiveRecord::Migration[6.1]
+  def change
+    add_column :katello_docker_manifests, :annotations, :jsonb, default: {}
+    add_column :katello_docker_manifests, :labels, :jsonb, default: {}
+    add_column :katello_docker_manifests, :is_bootable, :boolean, default: false
+    add_column :katello_docker_manifests, :is_flatpak, :boolean, default: false
+  end
+end

data/db/migrate/20240502192021_change_katello_repository_rpms_id_seq_to_big_int.rb

@@ -0,0 +1,9 @@
+class ChangeKatelloRepositoryRpmsIdSeqToBigInt < ActiveRecord::Migration[6.1]
+  def up
+    execute 'ALTER SEQUENCE katello_repository_rpms_id_seq AS bigint;'
+  end
+
+  def down
+    execute 'ALTER SEQUENCE katello_repository_rpms_id_seq AS integer;'
+  end
+end

data/db/seeds.d/109-katello-notification-blueprints.rb

@@ -25,6 +25,12 @@ blueprints = [
     message: N_('%{expiring_subs} subscriptions in %{subject} are going to expire in less than %{days} days. Please renew them before they expire to guarantee your hosts will continue receiving content.'),
     level: 'warning'
   },
+  {
+    group: N_('Subscriptions'),
+    name: 'manifest_expire_soon_warning',
+    message: N_('Manifest in organization %{subject} has an identity certificate that will expire in %{days_remaining} days, on %{manifest_expire_date}. To extend the expiration date, please refresh your manifest.'),
+    level: 'info'
+  },
   {
     group: N_('Subscriptions'),
     name: 'manifest_expired_warning',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-repository-sets.controller.js

@@ -23,7 +23,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySet
 
         params = {
             'activation_key_id': $scope.$stateParams.activationKeyId,
-            'content_access_mode_all': $scope.simpleContentAccessEnabled,
+            'content_access_mode_all': true,
             'content_access_mode_env': true,
             'sort_order': 'ASC',
             'paged': true
@@ -39,7 +39,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySet
         $scope.repositoryType = {};
 
         $scope.contentAccessModes = {
-            contentAccessModeAll: $scope.simpleContentAccessEnabled,
+            contentAccessModeAll: true,
             contentAccessModeEnv: true
         };
 
@@ -53,7 +53,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySet
 
         $scope.toggleFilters = function () {
             $scope.nutupane.table.params['content_access_mode_env'] = $scope.contentAccessModes.contentAccessModeEnv;
-            $scope.nutupane.table.params['content_access_mode_all'] = $scope.contentAccessModes.contentAccessModeAll || $scope.simpleContentAccessEnabled;
+            $scope.nutupane.table.params['content_access_mode_all'] = true;
             $scope.nutupane.refresh();
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/new/views/new-content-credential.html

@@ -35,7 +35,8 @@
                   class="form-control"
                   style="font-family: monospace"
                   rows="15"
-                  placeholder="{{ 'Paste contents of Content Credential' | translate }}">
+                  placeholder="{{ 'Paste contents of Content Credential' | translate }}"
+                  required>
         </textarea>
       </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-repository-sets.controller.js

@@ -20,7 +20,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostRepositorySetsCon
 
         params = {
             'host_id': $scope.$stateParams.hostId,
-            'content_access_mode_all': $scope.simpleContentAccessEnabled,
+            'content_access_mode_all': true,
             'sort_order': 'ASC',
             'paged': true
         };
@@ -33,11 +33,11 @@ angular.module('Bastion.content-hosts').controller('ContentHostRepositorySetsCon
         $scope.nutupane.primaryOnly = true;
 
         $scope.contentAccessModes = {
-            contentAccessModeAll: $scope.simpleContentAccessEnabled,
+            contentAccessModeAll: true,
             contentAccessModeEnv: false
         };
         $scope.toggleFilters = function () {
-            $scope.nutupane.table.params['content_access_mode_all'] = $scope.contentAccessModes.contentAccessModeAll || $scope.simpleContentAccessEnabled;
+            $scope.nutupane.table.params['content_access_mode_all'] = true;
             $scope.nutupane.table.params['content_access_mode_env'] = $scope.contentAccessModes.contentAccessModeEnv;
             $scope.nutupane.refresh();
         };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot

@@ -3973,7 +3973,6 @@ msgstr ""
 #: app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-module-streams.html
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-provisioning-info.html
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-repository-sets.html
-#: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-subscriptions.html
 #: app/assets/javascripts/bastion_katello/tasks/views/tasks-table.html
 #: app/assets/javascripts/bastion_katello/tasks/views/user-tasks-table.html
 msgid "Status"
@@ -3995,8 +3994,6 @@ msgid "Subscription Management"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-associations-content-hosts.html
-#: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html
-#: app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html
 msgid "Subscription Status"
 msgstr ""
 
@@ -4178,10 +4175,6 @@ msgstr ""
 msgid "System Purpose Management"
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html
-msgid "System Purpose Status"
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-docker-manifest-lists.html
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-docker-manifests.html
 msgid "Tags"
@@ -4398,14 +4391,6 @@ msgid ""
 "          Change the setting \"Delete Host upon Unregister\" to false on the <a href=\"/settings\">settings page</a> to prevent this."
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html
-msgid "This organization has Simple Content Access enabled.  Hosts are not required to have subscriptions attached to access repositories."
-msgstr ""
-
-#: app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html
-msgid "This organization is not using <a target=\"_blank\" href=\"https://access.redhat.com/articles/simple-content-access\">Simple Content Access.</a> Entitlement-based subscription management is deprecated and will be removed in Katello 4.12."
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html
 #: app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html
 #: app/assets/javascripts/bastion_katello/content-hosts/content/views/errata-details.html

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -189,12 +189,14 @@
                  type="{{ repository.upstream_password.length < 1 ? 'text': 'password' }}"
                  autocomplete="{{ (repository.upstream_username==null || repository.upstream_username=='') ? 'new-password' : '' }}"
                  ng-model="repository.upstream_password"/>
-          <div translate>Upstream Authentication Token</div>
-          <input id="upstream_authentication_token"
-                  name="upstream_authentication_token"
-                  type="{{ repository.upstream_authentication_token.length < 1 ? 'text': 'password' }}"
-                  autocomplete="off"
-                  ng-model="repository.upstream_authentication_token"/>
+          <span ng-show="repository.content_type === 'yum'">
+            <div translate>Upstream Authentication Token</div>
+            <input id="upstream_authentication_token"
+                   name="upstream_authentication_token"
+                   type="{{ repository.upstream_authentication_token.length < 1 ? 'text': 'password' }}"
+                   autocomplete="off"
+                   ng-model="repository.upstream_authentication_token"/>
+          </span>
         </dd>
       </span>