Skip to content

Commit 9445fe1

Browse files
yuumasatoyuumasato
authored
Merge pull request #13987 from rhmdnd/CMP-3540-remove-sdn-assertions-from-newer-openshift-testing
CMP-3540: Remove SDN proxy kubeconfig assertions from 4.17+ assertion files
2 parents d9e85f1 + fba218c commit 9445fe1

12 files changed

+0
-108
lines changed

‎tests/assertions/ocp4/ocp4-cis-4.17.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,6 @@ rule_results:
164164
ocp4-cis-etcd-peer-key-file:
165165
default_result: PASS
166166
result_after_remediation: PASS
167-
ocp4-cis-file-groupowner-proxy-kubeconfig:
168-
default_result: NOT-APPLICABLE
169-
result_after_remediation: NOT-APPLICABLE
170-
ocp4-cis-file-owner-proxy-kubeconfig:
171-
default_result: NOT-APPLICABLE
172-
result_after_remediation: NOT-APPLICABLE
173-
ocp4-cis-file-permissions-proxy-kubeconfig:
174-
default_result: NOT-APPLICABLE
175-
result_after_remediation: NOT-APPLICABLE
176167
ocp4-cis-general-apply-scc:
177168
default_result: MANUAL
178169
result_after_remediation: MANUAL

‎tests/assertions/ocp4/ocp4-cis-4.18.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,6 @@ rule_results:
164164
ocp4-cis-etcd-peer-key-file:
165165
default_result: PASS
166166
result_after_remediation: PASS
167-
ocp4-cis-file-groupowner-proxy-kubeconfig:
168-
default_result: NOT-APPLICABLE
169-
result_after_remediation: NOT-APPLICABLE
170-
ocp4-cis-file-owner-proxy-kubeconfig:
171-
default_result: NOT-APPLICABLE
172-
result_after_remediation: NOT-APPLICABLE
173-
ocp4-cis-file-permissions-proxy-kubeconfig:
174-
default_result: NOT-APPLICABLE
175-
result_after_remediation: NOT-APPLICABLE
176167
ocp4-cis-general-apply-scc:
177168
default_result: MANUAL
178169
result_after_remediation: MANUAL

‎tests/assertions/ocp4/ocp4-high-4.17.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -221,21 +221,12 @@ rule_results:
221221
ocp4-high-etcd-peer-key-file:
222222
default_result: PASS
223223
result_after_remediation: PASS
224-
ocp4-high-file-groupowner-proxy-kubeconfig:
225-
default_result: NOT-APPLICABLE
226-
result_after_remediation: NOT-APPLICABLE
227224
ocp4-high-file-integrity-exists:
228225
default_result: FAIL or NOT-APPLICABLE
229226
result_after_remediation: PASS or NOT-APPLICABLE
230227
ocp4-high-file-integrity-notification-enabled:
231228
default_result: FAIL or NOT-APPLICABLE
232229
result_after_remediation: PASS or NOT-APPLICABLE
233-
ocp4-high-file-owner-proxy-kubeconfig:
234-
default_result: NOT-APPLICABLE
235-
result_after_remediation: NOT-APPLICABLE
236-
ocp4-high-file-permissions-proxy-kubeconfig:
237-
default_result: NOT-APPLICABLE
238-
result_after_remediation: NOT-APPLICABLE
239230
ocp4-high-fips-mode-enabled-on-all-nodes:
240231
default_result: PASS
241232
result_after_remediation: PASS

‎tests/assertions/ocp4/ocp4-high-4.18.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -221,21 +221,12 @@ rule_results:
221221
ocp4-high-etcd-peer-key-file:
222222
default_result: PASS
223223
result_after_remediation: PASS
224-
ocp4-high-file-groupowner-proxy-kubeconfig:
225-
default_result: NOT-APPLICABLE
226-
result_after_remediation: NOT-APPLICABLE
227224
ocp4-high-file-integrity-exists:
228225
default_result: FAIL or NOT-APPLICABLE
229226
result_after_remediation: PASS or NOT-APPLICABLE
230227
ocp4-high-file-integrity-notification-enabled:
231228
default_result: FAIL or NOT-APPLICABLE
232229
result_after_remediation: PASS or NOT-APPLICABLE
233-
ocp4-high-file-owner-proxy-kubeconfig:
234-
default_result: NOT-APPLICABLE
235-
result_after_remediation: NOT-APPLICABLE
236-
ocp4-high-file-permissions-proxy-kubeconfig:
237-
default_result: NOT-APPLICABLE
238-
result_after_remediation: NOT-APPLICABLE
239230
ocp4-high-fips-mode-enabled-on-all-nodes:
240231
default_result: PASS
241232
result_after_remediation: PASS

‎tests/assertions/ocp4/ocp4-moderate-4.17.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -215,21 +215,12 @@ rule_results:
215215
ocp4-moderate-etcd-peer-key-file:
216216
default_result: PASS
217217
result_after_remediation: PASS
218-
ocp4-moderate-file-groupowner-proxy-kubeconfig:
219-
default_result: NOT-APPLICABLE
220-
result_after_remediation: NOT-APPLICABLE
221218
ocp4-moderate-file-integrity-exists:
222219
default_result: FAIL or NOT-APPLICABLE
223220
result_after_remediation: PASS or NOT-APPLICABLE
224221
ocp4-moderate-file-integrity-notification-enabled:
225222
default_result: FAIL or NOT-APPLICABLE
226223
result_after_remediation: PASS or NOT-APPLICABLE
227-
ocp4-moderate-file-owner-proxy-kubeconfig:
228-
default_result: NOT-APPLICABLE
229-
result_after_remediation: NOT-APPLICABLE
230-
ocp4-moderate-file-permissions-proxy-kubeconfig:
231-
default_result: NOT-APPLICABLE
232-
result_after_remediation: NOT-APPLICABLE
233224
ocp4-moderate-fips-mode-enabled-on-all-nodes:
234225
default_result: PASS
235226
result_after_remediation: PASS

‎tests/assertions/ocp4/ocp4-moderate-4.18.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -215,21 +215,12 @@ rule_results:
215215
ocp4-moderate-etcd-peer-key-file:
216216
default_result: PASS
217217
result_after_remediation: PASS
218-
ocp4-moderate-file-groupowner-proxy-kubeconfig:
219-
default_result: NOT-APPLICABLE
220-
result_after_remediation: NOT-APPLICABLE
221218
ocp4-moderate-file-integrity-exists:
222219
default_result: FAIL or NOT-APPLICABLE
223220
result_after_remediation: PASS or NOT-APPLICABLE
224221
ocp4-moderate-file-integrity-notification-enabled:
225222
default_result: FAIL or NOT-APPLICABLE
226223
result_after_remediation: PASS or NOT-APPLICABLE
227-
ocp4-moderate-file-owner-proxy-kubeconfig:
228-
default_result: NOT-APPLICABLE
229-
result_after_remediation: NOT-APPLICABLE
230-
ocp4-moderate-file-permissions-proxy-kubeconfig:
231-
default_result: NOT-APPLICABLE
232-
result_after_remediation: NOT-APPLICABLE
233224
ocp4-moderate-fips-mode-enabled-on-all-nodes:
234225
default_result: PASS
235226
result_after_remediation: PASS

‎tests/assertions/ocp4/ocp4-pci-dss-4-0-4.17.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -188,21 +188,12 @@ rule_results:
188188
ocp4-pci-dss-4-0-etcd-peer-key-file:
189189
default_result: PASS
190190
result_after_remediation: PASS
191-
ocp4-pci-dss-4-0-file-groupowner-proxy-kubeconfig:
192-
default_result: NOT-APPLICABLE
193-
result_after_remediation: NOT-APPLICABLE
194191
ocp4-pci-dss-4-0-file-integrity-exists:
195192
default_result: FAIL or NOT-APPLICABLE
196193
result_after_remediation: PASS or NOT-APPLICABLE
197194
ocp4-pci-dss-4-0-file-integrity-notification-enabled:
198195
default_result: FAIL or NOT-APPLICABLE
199196
result_after_remediation: PASS or NOT-APPLICABLE
200-
ocp4-pci-dss-4-0-file-owner-proxy-kubeconfig:
201-
default_result: NOT-APPLICABLE
202-
result_after_remediation: NOT-APPLICABLE
203-
ocp4-pci-dss-4-0-file-permissions-proxy-kubeconfig:
204-
default_result: NOT-APPLICABLE
205-
result_after_remediation: NOT-APPLICABLE
206197
ocp4-pci-dss-4-0-general-apply-scc:
207198
default_result: MANUAL
208199
result_after_remediation: MANUAL

‎tests/assertions/ocp4/ocp4-pci-dss-4-0-4.18.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -188,21 +188,12 @@ rule_results:
188188
ocp4-pci-dss-4-0-etcd-peer-key-file:
189189
default_result: PASS
190190
result_after_remediation: PASS
191-
ocp4-pci-dss-4-0-file-groupowner-proxy-kubeconfig:
192-
default_result: NOT-APPLICABLE
193-
result_after_remediation: NOT-APPLICABLE
194191
ocp4-pci-dss-4-0-file-integrity-exists:
195192
default_result: FAIL or NOT-APPLICABLE
196193
result_after_remediation: PASS or NOT-APPLICABLE
197194
ocp4-pci-dss-4-0-file-integrity-notification-enabled:
198195
default_result: FAIL or NOT-APPLICABLE
199196
result_after_remediation: PASS or NOT-APPLICABLE
200-
ocp4-pci-dss-4-0-file-owner-proxy-kubeconfig:
201-
default_result: NOT-APPLICABLE
202-
result_after_remediation: NOT-APPLICABLE
203-
ocp4-pci-dss-4-0-file-permissions-proxy-kubeconfig:
204-
default_result: NOT-APPLICABLE
205-
result_after_remediation: NOT-APPLICABLE
206197
ocp4-pci-dss-4-0-general-apply-scc:
207198
default_result: MANUAL
208199
result_after_remediation: MANUAL

‎tests/assertions/ocp4/ocp4-pci-dss-4.17.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -170,21 +170,12 @@ rule_results:
170170
ocp4-pci-dss-etcd-peer-key-file:
171171
default_result: PASS
172172
result_after_remediation: PASS
173-
ocp4-pci-dss-file-groupowner-proxy-kubeconfig:
174-
default_result: NOT-APPLICABLE
175-
result_after_remediation: NOT-APPLICABLE
176173
ocp4-pci-dss-file-integrity-exists:
177174
default_result: FAIL or NOT-APPLICABLE
178175
result_after_remediation: PASS or NOT-APPLICABLE
179176
ocp4-pci-dss-file-integrity-notification-enabled:
180177
default_result: FAIL or NOT-APPLICABLE
181178
result_after_remediation: PASS or NOT-APPLICABLE
182-
ocp4-pci-dss-file-owner-proxy-kubeconfig:
183-
default_result: NOT-APPLICABLE
184-
result_after_remediation: NOT-APPLICABLE
185-
ocp4-pci-dss-file-permissions-proxy-kubeconfig:
186-
default_result: NOT-APPLICABLE
187-
result_after_remediation: NOT-APPLICABLE
188179
ocp4-pci-dss-general-apply-scc:
189180
default_result: MANUAL
190181
result_after_remediation: MANUAL

‎tests/assertions/ocp4/ocp4-pci-dss-4.18.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -170,21 +170,12 @@ rule_results:
170170
ocp4-pci-dss-etcd-peer-key-file:
171171
default_result: PASS
172172
result_after_remediation: PASS
173-
ocp4-pci-dss-file-groupowner-proxy-kubeconfig:
174-
default_result: NOT-APPLICABLE
175-
result_after_remediation: NOT-APPLICABLE
176173
ocp4-pci-dss-file-integrity-exists:
177174
default_result: FAIL or NOT-APPLICABLE
178175
result_after_remediation: PASS or NOT-APPLICABLE
179176
ocp4-pci-dss-file-integrity-notification-enabled:
180177
default_result: FAIL or NOT-APPLICABLE
181178
result_after_remediation: PASS or NOT-APPLICABLE
182-
ocp4-pci-dss-file-owner-proxy-kubeconfig:
183-
default_result: NOT-APPLICABLE
184-
result_after_remediation: NOT-APPLICABLE
185-
ocp4-pci-dss-file-permissions-proxy-kubeconfig:
186-
default_result: NOT-APPLICABLE
187-
result_after_remediation: NOT-APPLICABLE
188179
ocp4-pci-dss-general-apply-scc:
189180
default_result: MANUAL
190181
result_after_remediation: MANUAL

0 commit comments

Comments
 (0)