diff --git a/_service b/_service
index cf40ea2..064ad4a 100644
--- a/_service
+++ b/_service
@@ -3,9 +3,9 @@
https://github.com/rancher/elemental-operator
git
.git
- v1.4.x
+ v1.6.x
@PARENT_TAG@
- v(.*)
+ v([^-]*)-?.*
enable
.obs/specfile/elemental-operator.spec
diff --git a/_servicedata b/_servicedata
index f08e477..8c7e5ad 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/rancher/elemental-operator
- ae63231155c830181e2dddafadae9f7a0908ce1f
\ No newline at end of file
+ 9020287b764a91ec99a85b788ad3fcc74fac6986
\ No newline at end of file
diff --git a/elemental-operator-1.4.1.obscpio b/elemental-operator-1.4.1.obscpio
deleted file mode 100644
index bb311dd..0000000
--- a/elemental-operator-1.4.1.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6ec109e7c1a2d7927c80603d4b3f0cd484010bd9f62eb557a18e9d7d318d82fd
-size 62966798
diff --git a/elemental-operator-1.6.0.obscpio b/elemental-operator-1.6.0.obscpio
new file mode 100644
index 0000000..ca2bdf3
--- /dev/null
+++ b/elemental-operator-1.6.0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fca7fc1294618d0d82bf9e260066f199b83daed9d044b3f67662e68a1774db9a
+size 68938254
diff --git a/elemental-operator.changes b/elemental-operator.changes
index 28a8b7d..7e29d34 100644
--- a/elemental-operator.changes
+++ b/elemental-operator.changes
@@ -1,45 +1,131 @@
-------------------------------------------------------------------
-Fri Jan 5 15:15:05 UTC 2024 - Klaus Kämpf
+Fri Apr 05 09:11:23 UTC 2024 - dcassany@suse.com
-- ExclusiveArch x86_64 and aarch64 (bsc#1218560)
+- Update to version 1.6.0:
+ * chart: fix label typo (#696)
+ * unit-tests: minor cleanups
+ * unit-test: add register tests
+ * unit-tests: add coverage for seedimage API
+ * chart: add chart name and version to the operator deployment (#694)
-------------------------------------------------------------------
-Tue Dec 12 18:07:48 UTC 2023 - David Cassany
+Fri Mar 22 13:41:46 UTC 2024 - dcassany@suse.com
-- Update to version 1.4.1
+- Update to version 1.5.0:
+ * Micro rename (#684)
+ * elemental-operator registration cleanups (#689)
+ * Sanitize elemental-operator dependencies (#690)
+ * github actions: add airgap script test
+ * [Airgap] minor: fix debug message
+ * [Airgap] add script tests
+ * Bump docker/setup-buildx-action from 3.1.0 to 3.2.0
+ * Bump docker/login-action from 3.0.0 to 3.1.0
+ * Bump docker/build-push-action from 5.2.0 to 5.3.0
+ * Add extension to seedimage url (#682)
+ * registration: allow dots in machineInventory names
+ * registration: decouple replacing data-labels from sanitizing strings
+ * registration: move sanitize code in sanitizeString()
+ * Fix ManagedOSImage cloudConfig (#671)
+ * New name is elemental-rootfs
+ * Use /run/elemental and elemental- services (#675)
+ * Update github.com/golang/protobuf
+ * Run make vendor
+ * Bump google.golang.org/protobuf from 1.31.0 to 1.33.0
+ * Bump docker/build-push-action from 5.1.0 to 5.2.0
-------------------------------------------------------------------
-Tue Dec 12 09:28:48 UTC 2023 - dcassany@suse.com
+Wed Mar 13 21:07:12 UTC 2024 - dcassany@suse.com
-* Always pull channel image on channel sync
-* Fix channel sync bug
-
--------------------------------------------------------------------
-Tue Dec 05 10:43:43 UTC 2023 - dcassany@suse.com
-
-* Avoid repeating package name in summary
-
--------------------------------------------------------------------
-Mon Dec 04 16:24:13 UTC 2023 - dcassany@suse.com
-
-* Make summary start with a capital letter
-
--------------------------------------------------------------------
-Wed Nov 29 10:24:24 UTC 2023 - dcassany@suse.com
-
-- Update to version 1.4.0+git20231129.c7f1dc1:
- * Add slem4r images in channel (#544)
+- Update to version 1.5.0-dev:
+ * [Airgap] fix channel.json extraction (#669)
+ * [Airgap] fix "channel.image"/"channel.repository" value in "next steps" (#665)
+ * Align DrainSpec to system-upgrade-controller defaults (#668)
+ * operator/Dockerfile: tag IMAGE_REPO with :latest
+ * seedimage: add tag to IMG_REPO
+ * Dockerfile: SLE_VERSION -> SLEMICRO_VERSION
+ * operator: switch to toolbox for ALP
+ * seedimage: switch labelprefix to com.suse.elemental
+ * seedimage: Switch to toolbox for ALP
+ * Drain nodes by default on upgrade (#660)
+ * [Airgap] fix missing return code value
+ * [Airgap] Use bash test syntax
+ * [Airgap] make the script work with both legacy and newer charts
+ * [Airgap] fix the airgap script
+ * Tagging v1.5.0
+ * Enable ManagedOSImage updates (#658)
+ * Review omitempty flag on API json converter
+ * charts: backport changes from Rancher Marketplace chart (#652)
+ * Make snapshotter configurable (#651)
+ * [Airgap] fix the airgap script (#654)
+ * Bump docker/setup-buildx-action from 3.0.0 to 3.1.0
+ * [Airgap] add support to Hauler in the airgap script (#647)
+ * Fix channel synchronization
+ * Bump docker/metadata-action from 4.1.1 to 5.5.1
+ * Requeue reconcile loop for ongoing synchronizations
+ * elemental-register: collect OS data for MachineInventories annotations (#642)
+ * Bump go to 1.22 (#643)
+ * Make channel sync more robust (#638)
+ * Makefile/setup-full-cluster: build seedimage-builder image too (#639)
+ * Makefile: fix commit date for local builds (#631)
+ * Requeue after 1 second in case of failures
+ * Recover on syncer pod creation failures
+ * Bump docker/build-push-action from 3.2.0 to 5.1.0
+ * Bump docker/setup-buildx-action from 2.2.1 to 3.0.0
+ * Bump golangci/golangci-lint-action from 3 to 4
+ * Bump github/codeql-action from 2 to 3
+ * Update system-upgrade-controller test version (#630)
+ * Add dev baseimage build (#619)
+ * Test against k8s v1.27, rancher v2.8.2, and upgrade all test dependendencies (#628)
+ * Use go 1.20
+ * Use rancher/yip v1.4.10
+ * Use go.mod ginkgo version
+ * SeedImage builder arguments in wrong order
+ * Use newer xorriso (#624)
+ * Bump codecov/codecov-action from 3 to 4
+ * Bump docker/login-action from 2.1.0 to 3.0.0
+ * Bump actions/dependency-review-action from 2 to 4
+ * Update actions/labeler config
+ * Make linter happy
+ * Bump actions/labeler from 4 to 5
+ * README: drop legacy docs (#616)
+ * Add dependabot config for actions
+ * Bump github actions
+ * Do not adopt machineinventories undergoing deletion/reset (#605)
+ * Update seedimage build-disk command
+ * Fix inversed reset options (#604)
+ * Print system architecture (#603)
+ * hostname: set the hostname on the newer location too
+ * Charts/Makefile: fix default OS channel repo name (#594)
+ * Add hostname to system-data
+ * Add elemental-seedimage-hooks package (#592)
+ * Restrict package arch to x86_64 and aarch64
+ * Update copyright year (2024)
+ * Update copyright year (2024)
+ * Change raw SeedImage deploy-command
+ * Add target platform validation test
+ * Add kubebuilder example and validation
+ * Add TargetPlatform to SeedImageSpec
+ * Fix default values in questions.yaml file
+ * Bump golang.org/x/crypto to 0.17.0
+ * Add disable-boot-entry flag to reset command
+ * Always pull channel image on channel sync
+ * Fix channel sync bug
+ * Avoid repeating package name in summary
+ * Make summary start with a capital letter
* Unify all chart files under .obs/charfile
-
--------------------------------------------------------------------
-Tue Nov 28 17:39:40 UTC 2023 - dcassany@suse.com
-
-- Update to version 1.4.0+git20231127.55a37d4:
* Add warning if both device and device-selector set
+ * Add grub package to seedimage built in OBS (#568)
* Fix device-selector logic (#571)
- * Implement picking dynamic installation device (#561)
* Add missing questions.yaml file
+ * Implement picking dynamic installation device (#561)
+ * Build raw disk images in SeedImage (#557)
* charts: fix annotations (#566)
+ * ci: fix SeedImage builder used image
+ * Bump github.com/docker/docker from 20.10.24+incompatible to 24.0.7+incompatible (#560)
+ * Update google.golang.org/grpc to v1.56.3
+ * Keep old output-name
+ * Add slem4r images in channel (#544)
+ * Bring your own SeedImage builder (#542)
* Make sure to not overlap with the already existing channel and use RT for tests
* Remove use of images from quay.io
* Prevent installing if previous CRDs are pending to be removed
diff --git a/elemental-operator.obsinfo b/elemental-operator.obsinfo
index 134ad97..4aa48eb 100644
--- a/elemental-operator.obsinfo
+++ b/elemental-operator.obsinfo
@@ -1,4 +1,4 @@
name: elemental-operator
-version: 1.4.1
-mtime: 1702373128
-commit: ae63231155c830181e2dddafadae9f7a0908ce1f
+version: 1.6.0
+mtime: 1712244903
+commit: 9020287b764a91ec99a85b788ad3fcc74fac6986
diff --git a/elemental-operator.spec b/elemental-operator.spec
index 0637e1d..2fa671b 100644
--- a/elemental-operator.spec
+++ b/elemental-operator.spec
@@ -1,7 +1,7 @@
#
# spec file for package elemental-operator
#
-# Copyright (c) 2022 - 2024 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: elemental-operator
-Version: 1.4.1
+Version: 1.6.0
Release: 0
Summary: Kubernetes operator to support OS management
License: Apache-2.0
@@ -26,6 +26,7 @@ URL: https://github.com/rancher/%{name}
Source: %{name}-%{version}.tar
Source1: %{name}.obsinfo
+# go-tpm-tools aren't _that_ portable :-(
ExclusiveArch: x86_64 aarch64
BuildRequires: gcc-c++
@@ -35,7 +36,7 @@ BuildRequires: make
BuildRequires: grep
%if 0%{?suse_version}
-BuildRequires: golang(API) >= 1.20
+BuildRequires: golang(API) >= 1.22
BuildRequires: golang-packaging
%{go_provides}
%else
@@ -44,14 +45,17 @@ BuildRequires: golang-packaging
%global commit 25abcdc57b9409d4c5b2009cf0a2f9aa6ff647ad
%gometa
%if (0%{?centos_version} == 800) || (0%{?rhel_version} == 800)
-BuildRequires: go1.20
+BuildRequires: go1.22
%else
-BuildRequires: compiler(go-compiler) >= 1.20
+BuildRequires: compiler(go-compiler) >= 1.22
%endif
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%define systemdir /system
+%define oemdir %{systemdir}/oem
+
%package -n elemental-register
Summary: The registration client
@@ -77,6 +81,12 @@ Summary: Simple http server
%description -n elemental-httpfy
httpfy starts a simple http server, serving files from the current dir.
+%package -n elemental-seedimage-hooks
+Summary: Hooks used in SeedImage builder
+
+%description -n elemental-seedimage-hooks
+Hooks used in SeedImage builder to copy firmware when building disk-images.
+
%prep
%setup -q -n %{name}-%{version}
cp %{S:1} .
@@ -118,6 +128,10 @@ make httpfy
%{__install} -m 755 build/elemental-support %{buildroot}%{_sbindir}
%{__install} -m 755 build/elemental-httpfy %{buildroot}%{_sbindir}
+# hooks
+mkdir -p %{buildroot}%{oemdir}
+%{__install} -m 755 hooks/*.yaml %{buildroot}%{oemdir}/
+
%files
%defattr(-,root,root,-)
%license LICENSE
@@ -139,4 +153,11 @@ make httpfy
%license LICENSE
%{_sbindir}/elemental-httpfy
+%files -n elemental-seedimage-hooks
+%defattr(-,root,root,-)
+%license LICENSE
+%dir %{systemdir}
+%dir %{oemdir}
+%{oemdir}/*
+
%changelog