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

blueprint: sshkey to users in images blueprint conversion #4363

Merged
merged 5 commits into from
Sep 17, 2024

Conversation

achilleas-k
Copy link
Member

@achilleas-k achilleas-k commented Sep 13, 2024

See osbuild/images#928 for reasoning.


go.mod: update osbuild/images to v0.87.0

Update osbuild/images to include:


blueprint: sshkey to users in images blueprint conversion

The sshkey customization in osbuild/images has been dropped. In
osbuild-composer we maintain it for backwards compatibility, converting
each to a user customization, which is a superset of the sshkey.


cloudapi: update expected image type test for gcp-rhui

gce-rhui is now gone from RHEL 9 [1] and the old name simply aliases to
gce. gcp-rhui in the cloudapi now resolves to 'gce' in RHEL 9 and
'gce-rhui' in RHEL 8.

[1] osbuild/images#857


Update osbuild/images to include:
- blueprint: remove the sshkey customization
  (osbuild/images#928).
- [RHEL-9] Drop RHSM and RHUI-specific config from Azure and EC2 images
  (COMPOSER-2308) (osbuild/images#857).
The sshkey customization in osbuild/images has been dropped.  In
osbuild-composer we maintain it for backwards compatibility, converting
each to a user customization, which is a superset of the sshkey.
gce-rhui is now gone from RHEL 9 [1] and the old name simply aliases to
gce.  gcp-rhui in the cloudapi now resolves to 'gce' in RHEL 9 and
'gce-rhui' in RHEL 8.

[1] osbuild/images#857
@achilleas-k achilleas-k force-pushed the images/rm/customizations/sshkey branch from 973fc8d to ae2f9fc Compare September 17, 2024 11:55
@achilleas-k achilleas-k requested a review from thozza September 17, 2024 11:56
@achilleas-k achilleas-k marked this pull request as ready for review September 17, 2024 11:56
@achilleas-k
Copy link
Member Author

  Running [/home/runner/golangci-lint-1.55.2-linux-amd64/golangci-lint run  --verbose --timeout 5m0s] in [/home/runner/work/osbuild-composer/osbuild-composer] ...
  Received 1485164 of 1485164 (100.0%), 1.4 MBs/sec
  go.mod:244:1: replacement are not allowed: github.com/osbuild/images (gomoddirectives)

https://github.com/osbuild/osbuild-composer/pull/4363/files?file-filters%5B%5D=.mod&show-viewed-files=true

😕

thozza
thozza previously approved these changes Sep 17, 2024
Copy link
Member

@thozza thozza left a comment

Choose a reason for hiding this comment

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

Thanks, LGTM!

There seems to be a caching issue with the linter.  It's reporting go
dependency replacements when there are none.
thozza
thozza previously approved these changes Sep 17, 2024
@thozza thozza enabled auto-merge (rebase) September 17, 2024 12:37
@thozza
Copy link
Member

thozza commented Sep 17, 2024

System doesn't contain the expected image-builder.insights facts (profile-id)

🤔

@thozza
Copy link
Member

thozza commented Sep 17, 2024

if ! grep -q "image-builder.insights.openscap-profile-id: pci-dss" <<< "$FACTS"; then

It is now called:

image-builder.insights.compliance-profile-id: pci-dss

@achilleas-k
Copy link
Member Author

if ! grep -q "image-builder.insights.openscap-profile-id: pci-dss" <<< "$FACTS"; then

It is now called:

image-builder.insights.compliance-profile-id: pci-dss

Awesome, thanks for looking it up!

@thozza thozza merged commit b0c0e84 into osbuild:main Sep 17, 2024
48 of 50 checks passed
@achilleas-k achilleas-k deleted the images/rm/customizations/sshkey branch September 18, 2024 13:51
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.

2 participants