Sync from SUSE:ALP:Source:Standard:1.0 elemental revision 5772f8d547b8090955295ddf5da37309

README.md

@@ -1,6 +1,8 @@
 # Elemental
 
-[![Code style](https://github.com/rancher/elemental/actions/workflows/lint.yaml/badge.svg?branch=main)](https://github.com/rancher/elemental/actions/workflows/lint.yaml)
+[![Lint](https://github.com/rancher/elemental/actions/workflows/lint.yaml/badge.svg?branch=main)](https://github.com/rancher/elemental/actions/workflows/lint.yaml)
+
+## Regular tests
 
 | Rancher stable (night) | Rancher head 2.7 (8am) | Rancher head 2.8 (9am) | Rancher head 2.9 (10am) |
 | - | - | - | - |
@@ -24,8 +26,13 @@
 | [![UI-K3s-OS-Upgrade](https://github.com/rancher/elemental/actions/workflows/ui-k3s-os-upgrade-rm_stable.yaml/badge.svg?branch=main)](https://github.com/rancher/elemental/actions/workflows/ui-k3s-os-upgrade-rm_stable.yaml) | [![UI-K3s-OS-Upgrade](https://github.com/rancher/elemental/actions/workflows/ui-k3s-os-upgrade-rm_head_2.7.yaml/badge.svg?branch=main)](https://github.com/rancher/elemental/actions/workflows/ui-k3s-os-upgrade-rm_head_2.7.yaml) | [![UI-K3s-OS-Upgrade](https://github.com/rancher/elemental/actions/workflows/ui-k3s-os-upgrade-rm_head_2.8.yaml/badge.svg?branch=main)](https://github.com/rancher/elemental/actions/workflows/ui-k3s-os-upgrade-rm_head_2.8.yaml) | [![UI-K3s-OS-Upgrade](https://github.com/rancher/elemental/actions/workflows/ui-k3s-os-upgrade-rm_head_2.9.yaml/badge.svg?branch=main)](https://github.com/rancher/elemental/actions/workflows/ui-k3s-os-upgrade-rm_head_2.9.yaml)
 | [![UI-RKE2-OS-Upgrade](https://github.com/rancher/elemental/actions/workflows/ui-rke2-os-upgrade-rm_stable.yaml/badge.svg?branch=main)](https://github.com/rancher/elemental/actions/workflows/ui-rke2-os-upgrade-rm_stable.yaml) | [![UI-RKE2-OS-Upgrade](https://github.com/rancher/elemental/actions/workflows/ui-rke2-os-upgrade-rm_head_2.7.yaml/badge.svg?branch=main)](https://github.com/rancher/elemental/actions/workflows/ui-rke2-os-upgrade-rm_head_2.7.yaml) | [![UI-RKE2-OS-Upgrade](https://github.com/rancher/elemental/actions/workflows/ui-rke2-os-upgrade-rm_head_2.8.yaml/badge.svg?branch=main)](https://github.com/rancher/elemental/actions/workflows/ui-rke2-os-upgrade-rm_head_2.8.yaml) | [![UI-RKE2-OS-Upgrade](https://github.com/rancher/elemental/actions/workflows/ui-rke2-os-upgrade-rm_head_2.9.yaml/badge.svg?branch=main)](https://github.com/rancher/elemental/actions/workflows/ui-rke2-os-upgrade-rm_head_2.9.yaml)
 
-## Airgap test
+## Airgap tests
-[![CLI-K3s-Airgap-RM_latest](https://github.com/rancher/elemental/actions/workflows/cli-k3s-airgap_rm_latest_dev.yaml/badge.svg?branch=main)](https://github.com/rancher/elemental/actions/workflows/cli-k3s-airgap_rm_latest_dev.yaml) [![CLI-K3s-Airgap-RM_stable](https://github.com/rancher/elemental/actions/workflows/cli-k3s-airgap_rm_stable.yaml/badge.svg?branch=main)](https://github.com/rancher/elemental/actions/workflows/cli-k3s-airgap_rm_stable.yaml)
+
+[![CLI-K3s-Airgap-RM_stable](https://github.com/rancher/elemental/actions/workflows/cli-k3s-airgap_rm_stable.yaml/badge.svg?branch=main)](https://github.com/rancher/elemental/actions/workflows/cli-k3s-airgap_rm_stable.yaml) (Tested ith Rancher stable)
+
+[![CLI-K3s-Airgap-RM_latest_devel](https://github.com/rancher/elemental/actions/workflows/cli-k3s-airgap_rm_latest_dev.yaml/badge.svg?branch=main)](https://github.com/rancher/elemental/actions/workflows/cli-k3s-airgap_rm_latest_dev.yaml) (Tested with Rancher latest RC)
+
+## Goal
 
 Elemental is a software stack enabling a centralized, full cloud-native OS management solution with Kubernetes.
 
@@ -34,3 +41,19 @@ Cluster Node OSes are built and maintained via container images through the [Ele
 The [Elemental Operator](https://github.com/rancher/elemental-operator) and the [Rancher System Agent](https://github.com/rancher/system-agent) enable Rancher Manager to fully control Elemental clusters, from the installation and management of the OS on the Nodes to the provisioning of new K3s or RKE2 clusters in a centralized way.
 
 Follow our [Quickstart](https://rancher.github.io/elemental/quickstart/) or see the [full docs](https://rancher.github.io/elemental/) for more info.
+
+## License
+
+Copyright (c) 2020-2024 [SUSE, LLC](http://suse.com)
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+[http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

_service

@@ -7,13 +7,11 @@
     <param name="extract">README.md</param>
     <param name="extract">.obs/specfile/elemental.spec</param>
     <param name="extract">.obs/specfile/elemental-rpmlintrc</param>
-    <param name="revision">main</param>
+    <param name="revision">v2.1.x</param>
-    <param name="versionformat">@PARENT_TAG@+git%cd.%h</param>
+    <param name="versionformat">@PARENT_TAG@</param>
-    <param name="versionrewrite-pattern">v([^-]+)-?.*(\+git.*)</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="versionrewrite-replacement">\1\2</param>
-    <param name="changesgenerate">enable</param>
   </service>
-  <service name="set_version" mode="buildtime">
+  <service name="set_version" mode="manual">
     <param name="basename">elemental</param>
   </service>
 </services>

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/rancher/elemental</param>
-              <param name="changesrevision">ab6d5a59029eebacec4019878605ce6e83c4a5c3</param></service></servicedata>
+              <param name="changesrevision">14a106c8c2450b2b77f6af324f137b432fa8bf01</param></service></servicedata>

elemental.changes

@@ -1,10 +1,15 @@
 -------------------------------------------------------------------
-Fri Feb 09 10:33:18 UTC 2024 - kkaempf@suse.com
+Wed Mar 13 20:24:13 UTC 2024 - David Cassany <dcassany@suse.com>
 
-- Update to version 2.1.0+git20240208.ab6d5a5:
+- Bump to v2.1.0
-  * Add BuildName and fix BuildTags for SLE Micro container builds
+  * Micro rename
-  * Fix the naming
+  * Only apply upgrade config on OS upgrades (#1283)
-  * Make elemental-toolkit dependency constrained to a specific version range
+  * Require elemental-toolkit v2
+  * Adding the btrfs default at elemental-operator level
+  * Enable recovery upgrades (#1226)
+  * Set transient recovery hostname
+  * Update all Golang dependencies
+  * Adapt bootargs file to support btrfs snapshotter (#1213)
   * Adapt upgrade script to the new elemental-toolkit
   * Don't set the hostname (#1171)
   * Make use of the update elemental kernel arguments
@@ -13,168 +18,13 @@ Fri Feb 09 10:33:18 UTC 2024 - kkaempf@suse.com
   * Make sure no variables in /etc/os-release are duplicated
   * Build RT flavour only for x86_64
   * Use Elemental systemd branding package
-  * Include all OBS packages pulling sources from this repository
-  * Update copyright to 2024 (for golangci-lint)
-  * Use per-flavor Dockerfiles
   * Update kernel cmdline for elemental-sysroot (#1165)
   * Use the elemental-rootfs feature (#1163)
-  * Rename systemd-presets-branding-SLE-Micro-for-Rancher to systemd-presets-branding-Elemental
-  * Mention elemental-rpmlintrc as Source in spec
   * Run services after time-sync.target
-  * drop kpartx and sg3_utils
-  * Update copyright to 2024
-  * Update copyright to 2024
-  * drop "for Rancher" from grub entry
-  * Make x86_64 specific grub packages explicit
-  * Install NetworkManager-branding-SLE
-  * drop rpm-ndb from non-flavored image
-  * Add all the packages that were part of Elemental 5.4
-  * Add openssh-server
-  * Add iputils
-  * build(deps): bump golang.org/x/crypto from 0.14.0 to 0.17.0 in /tests
-  * Use the backwards compatible  /run/cos/active_mode
-  * Revert to 'old' RPi firmware
   * Mkdir /host/run/elemental in suc-upgrade
   * Migrate to /run/elemental from /run/cos
   * Add default network configuration for eth0
   * Remove default serial console kernel parameter
-  * Remove unused Dockerfile
-  * Ensure the base iso name follows the OBS pattern
-  * For some reason OBS complains of invalid format on SOURCEURL substitution
-  * Update workflow so that it branches the appropriate OBS packages
-  * Adding missing manifest for the base-iso image
-  * Align and update labels and tags with all images
-  * Remove obsolete images, sle micro variants are already in place
-  * Rename build-iso-next
-  * Remove longhorn overlay mount
-  * Drop the 'for Rancher' suffix
-  * Revert to 'old' RPi firmware
-  * Set entrypoint of elemental-iso-add-registration
-  * Fix SLEM4R OS build
-  * Update elemental-iso-add-registration
-  * Remove some old teal references
-  * Remove Teal images
-  * tag with %VERSION%
-  * Update OBS worflow to SLEM4R images
-  * Multi-flavored OS build
-  * trigger VRs
-  * Bump ele-testhelpers deps
-  * Introduce "base" variant of SLE-Micro-for-Rancher
-  * Cleanup duplicate rpm install
-  * Few renfinements to the slem4r-os image
-  * Bump go deps
-  * Remove build of artifacts
-  * Bump go deps
-  * Include system agent unit file in specfile
-  * Fix image/iso build - part 2
-  * Fix image/iso build
-  * Require elemental-toolkit instead of elemental-cli (#984)
-  * Add elemental-register-reset.service
-  * Use the new init command (#874)
-  * Disable service triggers on staging
-  * Use raspberrypi-firmware-uefi for Raspberry Pi
-  * Fix elemental-iso-add-registration script
-  * Add SLE-Micro-Rancher to OBS trigger services
-  * Add SLE-Micro-Rancher Dockerfile for buildservice automation
-  * Add build-iso-next to OBS workflow
-  * Fix elemental-register systemd service
-  * Keep elemental-iso subdir for now
-  * rancher/ -> suse/
-  * Fork teal-iso to slem4r-iso to build against SLE Micro 5.5
-  * Package elemental-register-install.service
-  * Use elemental-register --install argument (#934)
-  * Drop the need of the builder image, use the OS itself for that
-  * Update dev channel URL
-  * Dynamically set the URL template based on the build env
-  * Update container URLs in CI
-  * Update OBS workflow to the current project setup
-  * Make SLE Micro version references dynamic (#914)
-  * Bump go deps
-  * e2e/ui: bump cypress library to 1.0.6 (#930)
-  * Bump go deps
-  * Drop systemd_pre
-  * Allow installation on non-SUSE distributions
-  * e2e/ui fix extension installation in head (#920)
-  * Improve registration on already installed systems (#906)
-  * Update CONTRIBUTING.md
-  * Update CONTRIBUTING to what Fleet uses
-  * Add CONTRIBUTING.md
-  * Fix copyright on some files
-  * Run elemental register at each boot (#890)
-  * Keep systemd status check even when FORCE is in use
-  * FORCE flag skips all sanity checks on upgrades
-  * Switch supportlevel to "l3"
-  * suc-upgrade: allow OS upgrades on hosts with failed systemd units
-  * suc-upgrade/trivial: fix tab spacing
-  * add-registration: clean up upon abort
-  * Don't use wget in elemental-iso-add-registration (#641)
-  * Move _constraints into Dockerfile
-  * Include podman
-  * Ask for 16GB of main memory
-  * Apply suggestions from code review
-  * Enable cloud-config from removable devices
-  * Ensure names are unique for all stages
-  * Bump go-version and deps (#823)
-  * Do not compare versions from different repositories on upgrades
-  * Include build-iso in OBS workflow
-  * Add containerized ISO image
-  * Only allow upgrades on active system (#784)
-  * Feat: add CODEOWNERS
-  * Load proxy setup from sysconfig and allow elemental specific env variables
-  * Include cryptsetup in elemental-teal
-  * Do not expand COS_PERSISTENT by default
-  * Add environment variable files in elemental-system-agent.service
-  * Run elemental-register in systemd service (#723)
-  * Fix small typo
-  * Include rke2-killall on shutdown process
-  * Update shutdown-k3s.service
-  * Prevent upgrade loops when FORCE is in use
-  * Do not allow downgrades without force flag
-  * Remove reboots on cloud-config addition
-  * Do not allow concurrent suc-upgrade executions
-  * Fix copyright date range
-  * Update docker/login-action to v2.1.0 (#666)
-  * Remove branch filter on OBS workflow for tag events
-  * e2e ui: allow to choose elemental ui version
-  * Fix typo
-  * Remove cloud-config/upgrade_grub_hook package (#657)
-  * Add shutdown-k3s.service to OBS spec
-  * Add service to kill k3s before umount
-
--------------------------------------------------------------------
-Tue Jan 16 14:10:58 UTC 2024 - dcassany@suse.com
-
-  * Make x86_64 specific grub packages explicit
-  * Install NetworkManager-branding-SLE
-  * Add iputils
-  * Use per-flavor Dockerfiles
-
--------------------------------------------------------------------
-Mon Jan 08 16:01:27 UTC 2024 - kkaempf@suse.com
-
-- Update copyright to 2024 (for golangci-lint)
-- Mention elemental-rpmlintrc as Source in spec
-
--------------------------------------------------------------------
-Fri Dec 15 12:00:55 UTC 2023 - dcassany@suse.com
-
-- Update to version 2.0.2:
-  * Revert to 'old' RPi firmware
-
--------------------------------------------------------------------
-Tue Dec 12 18:05:19 UTC 2023 - David Cassany <dcassany@suse.com>
-
-- Update to version 2.0.1 
-
--------------------------------------------------------------------
-Tue Dec 05 11:16:21 UTC 2023 - dcassany@suse.com
-
-* Remove default serial console kernel parameter
-
--------------------------------------------------------------------
-Fri Dec 01 13:29:33 UTC 2023 - dcassany@suse.com
-
-* Ensure the base iso name follows the OBS pattern
 
 -------------------------------------------------------------------
 Tue Nov 28 17:26:41 UTC 2023 - dcassany@suse.com
@@ -194,20 +44,8 @@ Tue Nov 28 17:26:41 UTC 2023 - dcassany@suse.com
   * Update elemental-iso-add-registration
   * Remove some old teal references
   * Remove Teal images
-  * tag with %VERSION%
-  * Update OBS worflow to SLEM4R images
-  * Multi-flavored OS build
-  * trigger VRs
   * Bump ele-testhelpers deps
-  * Introduce "base" variant of SLE-Micro-for-Rancher
-  * Cleanup duplicate rpm install
-  * Few renfinements to the slem4r-os image
-  * Bump go deps
-  * Remove build of artifacts
-  * Bump go deps
   * Include system agent unit file in specfile
-  * Fix image/iso build - part 2
-  * Fix image/iso build
   * Require elemental-toolkit instead of elemental-cli (#984)
 
 -------------------------------------------------------------------
@@ -217,72 +55,27 @@ Tue Nov 28 17:26:14 UTC 2023 - dcassany@suse.com
   * Add elemental-register-reset.service
   * Use the new init command (#874)
   * Disable service triggers on staging
-  * Use raspberrypi-firmware-uefi for Raspberry Pi
   * Fix elemental-iso-add-registration script
-  * Add SLE-Micro-Rancher to OBS trigger services
-  * Add SLE-Micro-Rancher Dockerfile for buildservice automation
-  * Add build-iso-next to OBS workflow
-  * Fix elemental-register systemd service
-  * Keep elemental-iso subdir for now
   * rancher/ -> suse/
-  * Fork teal-iso to slem4r-iso to build against SLE Micro 5.5
-  * Package elemental-register-install.service
   * Use elemental-register --install argument (#934)
-  * Drop the need of the builder image, use the OS itself for that
-  * Update dev channel URL
-  * Dynamically set the URL template based on the build env
-  * Update container URLs in CI
-  * Update OBS workflow to the current project setup
-  * Make SLE Micro version references dynamic (#914)
-  * Bump go deps
-  * e2e/ui: bump cypress library to 1.0.6 (#930)
-  * Bump go deps
-  * Drop systemd_pre
   * Allow installation on non-SUSE distributions
-  * e2e/ui fix extension installation in head (#920)
-  * Improve registration on already installed systems (#906)
-  * Update CONTRIBUTING.md
-  * Update CONTRIBUTING to what Fleet uses
   * Add CONTRIBUTING.md
-  * Fix copyright on some files
-  * Run elemental register at each boot (#890)
-  * Keep systemd status check even when FORCE is in use
-  * FORCE flag skips all sanity checks on upgrades
-  * Switch supportlevel to "l3"
-  * suc-upgrade: allow OS upgrades on hosts with failed systemd units
-  * suc-upgrade/trivial: fix tab spacing
-  * add-registration: clean up upon abort
-  * Don't use wget in elemental-iso-add-registration (#641)
-  * Move _constraints into Dockerfile
-  * Include podman
-  * Ask for 16GB of main memory
-  * Apply suggestions from code review
   * Enable cloud-config from removable devices
   * Ensure names are unique for all stages
-  * Bump go-version and deps (#823)
   * Do not compare versions from different repositories on upgrades
-  * Include build-iso in OBS workflow
-  * Add containerized ISO image
-  * Only allow upgrades on active system (#784)
   * Feat: add CODEOWNERS
   * Load proxy setup from sysconfig and allow elemental specific env variables
   * Include cryptsetup in elemental-teal
   * Do not expand COS_PERSISTENT by default
   * Add environment variable files in elemental-system-agent.service
   * Run elemental-register in systemd service (#723)
-  * Fix small typo
   * Include rke2-killall on shutdown process
   * Update shutdown-k3s.service
   * Prevent upgrade loops when FORCE is in use
   * Do not allow downgrades without force flag
   * Remove reboots on cloud-config addition
   * Do not allow concurrent suc-upgrade executions
-  * Fix copyright date range
   * Update docker/login-action to v2.1.0 (#666)
-  * Remove branch filter on OBS workflow for tag events
-  * e2e ui: allow to choose elemental ui version
-  * Fix typo
-  * Remove cloud-config/upgrade_grub_hook package (#657)
   * Add shutdown-k3s.service to OBS spec
   * Add service to kill k3s before umount
 
@@ -290,7 +83,6 @@ Tue Nov 28 17:26:14 UTC 2023 - dcassany@suse.com
 Tue Nov 28 17:19:29 UTC 2023 - dcassany@suse.com
 
 - Update to version 1.1.0+git20230125.14a106c:
-  * e2e/ui: replace .xterm-cursor-layer in Cypress (#636)
   * Add debug flag on upgrade command and update bootargs.cfg file (#625)
 
 -------------------------------------------------------------------

elemental.spec

@@ -19,7 +19,7 @@
 %define oemdir %{systemdir}/oem
 
 Name:           elemental
-Version:        2.1.0+git20240208.ab6d5a5
+Version:        2.1.0
 Release:        0
 Summary:        A Rancher and Kubernetes optimized immutable Linux distribution
 License:        Apache-2.0
@@ -30,8 +30,8 @@ Source1:        LICENSE
 Source2:        README.md
 Source3:        %{name}-rpmlintrc
 
-Requires:       elemental-toolkit >= 1.3.0
+Requires:       elemental-toolkit >= 2.0.0
-Requires:       elemental-toolkit < 1.4.0
+Requires:       elemental-toolkit < 2.1.0
 Requires:       elemental-register
 Requires:       elemental-system-agent
 Requires:       elemental-support