From fddc35d878cdae2e1565ce4c9a7d270a6c06d70c2b2174deeb621190bf0690e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 11 Oct 2024 10:01:03 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main elemental-operator revision 16a388b711339a1615d38aa73ba42e5e --- _scminfo | 5 ++ _service | 16 ------ _servicedata | 4 -- elemental-operator-1.6.4.obscpio | 3 -- elemental-operator.changes | 87 ++++++++++++++++++++++++++++++++ elemental-operator.obsinfo | 4 -- elemental-operator.spec | 27 ++++++---- elemental-operator.tar.xz | 3 ++ 8 files changed, 113 insertions(+), 36 deletions(-) create mode 100644 _scminfo delete mode 100644 _service delete mode 100644 _servicedata delete mode 100644 elemental-operator-1.6.4.obscpio delete mode 100644 elemental-operator.obsinfo create mode 100644 elemental-operator.tar.xz diff --git a/_scminfo b/_scminfo new file mode 100644 index 0000000..3b30606 --- /dev/null +++ b/_scminfo @@ -0,0 +1,5 @@ +tag: v1.7.0 +mtime: 1728310810 +commit: 71b679dd15960b9d11f2f7c58b9ec7e735d6dc37 +versionRPM: 1.7.0 +versionOCI: 1.7.0 diff --git a/_service b/_service deleted file mode 100644 index 94dd809..0000000 --- a/_service +++ /dev/null @@ -1,16 +0,0 @@ - - - https://github.com/rancher/elemental-operator - git - .git - v1.6.x - @PARENT_TAG@ - v([^-]*)-?.* - enable - .obs/specfile/elemental-operator.spec - - - - elemental-operator - - diff --git a/_servicedata b/_servicedata deleted file mode 100644 index 87de60c..0000000 --- a/_servicedata +++ /dev/null @@ -1,4 +0,0 @@ - - - https://github.com/rancher/elemental-operator - c6411a4e1dfe3564bdfd59c4ab7f594ea8fc3771 \ No newline at end of file diff --git a/elemental-operator-1.6.4.obscpio b/elemental-operator-1.6.4.obscpio deleted file mode 100644 index fd891a4..0000000 --- a/elemental-operator-1.6.4.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:68ba6db6da7e84a4d11dba687e27f9d985761eae841aa6a579529b8ccde8c559 -size 68946958 diff --git a/elemental-operator.changes b/elemental-operator.changes index bbceb62..10972b3 100644 --- a/elemental-operator.changes +++ b/elemental-operator.changes @@ -1,3 +1,90 @@ +------------------------------------------------------------------- +Mon Oct 7 14:20:10 UTC 2024 - Elemental Bot + +- Update to v1.7.0: + * 71b679dd Add support for agent-tls-mode Rancher setting (#863) + +------------------------------------------------------------------- +Tue Oct 1 12:54:40 UTC 2024 - Elemental Bot + +- Update to v1.7.0-rc1: + * 08f6cda7 Build e2e chart locally (#852) + * 4e313f7d charts: drop chart version from resource labels (#854) + * 57022860 [Airgap] Fix script to support Dev and Staging + * 3df501da Allow configuration of max snapshots during install (#851) + * 7ba0a1e7 Update helper scripts to 1.6.x channel setup (#850) + * 60808bfe Label Templates: render also machineInventoryAnnotations (#848) + * c9223009 label templates: drop spaces from Storage variables (#847) + * e6bca47c Switch to git based repository in OBS (#845) + * cdb34aa7 Update questions to use SL Micro 6.0 channels + * 723d7c3e Label Templates: rework collection of 'hostinfo' data and + collected variables (#843) + * 9e42b199 register: add 'version' and 'dumpdata' subcommands (#835) + * 198628f8 operator: add Registry to ManagedOSVersionChannels Spec (#831) + * 122109f7 Random template labels - avoid override (#830) + * 0899ba29 Add SeedImage.status.checksumURL (#827) + * 488ad0d8 [Airgap] fix channel extraction for 1.7 version + * b7f70897 Fix flaky network test (#825) + * 3de0fc7a Use after-install && after-reset stages to initialize system + (#822) + * d857bda0 Implement Network Configurators (nmc, nmstate, nmconnections) + (#819) + * d8bcf740 operator: add built-in 'Random' label templates (#821) + * e4c75194 networking: use the main registration websocket channel for + network data (#820) + * 2858dad9 error strings should not be capitalized (ST1005) (#814) + * 3f185597 Bandaid local build (#818) + * 342bba26 IPAM to nmstate network config (#793) + * 717c575d Add new Micro 6.0 channels (#817) + * 36468aba register: always register when called (#813) + * 6681ea5f operator: rework label templating (#808) + * 05b6a19d Enable PR workflow for v1.6 maintenance branch + * d280e617 Implement Enabled field on ManagedOSVersionChannels (#800) + * b8664194 [Airgap] fix unstable channel extraction + * d7a712d3 Update channels (#781) + * 0f59b146 Check crds chart is aligned with the main operator chart version + * bd959421 Workaround []byte equality check (#788) + * d80c1ab0 Add the new default channel + * f92a2de2 Block reinstall if crds are still pending to be deleted (#784) + * 6ee9211a Add development channel for OBS builds + * b18ff864 Add managedosversion finalizer (#775) + * d07b4f5f Add toggle to automatically delete no longer in sync versions + (#780) + * 27a785ea Remove flaky checksum test (#774) + * 56185938 Use dynamic system agent applied dir (#763) + * 61e76e29 Ensure re-sync is triggered + * 7227947d operator: always update managedosversionchannel last sync time + (#772) + * 5ccde141 operator: fix ManagedOSVersionChannel sync (#769) + * c9099037 Use YAML content for Elemental Agent config (#765) + * 2c3f177f Revert "CI: fix CodeQL test (#655)" (#663) + * 0939fb06 Update deployment.yaml (#757) + * 9c8550fd Allow yip configs (#751) + * abbc0eae Flag no longer in sync ManagedOSVersions (#750) + * bc2f5cfc Let elemental-register digest system hardware data (#748) + * 3379c85c register: don't send new Disks and Controllers data (#741) + * 7f8f2e8b Remove CodeCov action (#738) + * 7c71dc9d Added the ability to create a node reset marker for unmanaged + hosts (#731) + * ccdd2044 Update golang.org/x/net to v0.23.0 (#734) + * 2bd467f3 Allow cross build of seed-image ISOs (#728) + * 9a93cc91 Prevent system-upgrade-controller from using dotted names + * 35366160 chart: fix upstream-version metadata + * 5f2b96c2 seedimage: clean-up service on image download deadline (#719) + * ca0ed22f chart: add chart name and version to the operator deployment + (#694) + * a147e8a2 chart: add customizable security-context (#716) + * 8038dc68 Add Metadata CRD (#712) + * 05abb222 Update .obs/helper_scripts/README.md + * e2e9ac4e fine tune checkoimages.sh script + * 1e262561 Add scripts to list and check images from the registry + * a43c150c seedimage: use ClusterIP Services (#709) + * 47516fde Add dmidecode as Recommends to elemental-register (#702) + * 9020287b chart: fix label typo (#696) + * f5d9c70b unit-tests: minor cleanups + * dae5f912 unit-test: add register tests + * 695904cd unit-tests: add coverage for seedimage API + ------------------------------------------------------------------- Thu Aug 08 10:07:24 UTC 2024 - dcassany@suse.com diff --git a/elemental-operator.obsinfo b/elemental-operator.obsinfo deleted file mode 100644 index c93277f..0000000 --- a/elemental-operator.obsinfo +++ /dev/null @@ -1,4 +0,0 @@ -name: elemental-operator -version: 1.6.4 -mtime: 1723107524 -commit: c6411a4e1dfe3564bdfd59c4ab7f594ea8fc3771 diff --git a/elemental-operator.spec b/elemental-operator.spec index e0e661f..58967e8 100644 --- a/elemental-operator.spec +++ b/elemental-operator.spec @@ -15,16 +15,17 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define commit 71b679dd15960b9d11f2f7c58b9ec7e735d6dc37 +%define c_date 20241007 Name: elemental-operator -Version: 1.6.4 +Version: 1.7.0 Release: 0 Summary: Kubernetes operator to support OS management License: Apache-2.0 Group: System/Management URL: https://github.com/rancher/%{name} -Source: %{name}-%{version}.tar -Source1: %{name}.obsinfo +Source: %{name}.tar.xz # go-tpm-tools aren't _that_ portable :-( ExclusiveArch: x86_64 aarch64 @@ -88,8 +89,7 @@ Summary: Hooks used in SeedImage builder Hooks used in SeedImage builder to copy firmware when building disk-images. %prep -%setup -q -n %{name}-%{version} -cp %{S:1} . +%setup -q -n %{name} %build %if 0%{?suse_version} @@ -101,11 +101,20 @@ if [ "$(uname)" = "Linux" ]; then OTHER_LINKFLAGS="-extldflags -static -s" fi -export GIT_TAG=`echo "%{version}" | cut -d "+" -f 1` -GIT_COMMIT=$(cat %{name}.obsinfo | grep commit: | cut -d" " -f 2) +if [ "%{commit}" = "_replaceme_" ]; then + echo "No commit hash provided" + exit 1 +fi + +if [ "%{c_date}" = "_replaceme_" ]; then + echo "No commit date provided" + exit 1 +fi + +export GIT_TAG=$(echo "%{version}" | cut -d "+" -f 1) +GIT_COMMIT=$(echo "%{commit}") export GIT_COMMIT=${GIT_COMMIT:0:8} -MTIME=$(cat %{name}.obsinfo | grep mtime: | cut -d" " -f 2) -export COMMITDATE=$(date -d @${MTIME} +%Y%m%d) +export COMMITDATE="%{c_date}" # build binaries CGO_ENABLED=0 make operator diff --git a/elemental-operator.tar.xz b/elemental-operator.tar.xz new file mode 100644 index 0000000..241ca56 --- /dev/null +++ b/elemental-operator.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52e734d770acd6bfd31afbae523c4377524c569d22a37ff10203ef16e206e6d2 +size 6483920