From 1c547b670367396684eac00aa72dd4fa40ac9b1b Mon Sep 17 00:00:00 2001 From: Michael Shitrit Date: Wed, 12 Jul 2023 15:42:09 +0300 Subject: [PATCH 1/2] remove hostPID Signed-off-by: Michael Shitrit --- install/self-node-remediation-deamonset.yaml | 2 -- pkg/reboot/rebooter.go | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/install/self-node-remediation-deamonset.yaml b/install/self-node-remediation-deamonset.yaml index 154904d9..20aa5fa4 100644 --- a/install/self-node-remediation-deamonset.yaml +++ b/install/self-node-remediation-deamonset.yaml @@ -23,7 +23,6 @@ spec: type: Directory serviceAccountName: self-node-remediation-controller-manager priorityClassName: system-node-critical - hostPID: true containers: - args: - --is-manager=false @@ -67,7 +66,6 @@ spec: mountPath: /dev securityContext: privileged: true - hostPID: true name: manager ports: - containerPort: 30001 diff --git a/pkg/reboot/rebooter.go b/pkg/reboot/rebooter.go index 4d3bccec..ce4fb941 100644 --- a/pkg/reboot/rebooter.go +++ b/pkg/reboot/rebooter.go @@ -81,7 +81,7 @@ func (r *watchdogRebooter) Reboot() error { // softwareReboot performs software reboot by running systemctl reboot func (r *watchdogRebooter) softwareReboot() error { r.log.Info("about to try software reboot") - // hostPID: true and privileged:true required to run this + // privileged:true required to run this rebootCmd := exec.Command("/usr/bin/nsenter", "-m/proc/1/ns/mnt", "/bin/systemctl", "reboot", "--force", "--force") if err := rebootCmd.Run(); err != nil { From fb3c16fb30a2fc19573ef5ea9bafafcd72b05ea0 Mon Sep 17 00:00:00 2001 From: Michael Shitrit Date: Wed, 12 Jul 2023 16:01:57 +0300 Subject: [PATCH 2/2] update kube versions to 1.25 (where hostPID is removed) - this is the version used in OCP 4.12 Signed-off-by: Michael Shitrit --- .../manifests/self-node-remediation.clusterserviceversion.yaml | 2 +- .../bases/self-node-remediation.clusterserviceversion.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle/manifests/self-node-remediation.clusterserviceversion.yaml b/bundle/manifests/self-node-remediation.clusterserviceversion.yaml index 124e3759..fc67d2b4 100644 --- a/bundle/manifests/self-node-remediation.clusterserviceversion.yaml +++ b/bundle/manifests/self-node-remediation.clusterserviceversion.yaml @@ -434,7 +434,7 @@ spec: - email: medik8s@googlegroups.com name: Medik8s Team maturity: alpha - minKubeVersion: 1.20.0 + minKubeVersion: 1.25.0 provider: name: Medik8s url: https://www.medik8s.io/ diff --git a/config/manifests/bases/self-node-remediation.clusterserviceversion.yaml b/config/manifests/bases/self-node-remediation.clusterserviceversion.yaml index eacf86c0..75474c3d 100644 --- a/config/manifests/bases/self-node-remediation.clusterserviceversion.yaml +++ b/config/manifests/bases/self-node-remediation.clusterserviceversion.yaml @@ -119,7 +119,7 @@ spec: - email: medik8s@googlegroups.com name: Medik8s Team maturity: alpha - minKubeVersion: 1.20.0 + minKubeVersion: 1.25.0 provider: name: Medik8s url: https://www.medik8s.io/