Merge pull request #13832 from rhmdnd/CMP-3713

Remove deprecated CIS OpenShift 1.4.0 and 1.5.0 profiles

Author: yuumasato

Dockerfiles/compliance-operator-content-konflux.Containerfile

@@ -17,10 +17,6 @@ RUN find . -name "default\.profile" -exec sed -i 's/\(documentation_complete: \)
 RUN sed -i 's/\(documentation_complete: \).*/\1true/' \
     products/ocp4/profiles/cis-node.profile \
     products/ocp4/profiles/cis.profile \
-    products/ocp4/profiles/cis-node-1-4.profile \
-    products/ocp4/profiles/cis-1-4.profile \
-    products/ocp4/profiles/cis-node-1-5.profile \
-    products/ocp4/profiles/cis-1-5.profile \
     products/ocp4/profiles/cis-node-1-7.profile \
     products/ocp4/profiles/cis-1-7.profile \
     products/ocp4/profiles/moderate-node.profile \

Dockerfiles/ocp4_content

@@ -21,10 +21,6 @@ RUN if [ "$(uname -m)" == "x86_64" ] || [ "$(uname -m)" == "aarch64" ]; then \
         products/ocp4/profiles/pci-dss.profile \
         products/ocp4/profiles/cis-node.profile \
         products/ocp4/profiles/cis.profile \
-        products/ocp4/profiles/cis-node-1-4.profile \
-        products/ocp4/profiles/cis-1-4.profile \
-        products/ocp4/profiles/cis-node-1-5.profile \
-        products/ocp4/profiles/cis-1-5.profile \
         products/ocp4/profiles/moderate-node.profile \
         products/ocp4/profiles/moderate.profile \
         products/ocp4/profiles/moderate-node-rev-4.profile \

controls/cis_ocp_1_4_0.yml controls/cis_ocp.ymlcontrols/cis_ocp_1_4_0.yml renamed to controls/cis_ocp.yml

@@ -1,7 +1,7 @@
 ---
 policy: CIS Red Hat OpenShift Container Platform 4 Benchmark
 title: CIS Red Hat OpenShift Container Platform 4 Benchmark
-id: cis_ocp_1_4_0
+id: cis_ocp
 source: https://www.cisecurity.org/benchmark/kubernetes
 
 levels:

controls/cis_ocp_1_4_0/section-1.yml controls/cis_ocp/section-1.ymlcontrols/cis_ocp_1_4_0/section-1.yml renamed to controls/cis_ocp/section-1.yml

@@ -391,7 +391,7 @@ controls:
             rules:
                 - scansettingbinding_exists
             controls:
-                - cis_ocp_1_4_0:all:level_2
+                - cis_ocp:all:level_2
 
           - id: 2.2.2
             title: Vendor default accounts are managed