Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Elemental validation and improvements when using SL Micro 6.0 #549

Merged
merged 10 commits into from
Sep 24, 2024

Conversation

dbw7
Copy link
Contributor

@dbw7 dbw7 commented Aug 28, 2024

This PR changes the way Elemental is handled depending on the API Version of the image definition. The reason being: 1.1 only supports SL Micro 6.0 and 1.0 only supports 5.5 so we can operate under that assumption when working with Elemental.

What happens now is that when using 1.0, the Elemental handling is the same and it uses the repositories found in artifacts.yaml, however, when using 1.1, those repositories are no longer used and instead the necessary Elemental packages are found through RPM resolution inside of the SL Micro 6.0 image. This now means that when using Elemental with 6.0, you need to specify a package registration code.

Additionally, to supplement this, I added validation for the Elemental configuration directory and for the registration code.

@dbw7 dbw7 requested review from atanasdinov and jdob August 28, 2024 03:12
Copy link
Contributor

@atanasdinov atanasdinov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussed offline - only putting out the conclusions for visibility.

  1. Switching up Elemental source requires a change to artifacts.yaml which also means some of the code here could (or would) be removed
  2. Elemental RPMs shipped with SL Micro 6.0 are not latest yet and we're unable to rely on them at this point in time
  3. Validating empty directories should be part of Empty directory checks (such as custom scripts/files and rpms) should occur at validation, not build #276

@jdob
Copy link
Contributor

jdob commented Sep 9, 2024

Quick update: The proper RPMs are now available in the SL Micro 6.0 repo, so concern #2 from Atanas' comment is addressed.

Copy link
Contributor

@atanasdinov atanasdinov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like this must land at this point... There's still no response from the ECM team.

pkg/eib/eib.go Outdated Show resolved Hide resolved
pkg/image/validation/elemental.go Outdated Show resolved Hide resolved
pkg/image/validation/elemental.go Outdated Show resolved Hide resolved
pkg/image/validation/elemental_test.go Outdated Show resolved Hide resolved
pkg/image/validation/elemental_test.go Outdated Show resolved Hide resolved
pkg/image/validation/elemental_test.go Outdated Show resolved Hide resolved
pkg/image/validation/elemental.go Show resolved Hide resolved
pkg/image/validation/elemental_test.go Outdated Show resolved Hide resolved
pkg/image/validation/elemental_test.go Outdated Show resolved Hide resolved
@atanasdinov
Copy link
Contributor

Please drop the unused properties from artifacts.yaml.

RELEASE_NOTES.md Outdated
@@ -9,6 +9,8 @@
* Added the ability to automatically copy files into the built images filesystem (see Image Configuration Directory Changes below)
* Kubernetes manifests are now applied in a systemd service instead of using the `/manifests` directory
* Helm chart installation backOffLimit changed from 1000(default) to 20
* Improved Elemental handling when using SL Micro 6.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we rephrase this and move it to the API section below? Elemental configuration now requires a registration code in order to install the necessary RPMs from the official sources or something similar.

@dbw7 dbw7 merged commit d0a8af1 into suse-edge:main Sep 24, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants