Skip to content

Bump OCP4 STIG from V2R2/V2R3 to V2R6 - #15042

Open
yuumasato wants to merge 6 commits into
ComplianceAsCode:masterfrom
yuumasato:stig-ocp4-v2r6-version-bump
Open

Bump OCP4 STIG from V2R2/V2R3 to V2R6#15042
yuumasato wants to merge 6 commits into
ComplianceAsCode:masterfrom
yuumasato:stig-ocp4-v2r6-version-bump

Conversation

@yuumasato

@yuumasato yuumasato commented Aug 25, 2026

Copy link
Copy Markdown
Member

Summary

CMP-4615

  • Update controls/stig_ocp4.yml version from V2R2 to V2R6, with minor title wording fixes for CNTR-OS-000090 and CNTR-OS-000630
  • Replace shared/references/disa-stig-ocp4-v2r3-xccdf-manual.xml with V2R6 reference XCCDF
  • Fix broken disa-stig-rhcos4-v2r3-xccdf-manual.xml symlink — create V2R6 symlink pointing to disa-stig-ocp4-v2r6-xccdf-manual.xml
  • Create V2R6 versioned profile snapshots (stig-v2r6.profile, stig-node-v2r6.profile) for ocp4 and rhcos4
  • Deprecate V2R3 snapshots and update tip profiles to extend V2R6
  • Remove deprecated V2R2 profile snapshots (stig-v2r2, stig-node-v2r2, rhcos4/stig-v2r2)
  • Add filter_rules to V2R3, V2R6 platform, and RHCOS profiles to exclude kubevirt rules (added in V2R6, scanned by the stig-virt CEL profile in Map OCP Virtualization rules to STIG controls and add stig-virt CEL profile #15043)
  • Map alert_receiver_configured to CNTR-OS-000690 (status pendingmanual, per CMP-2437)
  • Map routes_protected_by_tls to CNTR-OS-000820 (status manualpartial — covers edge-terminated routes; passthrough TLS still needs app-level checks)

Test plan

  • ./build_product ocp4 --datastream succeeds
  • ./build_product rhcos4 --datastream succeeds
  • No kubevirt rules in any XCCDF STIG profile (ocp4 or rhcos4)
  • CI passes

🤖 Generated with Claude Code

Update the STIG control file version, profile metadata, and reference
XCCDF to align with DISA STIG V2R6 for Red Hat OpenShift Container
Platform 4.

Changes:
- Control file version V2R2 -> V2R6
- CNTR-OS-000090 title updated to V2R6 wording
- CNTR-OS-000630 title updated to V2R6 wording
- New V2R6 versioned snapshot profiles (stig-v2r6, stig-node-v2r6)
- V2R3 snapshots marked deprecated
- Tip profiles (stig, stig-node) now extend V2R6 snapshots
- Reference XCCDF updated from V2R3 to V2R6

Closes: CMP-4615

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

@Vincent056 Vincent056 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

/lgtm

yuumasato and others added 3 commits August 25, 2026 02:38
The rule provides OCIL manual check instructions for verifying
AlertManager receivers are configured. Status set to manual per
CMP-2437 findings: the DISA Check/Fix text involves Web Console
actions and the related SRGs are manual/does-not-meet.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
The rule has an automated OVAL check that verifies edge-terminated
routes use TLS (insecureEdgeTerminationPolicy is None or Redirect).
Status set to partial because passthrough TLS still requires
application-level verification.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
The rhcos4 STIG reference was a symlink to the ocp4 reference file.
Update it to point to the V2R6 file, create a V2R6 profile snapshot,
deprecate V2R3, and update the tip profile to extend V2R6.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@Mab879 Mab879 self-assigned this Aug 25, 2026
@Mab879 Mab879 added this to the 0.1.83 milestone Aug 25, 2026
yuumasato and others added 2 commits August 25, 2026 14:03
…ofiles

Kubevirt rules were added to the STIG control file in V2R6 and
are scanned by the stig-virt CEL profile. Add filter_rules to
exclude them from V2R3 snapshots, V2R6 platform profile, and
RHCOS profiles where they are not applicable.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Delete ocp4 stig-v2r2, stig-node-v2r2, and rhcos4 stig-v2r2
profile snapshots since they are two versions behind V2R6.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@yuumasato

Copy link
Copy Markdown
Member Author

Updated the PR with two new commits:

  • Filter kubevirt rules from pre-V2R6, RHCOS, and V2R6 platform STIG profiles — Kubevirt rules were added to the STIG control file in V2R6 and are scanned by the stig-virt CEL profile (Map OCP Virtualization rules to STIG controls and add stig-virt CEL profile #15043). Added filter_rules with "kubevirt" not in id_ to V2R3 snapshots, V2R6 platform profile, and all RHCOS profiles to prevent leakage.

  • Remove deprecated V2R2 STIG profile snapshots — Deleted stig-v2r2, stig-node-v2r2, and rhcos4/stig-v2r2 since they are two versions behind V2R6.

@openshift-ci

openshift-ci Bot commented Aug 25, 2026

Copy link
Copy Markdown

@yuumasato: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-openshift-platform-compliance 9ce95c4 link true /test e2e-aws-openshift-platform-compliance

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

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.

3 participants