osguard-ci: Add Code Integrity variant of OS Guard #14505
Merged
+423
−32
Conversation
This file contains hidden or 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
microsoft-github-policy-service
bot
added
Tools
Schema
microsoft-github-policy-service
bot
added
the
3.0-dev
christopherco
force-pushed
the
chrco/osguard-refactor-add-ci
branch
from
4b1433a to
67feea2
Compare
christopherco
force-pushed
the
chrco/osguard-refactor-add-ci
branch
from
67feea2 to
9002eca
Compare
12 tasks
christopherco
force-pushed
the
chrco/osguard-refactor-add-ci
branch
3 times, most recently
from
f73c572 to
c4bf9bf
Compare
christopherco
force-pushed
the
chrco/osguard-refactor-add-ci
branch
2 times, most recently
from
54fb301 to
fb8fcac
Compare
aadhar-agarwal
approved these changes
Aug 17, 2025
christopherco
force-pushed
the
chrco/osguard-refactor-add-ci
branch
from
2ffc767 to
62b4f55
Compare
reubeno
reviewed
Aug 18, 2025
PawelWMS
reviewed
Aug 18, 2025
christopherco
commented
Aug 18, 2025
PawelWMS
reviewed
Aug 18, 2025
christopherco
force-pushed
the
chrco/osguard-refactor-add-ci
branch
from
58a947a to
edfa33d
Compare
Add new image configuration definition for OS Guard that enables code integrity enhancements. To enable code integrity checking for containers, this image activates the containerd erofs-snapshotter in /etc/containerd/config.toml and configures cni appropriately. Additionally this image enables SELinux in enforcing mode for SELinux MAC enforcement. Finally, update the OS Guard generation script to handle generating OS Guard image configurations using different delta files, and simplify the process of adding new delta configurations by creating the GEN_JOBS array, where each entry follows the schema: <base-template>|<delta-template>|<output> Also update the test function to check all entries of GEN_JOBS for diffs. Signed-off-by: Chris Co <chrco@microsoft.com>
Signed-off-by: Chris Co <chrco@microsoft.com>
We expect the next-level customizer to provide the CNI configuration for pod networking. This behavior matches general-purpose containerd behavior when invoked through CRI interface. Signed-off-by: Chris Co <chrco@microsoft.com>
Signed-off-by: Chris Co <chrco@microsoft.com>
Make the generate-osguard-imageconfigs.sh script work from any directory by determining paths based on the script's own location rather than relying on the current working directory. Changes: - Use SCRIPT_DIR to determine script location and calculate relative paths - Replace hardcoded relative paths with dynamic path resolution - Add validation for expected directory structure - Update documentation to reflect CWD independence - Use absolute path for merge_yaml.py invocation This allows users to run the script from anywhere in the repository without needing to cd to toolkit/scripts first, improving usability and reducing potential user errors. Signed-off-by: Chris Co <chrco@microsoft.com>
christopherco
force-pushed
the
chrco/osguard-refactor-add-ci
branch
from
edfa33d to
1d75f45
Compare
jiria
approved these changes
Aug 21, 2025
reubeno
approved these changes
Aug 21, 2025
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.
Merge Checklist
All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)
*-staticsubpackages, etc.) have had theirReleasetag incremented../cgmanifest.json,./toolkit/scripts/toolchain/cgmanifest.json,.github/workflows/cgmanifest.json)./LICENSES-AND-NOTICES/SPECS/data/licenses.json,./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md,./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)*.signatures.jsonfilessudo make go-tidy-allandsudo make go-test-coveragepassSummary
Add new image configuration definition for OS Guard that enables code
integrity enhancements.
To enable code integrity checking for containers, this image activates
the containerd erofs-snapshotter with an updated
/etc/containerd/config.toml configuration, and also configures cni
appropriately for pod networking.
Additionally this image enables SELinux in enforcing mode for another
important security layer.
Finally, update the OS Guard generation script to handle generating
OS Guard image configurations using different delta files, and simplify
the process of adding new delta configurations by creating the GEN_JOBS
array, where each entry follows the schema:
Also update the test function to check all entries of GEN_JOBS for diffs.
Signed-off-by: Chris Co chrco@microsoft.com
Does this affect the toolchain?
NO
Associated issues
Test Methodology