From cee938bd3c977e2a40f7792aaef143263ee066a0 Mon Sep 17 00:00:00 2001 From: Derek Su Date: Sat, 11 Jan 2025 17:12:44 +0800 Subject: [PATCH] chore: update the comment in environment_check_monitor.go Longhorn 10106 Signed-off-by: Derek Su (cherry picked from commit f9fcc3fb36eefc7bbc57c4a36b2b3acf55c417dd) # Conflicts: # controller/monitor/environment_check_monitor.go --- controller/monitor/environment_check_monitor.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/controller/monitor/environment_check_monitor.go b/controller/monitor/environment_check_monitor.go index b50a629da8..936edf7c14 100644 --- a/controller/monitor/environment_check_monitor.go +++ b/controller/monitor/environment_check_monitor.go @@ -209,9 +209,15 @@ func (m *EnvironmentCheckMonitor) syncPackagesInstalled(kubeNode *corev1.Node, n options = append(options, "-I") packages = append(packages, "net-fs/nfs-utils", "sys-block/open-iscsi", "sys-fs/cryptsetup", "sys-fs/lvm2") default: +<<<<<<< HEAD collectedData.conditions = types.SetCondition(collectedData.conditions, longhorn.NodeConditionTypeRequiredPackages, longhorn.ConditionStatusFalse, string(longhorn.NodeConditionReasonUnknownOS), fmt.Sprintf("Unable to verify the required packages because the OS image '%v' is unknown to the Longhorn system. Please ensure the required packages are installed.", osImage)) +======= + // Skip environment check condition when + // 1.The OS is unknown to Longhorn + // 2.The OS that already has all packages installed such as Harvester +>>>>>>> f9fcc3fb (chore: update the comment in environment_check_monitor.go) return }