foreman_theme_satellite 16.3.0 → 16.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1263e53cb91355d792bf72a459fbf2ab32adefe0aa9fc9c687a741a53bfbe950
-  data.tar.gz: 1bc809792421a5c0fc81d69b0f74b4501d7a042cb7e7649e4dcddaf4d36209eb
+  metadata.gz: 32be64dac79d555b3e377502e059e1b3dd5a8fabcb459dbc8b778758a3b51409
+  data.tar.gz: eeb1151190cad9e338da092c25e2e96132e55b57a3f75763e730de42c50a2c91
 SHA512:
-  metadata.gz: 45e63d536b92b9f42b8e4a6a905257c0ff5dbe2b8931227b1b2abbc1b07b9c177d0f60ff6dc2adfedc840384fd4affb26cfa5bac9b2ada38debc96440b787acf
-  data.tar.gz: d9cc45d43b8078a85a892f369a0a50aeb52f48ec5e12f041aac2abbeed96e1f868db8f8af4db68697282c69023368e626a0db831b5ba4b6837dfc1108a543cb4
+  metadata.gz: 50fe01b8ea75504bb0e290df0330b46cebe71f87df6f7778b9aa8f77fa7094ef31faca80e104c15319f855736096f0b2a3266900a5ca0b0d55e3fe45e05fb634
+  data.tar.gz: ff22352113ead26533ea39802ae51f214cc203165a897a1b2196d1e02d5a8555b932f8b7dbd469192e73fc16e00b009c8b971531f0724a4e9f21939a22254ff3

data/README.md

@@ -422,11 +422,17 @@ version: '6.8.000'
 documentation_version: "6.6"
 ```
 the metadata file should be called `/usr/share/satellite/metadata.yml` for
-production style deployments, or used from
+production style deployments, or used from the
 [source](https://github.com/RedHatSatellite/foreman_theme_satellite/blob/develop/config/metadata.yml)
-directory for development and test environments.
+directory for development and test environments. `SATELLITE_VERSION` and the
+`version` key take precedence over the lifecycle metadata.
 
-The mechanism resides in theme's
+The Satellite version is also provided by the `satellite-lifecycle` package in
+`/usr/share/satellite/lifecycle-metadata.yml` as `satellite_version`. This is
+used when the main metadata file is unavailable. If neither file is present,
+the theme falls back to `6.20.0-development`.
+
+The mechanism resides in the theme's
 [`engine.rb`](https://github.com/RedHatSatellite/foreman_theme_satellite/blob/develop/lib/foreman_theme_satellite/engine.rb#L119)
 
 ## Testing documentation
@@ -446,6 +452,11 @@ Another option is to add or change keys in `/usr/share/satellite/metadata.yml`:
 documentation_version: "6.6"
 ```
 
+The Satellite version itself is normally supplied by
+`/usr/share/satellite/lifecycle-metadata.yml` from the `satellite-lifecycle`
+package. Use the `version` key in `metadata.yml` or `SATELLITE_VERSION` only
+when an explicit override is required.
+
 There is also an automatic test that tests all documentation links on each PR,
 for the test to work
 [`metadata.yml`](https://github.com/RedHatSatellite/foreman_theme_satellite/blob/develop/config/metadata.yml)

data/app/assets/stylesheets/foreman_theme_satellite/topbar.scss

@@ -1,5 +1,5 @@
 .satellite-theme {
-  .pf-v5-c-page .pf-v5-c-masthead {
+  #foreman-page .pf-v5-c-masthead {
     .pf-v5-c-masthead__brand {
       height: inherit;
     }

data/lib/foreman_theme_satellite/documentation.rb

@@ -14,19 +14,19 @@ module ForemanThemeSatellite
       # Provisioning Hosts
       'Architectures' => "provisioning_hosts/index#creating-architectures-by-using-web-ui",
       'Provisioning' => "provisioning_hosts/index",
-      'InstallationMedia' => "provisioning_hosts/index#adding-installation-media-by-using-web-ui",
+      'InstallationMedia' => "provisioning_hosts/index#adding-installation-media-to-satellite-by-using-web-ui",
       'PartitionTables' => "provisioning_hosts/index#creating-partition-tables-by-using-web-ui",
       'ProvisioningTemplates' => "provisioning_hosts/index#provisioning-templates",
       'OperatingSystems' => "provisioning_hosts/index#creating-operating-systems-by-using-web-ui",
       'UsingComputeProfiles' => "provisioning_hosts/index#creating-compute-profiles-by-using-web-ui",
       'ComputeResources' => "provisioning_hosts/index",
-      'NoVNC' => "provisioning_hosts/index#using-novnc-to-access-virtual-machines_provisioning",
-      'VMwareNotes' => "provisioning_hosts/index#Provisioning_Virtual_Machines_in_VMware_vmware-provisioning",
-      'OpenStackNotes' => "provisioning_hosts/index#Provisioning_Cloud_Instances_OpenStack_openstack-provisioning",
-      'LibvirtNote' => "provisioning_hosts/index#Provisioning_Virtual_Machines_on_KVM_kvm-provisioning",
+      'NoVNC' => "provisioning_hosts/index#using-novnc-to-access-virtual-machines",
+      'VMwareNotes' => "provisioning_hosts/index#provisioning-virtual-machines-in-vmware",
+      'OpenStackNotes' => "provisioning_hosts/index#provisioning-cloud-instances-on-red-hat-openstack-services-on-openshift",
+      'LibvirtNote' => "provisioning_hosts/index#provisioning-virtual-machines-on-kvm",
       'EC2' => "provisioning_hosts/index#provisioning-cloud-instances-on-amazon-ec2",
-      'GoogleComputeEngineNotes' => "provisioning_hosts/index#Provisioning_Cloud_Instances_on_Google_Compute_Engine_gce-provisioning",
-      'Networking' => "provisioning_hosts/index#adding-a-subnet-to-server-by-using-web-ui",
+      'GoogleComputeEngineNotes' => "provisioning_hosts/index#provisioning-cloud-instances-on-google-compute-engine",
+      'Networking' => "provisioning_hosts/index#adding-a-subnet-to-satellite-server-by-using-web-ui",
 
       # Puppet Guide
       'FactsandtheENC' => "managing_configurations_by_using_puppet_integration/index#high-level-steps-for-configuration-management-with-puppet",
@@ -40,12 +40,12 @@ module ForemanThemeSatellite
       'ConfigurationOptions' => "administering_red_hat_satellite/index",
       'PuppetReports' => "administering_red_hat_satellite/index#Using_the_Project_Content_Dashboard_admin",
       'Mail_Notifications' => "administering_red_hat_satellite/index#Configuring_Email_Notifications_admin",
-      'Realm' => "installing_satellite_server_in_a_connected_network_environment/index#configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm_satellite",
-      'Searching' => "administering_red_hat_satellite/index#Searching_and_Bookmarking_admin",
+      'Realm' => "integrating_provisioning_infrastructure_services/index#configuring-satellite-to-manage-the-lifecycle-of-a-host-registered-to-a-identity-management-realm",
+      'Searching' => "administering_red_hat_satellite/index#working-efficiently-with-web-ui",
       'RolesandPermissions' => "administering_red_hat_satellite/index#Managing_Users_and_Roles_admin",
       'LDAPAuthentication' => "configuring_authentication_for_red_hat_satellite_users/index#configuring-an-ldap-server-as-an-external-identity-provider-for-project_authentication",
       'ExternalAuthentication' => "configuring_authentication_for_red_hat_satellite_users/index",
-      'Bookmarks' => "administering_red_hat_satellite/index#Searching_and_Bookmarking_admin",
+      'Bookmarks' => "administering_red_hat_satellite/index#working-efficiently-with-web-ui",
 
       # Planning
       'SmartProxies' => "overview_concepts_and_deployment_considerations/index#Major-Satellite-Components_planning",
@@ -59,20 +59,23 @@ module ForemanThemeSatellite
     }.freeze
 
     PLUGINS_DOCUMENTATION = {
-      'foreman_azure' => "provisioning_hosts/index#Provisioning_Cloud_Instances_on_Microsoft_Azure_Resource_Manager_azure-provisioning",
+      'foreman_azure' => "provisioning_hosts/index#provisioning-cloud-instances-on-microsoft-azure",
       'foreman_discovery' => "provisioning_hosts/index#discovering-hosts-on-a-network",
-      'foreman_kubevirt' => "provisioning_hosts/index#Provisioning_Virtual_Machines_Kubevirt_kubevirt-provisioning",
+      'foreman_kubevirt' => "provisioning_hosts/index#provisioning-virtual-machines-on-openshift-virtualization",
     }.freeze
 
     DOCS_GUIDES_LINKS = {
+      'Administering_Project' => {
+        'configuring-foreman-server-for-cloud-connection' => "administering_red_hat_satellite/index#configuring-satellite-server-for-cloud-connection",
+      },
       'Managing_Content' => {
         'Products_and_Repositories_content-management' => "managing_content/index#Products_and_Repositories_content-management",
       },
       'Managing_Hosts' => {
         'creating-a-job-template_managing-hosts' => "managing_hosts/index#creating-a-job-template-by-using-web-ui",
         'executing-a-remote-job_managing-hosts' => "managing_hosts/index#Remote-Execution-in-Satellite_managing-hosts",
-        'registering-a-host_managing-hosts' => "managing_hosts/index#Registering_Hosts_by_Using_Global_Registration_managing-hosts",
-        'setting-minimal-data-collection' => "managing_hosts/index#data-control-settings",
+        'registering-a-host_managing-hosts' => "managing_hosts/index#registering-hosts-by-using-global-registration",
+        'setting-minimal-data-collection' => "administering_red_hat_satellite/index#data-control-settings-for-hosted-red-hat-lightspeed",
       },
       'Managing_Configurations_Ansible' => {
         'Importing_Ansible_Roles_and_Variables_ansible' => "managing_configurations_by_using_ansible_integration/index#Importing_Ansible_Roles_and_Variables_ansible",

data/lib/foreman_theme_satellite/engine.rb

@@ -2,6 +2,7 @@ require 'fast_gettext'
 require 'gettext_i18n_rails'
 require 'rubygems'
 require 'deface'
+require 'foreman_theme_satellite/lifecycle'
 
 module ForemanThemeSatellite
   class Engine < ::Rails::Engine
@@ -125,12 +126,16 @@ module ForemanThemeSatellite
     @metadata_yaml.fetch(key, default)
   end
 
+  def self.lifecycle_metadata_field(key, default)
+    ForemanThemeSatellite::Lifecycle.metadata.fetch(key, default)
+  end
+
   def self.lifecycle_data
     @lifecycle_data ||= ForemanThemeSatellite::Lifecycle.lifecycle_data(get_satellite_version)
   end
 
   def self.get_satellite_version
-    metadata_field('version', '6.15.0-development')
+    metadata_field('version', nil) || lifecycle_metadata_field('satellite_version', '6.20.0-development')
   end
 
   def self.get_satellite_short_version

data/{app/services → lib}/foreman_theme_satellite/lifecycle.rb

@@ -1,16 +1,19 @@
 module ForemanThemeSatellite
   class Lifecycle
     class << self
-      # rubocop:disable Metrics/AbcSize
-      def lifecycle_data(version)
+      def metadata
         metadata_path = ::ForemanThemeSatellite::LIFECYCLE_METADATA_PATH
+        File.exist?(metadata_path) ? (YAML.load_file(metadata_path) || {}) : {}
+      end
 
+      # rubocop:disable Metrics/AbcSize
+      def lifecycle_data(version)
+        yaml = metadata
         parsed = Foreman::Version.new(version)
         lifecycle_data = { current_version: version, short_version: "#{parsed.major}.#{parsed.minor}" }
 
-        return lifecycle_data unless File.exist?(metadata_path)
+        return lifecycle_data if yaml.empty?
 
-        yaml = YAML.load_file(metadata_path)
         raise "Unexpected lifecycle metadata file version '#{yaml['version']}'" unless yaml['version'] == '1'
 
         eol = yaml['releases'].fetch(lifecycle_data[:short_version], {})['end_of_life']

data/lib/foreman_theme_satellite/version.rb

@@ -1,3 +1,3 @@
 module ForemanThemeSatellite
-  VERSION = '16.3.0'.freeze
+  VERSION = '16.4.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_theme_satellite
 version: !ruby/object:Gem::Version
-  version: 16.3.0
+  version: 16.4.1
 platform: ruby
 authors:
 - Shimon Stein
@@ -100,7 +100,6 @@ files:
 - app/overrides/layouts/base/theme_style_resources.html.erb.deface
 - app/overrides/satellite_name_override.rb
 - app/services/concerns/setting_registry_branding.rb
-- app/services/foreman_theme_satellite/lifecycle.rb
 - app/services/foreman_theme_satellite/renderer_methods.rb
 - app/views/api/v2/home/status_extensions.json.rabl
 - app/views/foreman_theme_satellite/_theme_client_side_branding.js.erb
@@ -119,6 +118,7 @@ files:
 - lib/foreman_theme_satellite/documentation.rb
 - lib/foreman_theme_satellite/engine.rb
 - lib/foreman_theme_satellite/foreman_brand.rb
+- lib/foreman_theme_satellite/lifecycle.rb
 - lib/foreman_theme_satellite/pry_rack.rb
 - lib/foreman_theme_satellite/replacer_repository.rb
 - lib/foreman_theme_satellite/rss_checker_branding.rb
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: This is a plugin that enables building a theme for Foreman.
 test_files: []