Skip to content

CLDSRV-717: Update sproxyd container#5897

Merged
bert-e merged 2 commits intodevelopment/9.0from
improvement/CLDSRV-717-sproxyd
Aug 8, 2025
Merged

CLDSRV-717: Update sproxyd container#5897
bert-e merged 2 commits intodevelopment/9.0from
improvement/CLDSRV-717-sproxyd

Conversation

@BourgoisMickael
Copy link
Copy Markdown
Contributor

@BourgoisMickael BourgoisMickael commented Aug 7, 2025

Use latest sproxyd with latest configs changes from federation
And add sproxyd logs into artifacts

The latest sproxyd has:

Use latest sproxyd with latest configs changes from federation
And add sproxyd logs into artifacts

The latest sproxyd has:

- adminapi for monitoring (but ignored here)
- disable FUSE
  S3C-4129 scality/Federation#5653
- nginx openresty replaces tengine
  S3C-8479 scality/Federation#5495
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Aug 7, 2025

Hello bourgoismickael,

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
Copy Markdown
Contributor

bert-e commented Aug 7, 2025

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

/create_integration_branches

@BourgoisMickael BourgoisMickael requested a review from Copilot August 7, 2025 14:43
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Aug 7, 2025

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

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

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Aug 7, 2025

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_integration_branches

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR updates the sproxyd container from version 7.10.6.8 to 9.5.1.0 and aligns configurations with the latest federation changes, specifically replacing nginx/tengine with openresty and disabling FUSE functionality.

Key changes:

  • Update sproxyd container version to 9.5.1.0
  • Replace nginx with openresty in supervisord configuration
  • Add adminapi support and disable FUSE mounting in sproxyd command
  • Remove FUSE setup steps from CI and add sproxyd logs to artifacts

Reviewed Changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
.github/docker/sproxyd/Dockerfile Updates base image version and simplifies configuration copying
.github/docker/sproxyd/conf/supervisord.conf Switches from nginx to openresty and adds new sproxyd flags
.github/docker/sproxyd/conf/nginx.conf Restructures configuration for openresty compatibility
.github/docker/docker-compose.yaml Adds volume mapping for sproxyd logs collection
.github/actions/setup-ci/action.yaml Removes FUSE-related setup steps

Comment thread .github/docker/sproxyd/conf/nginx.conf
@codecov
Copy link
Copy Markdown

codecov bot commented Aug 7, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 83.19%. Comparing base (c0fc6a7) to head (091fd27).
✅ All tests successful. No failed tests found.

Additional details and impacted files

Impacted file tree graph

@@               Coverage Diff                @@
##           development/9.0    #5897   +/-   ##
================================================
  Coverage            83.19%   83.19%           
================================================
  Files                  188      188           
  Lines                12091    12091           
================================================
  Hits                 10059    10059           
  Misses                2032     2032           
Flag Coverage Δ
ceph-backend-test 65.65% <ø> (ø)
file-ft-tests 66.03% <ø> (ø)
kmip-ft-tests 26.83% <ø> (ø)
mongo-v0-ft-tests 67.87% <ø> (ø)
mongo-v1-ft-tests 67.90% <ø> (+0.02%) ⬆️
multiple-backend 35.31% <ø> (ø)
quota-tests 32.05% <ø> (ø)
quota-tests-inflights 34.03% <ø> (-0.04%) ⬇️
unit 67.25% <ø> (ø)
utapi-v2-tests 33.19% <ø> (ø)

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

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

/approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Aug 8, 2025

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

  • ✔️ development/9.0

  • ✔️ development/9.1

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-717.

Goodbye bourgoismickael.

The following options are set: approve, create_integration_branches

@bert-e bert-e merged commit 091fd27 into development/9.0 Aug 8, 2025
27 checks passed
@bert-e bert-e deleted the improvement/CLDSRV-717-sproxyd branch August 8, 2025 11:21
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