ComplianceAsCode · yuumasato · Jan 20, 2025 · Jan 20, 2025 · Jan 20, 2025
diff --git a/applications/openshift/api-server/api_server_kubelet_client_cert/rule.yml b/applications/openshift/api-server/api_server_kubelet_client_cert/rule.yml
@@ -33,8 +33,7 @@ rationale: |-
 identifiers:
   cce@ocp4: CCE-84080-1
 
-platforms:
-  - (ocp4.9 or ocp4.10 or ocp4.11 or ocp4.12 or ocp4.13 or ocp4.14 or ocp4.15 or ocp4.16 or ocp4.17) and not ocp4-on-hypershift-hosted
+platform: not ocp4-on-hypershift-hosted
 
 severity: high
 

diff --git a/applications/openshift/api-server/api_server_kubelet_client_cert_pre_4_9/rule.yml b/applications/openshift/api-server/api_server_kubelet_client_cert_pre_4_9/rule.yml
diff --git a/applications/openshift/api-server/api_server_kubelet_client_cert_pre_4_9/tests/ocp4/4.10.yml b/applications/openshift/api-server/api_server_kubelet_client_cert_pre_4_9/tests/ocp4/4.10.yml
diff --git a/applications/openshift/api-server/api_server_kubelet_client_cert_pre_4_9/tests/ocp4/4.6.yml b/applications/openshift/api-server/api_server_kubelet_client_cert_pre_4_9/tests/ocp4/4.6.yml
diff --git a/applications/openshift/api-server/api_server_kubelet_client_cert_pre_4_9/tests/ocp4/4.7.yml b/applications/openshift/api-server/api_server_kubelet_client_cert_pre_4_9/tests/ocp4/4.7.yml
diff --git a/applications/openshift/api-server/api_server_kubelet_client_cert_pre_4_9/tests/ocp4/4.8.yml b/applications/openshift/api-server/api_server_kubelet_client_cert_pre_4_9/tests/ocp4/4.8.yml
diff --git a/applications/openshift/api-server/api_server_kubelet_client_cert_pre_4_9/tests/ocp4/4.9.yml b/applications/openshift/api-server/api_server_kubelet_client_cert_pre_4_9/tests/ocp4/4.9.yml
diff --git a/applications/openshift/api-server/api_server_kubelet_client_cert_pre_4_9/tests/ocp4/e2e.yml b/applications/openshift/api-server/api_server_kubelet_client_cert_pre_4_9/tests/ocp4/e2e.yml
diff --git a/applications/openshift/api-server/api_server_kubelet_client_key/rule.yml b/applications/openshift/api-server/api_server_kubelet_client_key/rule.yml
@@ -33,8 +33,7 @@ rationale: |-
 identifiers:
   cce@ocp4: CCE-83591-8
 
-platforms:
-  - (ocp4.9 or ocp4.10 or ocp4.11 or ocp4.12 or ocp4.13 or ocp4.14 or ocp4.15 or ocp4.16 or ocp4.17) and not ocp4-on-hypershift-hosted
+platform: not ocp4-on-hypershift-hosted
 
 severity: high
 

diff --git a/applications/openshift/api-server/api_server_kubelet_client_key_pre_4_9/rule.yml b/applications/openshift/api-server/api_server_kubelet_client_key_pre_4_9/rule.yml
diff --git a/applications/openshift/api-server/api_server_kubelet_client_key_pre_4_9/tests/ocp4/4.10.yml b/applications/openshift/api-server/api_server_kubelet_client_key_pre_4_9/tests/ocp4/4.10.yml
diff --git a/applications/openshift/api-server/api_server_kubelet_client_key_pre_4_9/tests/ocp4/4.6.yml b/applications/openshift/api-server/api_server_kubelet_client_key_pre_4_9/tests/ocp4/4.6.yml
diff --git a/applications/openshift/api-server/api_server_kubelet_client_key_pre_4_9/tests/ocp4/4.7.yml b/applications/openshift/api-server/api_server_kubelet_client_key_pre_4_9/tests/ocp4/4.7.yml
diff --git a/applications/openshift/api-server/api_server_kubelet_client_key_pre_4_9/tests/ocp4/4.8.yml b/applications/openshift/api-server/api_server_kubelet_client_key_pre_4_9/tests/ocp4/4.8.yml
diff --git a/applications/openshift/api-server/api_server_kubelet_client_key_pre_4_9/tests/ocp4/4.9.yml b/applications/openshift/api-server/api_server_kubelet_client_key_pre_4_9/tests/ocp4/4.9.yml
diff --git a/applications/openshift/api-server/api_server_kubelet_client_key_pre_4_9/tests/ocp4/e2e.yml b/applications/openshift/api-server/api_server_kubelet_client_key_pre_4_9/tests/ocp4/e2e.yml
diff --git a/applications/openshift/kubelet/kubelet_configure_tls_cert/rule.yml b/applications/openshift/kubelet/kubelet_configure_tls_cert/rule.yml
@@ -26,8 +26,7 @@ severity: medium
 identifiers:
     cce@ocp4: CCE-83396-2
 
-platforms:
-  - (ocp4.9 or ocp4.10 or ocp4.11 or ocp4.12 or ocp4.13 or ocp4.14 or ocp4.15 or ocp4.16 or ocp4.17) and not ocp4-on-hypershift-hosted
+platform: not ocp4-on-hypershift-hosted
 
 references:
     cis@ocp4: 4.2.9

diff --git a/applications/openshift/kubelet/kubelet_configure_tls_cert_pre_4_9/rule.yml b/applications/openshift/kubelet/kubelet_configure_tls_cert_pre_4_9/rule.yml
diff --git a/applications/openshift/kubelet/kubelet_configure_tls_cert_pre_4_9/tests/ocp4/4.10.yml b/applications/openshift/kubelet/kubelet_configure_tls_cert_pre_4_9/tests/ocp4/4.10.yml
diff --git a/applications/openshift/kubelet/kubelet_configure_tls_cert_pre_4_9/tests/ocp4/4.6.yml b/applications/openshift/kubelet/kubelet_configure_tls_cert_pre_4_9/tests/ocp4/4.6.yml
diff --git a/applications/openshift/kubelet/kubelet_configure_tls_cert_pre_4_9/tests/ocp4/4.7.yml b/applications/openshift/kubelet/kubelet_configure_tls_cert_pre_4_9/tests/ocp4/4.7.yml
diff --git a/applications/openshift/kubelet/kubelet_configure_tls_cert_pre_4_9/tests/ocp4/4.8.yml b/applications/openshift/kubelet/kubelet_configure_tls_cert_pre_4_9/tests/ocp4/4.8.yml
diff --git a/applications/openshift/kubelet/kubelet_configure_tls_cert_pre_4_9/tests/ocp4/4.9.yml b/applications/openshift/kubelet/kubelet_configure_tls_cert_pre_4_9/tests/ocp4/4.9.yml
diff --git a/applications/openshift/kubelet/kubelet_configure_tls_cert_pre_4_9/tests/ocp4/e2e.yml b/applications/openshift/kubelet/kubelet_configure_tls_cert_pre_4_9/tests/ocp4/e2e.yml
diff --git a/applications/openshift/kubelet/kubelet_configure_tls_key/rule.yml b/applications/openshift/kubelet/kubelet_configure_tls_key/rule.yml
@@ -26,8 +26,7 @@ severity: medium
 identifiers:
     cce@ocp4: CCE-90614-9
 
-platforms:
-  - (ocp4.9 or ocp4.10 or ocp4.11 or ocp4.12 or ocp4.13 or ocp4.14 or ocp4.15 or ocp4.16 or ocp4.17) and not ocp4-on-hypershift-hosted
+platform: not ocp4-on-hypershift-hosted
 
 references:
     cis@ocp4: 4.2.9

diff --git a/applications/openshift/kubelet/kubelet_configure_tls_key_pre_4_9/rule.yml b/applications/openshift/kubelet/kubelet_configure_tls_key_pre_4_9/rule.yml
diff --git a/applications/openshift/kubelet/kubelet_configure_tls_key_pre_4_9/tests/ocp4/4.10.yml b/applications/openshift/kubelet/kubelet_configure_tls_key_pre_4_9/tests/ocp4/4.10.yml
diff --git a/applications/openshift/kubelet/kubelet_configure_tls_key_pre_4_9/tests/ocp4/4.6.yml b/applications/openshift/kubelet/kubelet_configure_tls_key_pre_4_9/tests/ocp4/4.6.yml
diff --git a/applications/openshift/kubelet/kubelet_configure_tls_key_pre_4_9/tests/ocp4/4.7.yml b/applications/openshift/kubelet/kubelet_configure_tls_key_pre_4_9/tests/ocp4/4.7.yml
diff --git a/applications/openshift/kubelet/kubelet_configure_tls_key_pre_4_9/tests/ocp4/4.8.yml b/applications/openshift/kubelet/kubelet_configure_tls_key_pre_4_9/tests/ocp4/4.8.yml
diff --git a/applications/openshift/kubelet/kubelet_configure_tls_key_pre_4_9/tests/ocp4/4.9.yml b/applications/openshift/kubelet/kubelet_configure_tls_key_pre_4_9/tests/ocp4/4.9.yml
diff --git a/applications/openshift/kubelet/kubelet_configure_tls_key_pre_4_9/tests/ocp4/e2e.yml b/applications/openshift/kubelet/kubelet_configure_tls_key_pre_4_9/tests/ocp4/e2e.yml
diff --git a/controls/cis_ocp_1_4_0/section-1.yml b/controls/cis_ocp_1_4_0/section-1.yml
@@ -222,9 +222,7 @@ controls:
       status: automated
       rules:
         - api_server_kubelet_client_cert
-        - api_server_kubelet_client_cert_pre_4_9
         - api_server_kubelet_client_key
-        - api_server_kubelet_client_key_pre_4_9
       levels: [ level_1, ]
     - id: 1.2.6
       title: Verify that the kubelet certificate authority is set as appropriate