Skip to content

Auto-generated PR from CAC 12749 - #76

Merged
huiwangredhat merged 1 commit into
mainfrom
sync_cac_pr12749
Aug 28, 2025
Merged

Auto-generated PR from CAC 12749#76
huiwangredhat merged 1 commit into
mainfrom
sync_cac_pr12749

Conversation

@sync-cac-oscal-bot

Copy link
Copy Markdown
Contributor

This is an auto-generated PR from CAC PR 12749

@huiwangredhat

Copy link
Copy Markdown
Collaborator

I found the content was reshuffled. It's difficult to do the review via the git diff. The file controls/cis_ocp_1_4_0/section-4.yml updates impacted component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_1/component-definition.json and component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_2/component-definition.json.
Removing kubelet_configure_tls_cipher_suites_ingresscontroller and adding ingress_controller_tls_cipher_suites was synced to the component-definitions. The details as follows:

huiwang@huiwangMac oscal-content %  grep -nr "kubelet_configure_tls_cipher_suites_ingresscontroller"  component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_1/component-definition.json
huiwang@huiwangMac oscal-content %  grep -nr "kubelet_configure_tls_cipher_suites_ingresscontroller"  component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_2/component-definition.json
huiwang@huiwangMac oscal-content % grep -nr "ingress_controller_tls_cipher_suites"  component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_2/component-definition.json
component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_2/component-definition.json:5840:            "value": "ingress_controller_tls_cipher_suites",
component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_2/component-definition.json:8207:                    "value": "ingress_controller_tls_cipher_suites"
component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_2/component-definition.json:10705:                    "value": "ingress_controller_tls_cipher_suites"
component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_2/component-definition.json:18913:            "value": "ingress_controller_tls_cipher_suites",
component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_2/component-definition.json:18943:            "value": "ingress_controller_tls_cipher_suites",
component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_2/component-definition.json:21340:                    "value": "ingress_controller_tls_cipher_suites"
component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_2/component-definition.json:23838:                    "value": "ingress_controller_tls_cipher_suites"
huiwang@huiwangMac oscal-content % grep -nr "ingress_controller_tls_cipher_suites"  component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_1/component-definition.json
component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_1/component-definition.json:5840:            "value": "ingress_controller_tls_cipher_suites",
component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_1/component-definition.json:8207:                    "value": "ingress_controller_tls_cipher_suites"
component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_1/component-definition.json:10452:                    "value": "ingress_controller_tls_cipher_suites"
component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_1/component-definition.json:18660:            "value": "ingress_controller_tls_cipher_suites",
component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_1/component-definition.json:18690:            "value": "ingress_controller_tls_cipher_suites",
component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_1/component-definition.json:21087:                    "value": "ingress_controller_tls_cipher_suites"
component-definitions/ocp4/ocp4-cis_ocp_1_4_0-level_1/component-definition.json:23332:                    "value": "ingress_controller_tls_cipher_suites"

@huiwangredhat
huiwangredhat self-requested a review August 28, 2025 05:52
@huiwangredhat
huiwangredhat merged commit 2e9f8fe into main Aug 28, 2025
2 checks passed
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.

1 participant