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

Converge cloudserver images #5716

Merged
merged 2 commits into from
Dec 26, 2024
Merged

Converge cloudserver images #5716

merged 2 commits into from
Dec 26, 2024

Conversation

francoisferrand
Copy link
Contributor

Build federation image as additional layers on top of "standard" cloudserver image, to avoid duplication and ensure the image we tested is used in production.
There are still some differences at the moment (e.g. name of user, path) which should be further converged to minimize differences, may be done over time after considering all things.

This allows us to fully control (and minimize) what gets into the image, relying on any official node image. Also, now switch from python-based supervisord to a golang reimplementation [1], to minimize dependencies and CVEs.

Finally, took the change to fix startup command of the image, to ensure it properly propagates OS signals.

[1] ochinchina/supervisord

Issue: CLDSRV-597

@bert-e
Copy link
Contributor

bert-e commented Dec 16, 2024

Hello francoisferrand,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Dec 16, 2024

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Copy link

codecov bot commented Dec 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 62.11%. Comparing base (d5022f0) to head (36c92c0).
Report is 2 commits behind head on development/9.0.

✅ All tests successful. No failed tests found.

Additional details and impacted files

Impacted file tree graph

@@               Coverage Diff                @@
##           development/9.0    #5716   +/-   ##
================================================
  Coverage            62.11%   62.11%           
================================================
  Files                  185      185           
  Lines                11624    11624           
================================================
  Hits                  7220     7220           
  Misses                4404     4404           
Flag Coverage Δ
unit 62.11% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Copy link
Contributor

@rachedbenmustapha rachedbenmustapha left a comment

Choose a reason for hiding this comment

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

Would be good to post to the #eng-federation chan for review.

@francoisferrand
Copy link
Contributor Author

francoisferrand commented Dec 26, 2024

/approve

Benefit is to avoid duplicating image, make sure we actually run the
build we tested, and reduce dependency on federation.

Additionally, switched to `ochinchina/supervisord`, so we can fully
remove the python dependency and reduce image size.

Differences are very few:
- Run as `scality` user
- Run supervisord as entrypoint

Issue: CLDSRV-597
Remove redundant shell command (implicit from using shell form of `CMD`)
and use exec to run supervisord.

Issue: CLDSRV-597
@scality scality deleted a comment from bert-e Dec 26, 2024
@bert-e
Copy link
Contributor

bert-e commented Dec 26, 2024

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/9.0

The following branches have NOT changed:

  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.8

Please check the status of the associated issue CLDSRV-597.

Goodbye francoisferrand.

The following options are set: approve

@bert-e bert-e merged commit 36c92c0 into development/9.0 Dec 26, 2024
19 checks passed
@bert-e bert-e deleted the improvement/CLDSRV-597 branch December 26, 2024 19:35
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.

5 participants