Skip to content

Commit

Permalink
chore: update the comment in environment_check_monitor.go
Browse files Browse the repository at this point in the history
Longhorn 10106

Signed-off-by: Derek Su <[email protected]>
(cherry picked from commit f9fcc3f)

# Conflicts:
#	controller/monitor/environment_check_monitor.go
  • Loading branch information
derekbit authored and mergify[bot] committed Jan 12, 2025
1 parent e7362be commit cee938b
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions controller/monitor/environment_check_monitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down

0 comments on commit cee938b

Please sign in to comment.