-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
[docker-macsec] fix privileged and volumes settings #16894
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Mai Bui <[email protected]>
@Pterosaur Could you help review? Is there a test gap? |
Pterosaur
approved these changes
Oct 17, 2023
qiluo-msft
approved these changes
Oct 19, 2023
@maipbui could you update if test with 202305 image? |
Tested with 202305 image |
@maipbui PR conflicts with 202305 branch |
11 tasks
StormLiangMS
pushed a commit
that referenced
this pull request
Nov 16, 2023
cherry pick #16894 Why I did it Privileges and volumes were incorrectly set in macsec container. Privileged flag is set to false and volumes are not mounted properly. admin@vlab-01:~$ docker inspect macsec0 | grep Privi "Privileged": false, admin@vlab-01:~$ docker inspect macsec0 | grep -A 10 Binds "Binds": [ "/var/run/redis0:/var/run/redis:rw", "/var/run/redis-chassis:/var/run/redis-chassis:ro", "/usr/share/sonic/device/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0:/usr/share/sonic/hwsku:ro", "/var/run/redis0/:/var/run/redis0/:rw", "/usr/share/sonic/device/x86_64-nokia_ixr7250e_36x400g-r0:/usr/share/sonic/platform:ro" ], Work item tracking Microsoft ADO (number only): How I did it How to verify it Make sure privileged settings remain unchanged and make sure volumes are properly mounted admin@vlab-01:~$ docker inspect macsec | grep Privi "Privileged": false, admin@vlab-01:~$ docker inspect macsec | grep -A 10 Binds "Binds": [ "/etc/timezone:/etc/timezone:ro", "/var/run/redis:/var/run/redis:rw", "/var/run/redis-chassis:/var/run/redis-chassis:ro", "/etc/fips/fips_enable:/etc/fips/fips_enable:ro", "/usr/share/sonic/templates/rsyslog-container.conf.j2:/usr/share/sonic/templates/rsyslog-container.conf.j2:ro", "/etc/sonic:/etc/sonic:ro", "/host/warmboot:/var/warmboot", "/usr/share/sonic/device/x86_64-kvm_x86_64-r0/Force10-S6000/:/usr/share/sonic/hwsku:ro", "/usr/share/sonic/device/x86_64-kvm_x86_64-r0:/usr/share/sonic/platform:ro" ],
StormLiangMS
added
Included in 202305 Branch
and removed
Cherry Pick Conflict_202305
labels
Nov 23, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why I did it
Privileges and volumes were incorrectly set in macsec container. Privileged flag is set to false and volumes are not mounted properly.
Work item tracking
How I did it
How to verify it
Make sure privileged settings remain unchanged and make sure volumes are properly mounted
Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)