From d28068b5007935af0b2aee7413f54c41d53cafe7 Mon Sep 17 00:00:00 2001 From: Vincent Shen Date: Fri, 1 Mar 2024 02:10:11 -0800 Subject: [PATCH 1/2] OCPBUGS-28242: Fix remediation for service_debug-shell_disabled Added mask:true to the remediation. Previously the test was still failling after remediation applied, this is due to lack of mask in the remediation. --- .../service_debug-shell_disabled/kubernetes/shared.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/kubernetes/shared.yml b/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/kubernetes/shared.yml index ff493491e58..88c46c25de6 100644 --- a/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/kubernetes/shared.yml +++ b/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/kubernetes/shared.yml @@ -10,3 +10,4 @@ spec: units: - enabled: false name: debug-shell.service + mask: true From 7046452acfbc5c7310e6582a7b731ba3fb77924f Mon Sep 17 00:00:00 2001 From: Vincent Shen Date: Sun, 3 Mar 2024 22:04:44 -0800 Subject: [PATCH 2/2] Remove Kubernetes remediation for service_debug-shell_disabled We already have a templated remediation for service_disabled, we should remove the remediation in the rule and use the templated remediation instead. --- .../kubernetes/shared.yml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/kubernetes/shared.yml diff --git a/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/kubernetes/shared.yml b/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/kubernetes/shared.yml deleted file mode 100644 index 88c46c25de6..00000000000 --- a/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/kubernetes/shared.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhv,multi_platform_rhcos -apiVersion: machineconfiguration.openshift.io/v1 -kind: MachineConfig -spec: - config: - ignition: - version: 3.1.0 - systemd: - units: - - enabled: false - name: debug-shell.service - mask: true