Merge pull request #12443 from yuumasato/update_various_openshift_ass…

…ertions Update various openshift assertions
ComplianceAsCode · Oct 10, 2024 · 2d2175c · 2d2175c
2 parents e77ac2c + 9630d28
commit 2d2175c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/tests/assertions/ocp4/ocp4-pci-dss-4-0-4.15.yml b/tests/assertions/ocp4/ocp4-pci-dss-4-0-4.15.yml
@@ -230,7 +230,7 @@ rule_results:
  e2e-pci-dss-4-0-kubelet-configure-tls-cert:
    default_result: PASS
    result_after_remediation: PASS
- e3e-pci-dss-4-0-kubelet-configure-tls-cipher-suites-ingresscontroller:
+ e2e-pci-dss-4-0-kubelet-configure-tls-cipher-suites-ingresscontroller:
    default_result: FAIL
    result_after_remediation: PASS
  e2e-pci-dss-4-0-kubelet-configure-tls-key:

diff --git a/tests/assertions/ocp4/ocp4-pci-dss-node-4-0-4.14.yml b/tests/assertions/ocp4/ocp4-pci-dss-node-4-0-4.14.yml
@@ -202,7 +202,7 @@ rule_results:
     result_after_remediation: PASS
   e2e-pci-dss-node-4-0-master-file-permissions-cni-conf:
     default_result: PASS
-    result_after_remediation: FAIL
+    result_after_remediation: PASS
   e2e-pci-dss-node-4-0-master-file-permissions-controller-manager-kubeconfig:
     default_result: PASS
     result_after_remediation: PASS
@@ -544,7 +544,7 @@ rule_results:
     result_after_remediation: NOT-APPLICABLE
   e2e-pci-dss-node-4-0-worker-file-permissions-cni-conf:
     default_result: PASS
-    result_after_remediation: FAIL
+    result_after_remediation: PASS
   e2e-pci-dss-node-4-0-worker-file-permissions-controller-manager-kubeconfig:
     default_result: NOT-APPLICABLE
     result_after_remediation: NOT-APPLICABLE

diff --git a/tests/assertions/ocp4/ocp4-pci-dss-node-4-0-4.15.yml b/tests/assertions/ocp4/ocp4-pci-dss-node-4-0-4.15.yml
@@ -202,7 +202,7 @@ rule_results:
     result_after_remediation: PASS
   e2e-pci-dss-node-4-0-master-file-permissions-cni-conf:
     default_result: PASS
-    result_after_remediation: FAIL
+    result_after_remediation: PASS
   e2e-pci-dss-node-4-0-master-file-permissions-controller-manager-kubeconfig:
     default_result: PASS
     result_after_remediation: PASS
@@ -544,7 +544,7 @@ rule_results:
     result_after_remediation: NOT-APPLICABLE
   e2e-pci-dss-node-4-0-worker-file-permissions-cni-conf:
     default_result: PASS
-    result_after_remediation: FAIL
+    result_after_remediation: PASS
   e2e-pci-dss-node-4-0-worker-file-permissions-controller-manager-kubeconfig:
     default_result: NOT-APPLICABLE
     result_after_remediation: NOT-APPLICABLE

diff --git a/tests/assertions/ocp4/ocp4-pci-dss-node-4.12.yml b/tests/assertions/ocp4/ocp4-pci-dss-node-4.12.yml
@@ -176,7 +176,8 @@ rule_results:
   e2e-pci-dss-node-master-file-permissions-scheduler-kubeconfig:
     default_result: PASS
   e2e-pci-dss-node-master-file-permissions-var-log-kube-audit:
-    default_result: INCONSISTENT
+    # nodes get INCONSISTENT because of https://bugzilla.redhat.com/show_bug.cgi?id=2001442
+    default_result: PASS or INCONSISTENT
   e2e-pci-dss-node-master-file-permissions-var-log-oauth-audit:
     default_result: PASS
   e2e-pci-dss-node-master-file-permissions-var-log-ocp-audit: