Skip to content

Commit

Permalink
unexport local methods
Browse files Browse the repository at this point in the history
  • Loading branch information
hellt committed Jun 1, 2023
1 parent 552461d commit 4de4d11
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions nodes/srl/srl.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ var (
Funcs(gomplate.CreateFuncs(context.Background(), new(data.Data))).
Parse(srlConfigCmdsTpl)

SRLRequiredKernelVersion = &utils.KernelVersion{
requiredKernelVersion = &utils.KernelVersion{
Major: 4,
Minor: 10,
Revision: 0,
Expand Down Expand Up @@ -381,8 +381,8 @@ func (s *srl) checkKernelVersion() error {
}

// do the comparison
if !kv.GreaterOrEqual(SRLRequiredKernelVersion) {
log.Infof("Nokia SR Linux v23.3.1+ requires a kernel version greater than %s. Detected kernel version: %s", SRLRequiredKernelVersion, kv)
if !kv.GreaterOrEqual(requiredKernelVersion) {
log.Infof("Nokia SR Linux v23.3.1+ requires a kernel version greater than %s. Detected kernel version: %s", requiredKernelVersion, kv)
}
return nil
}
Expand Down
5 changes: 3 additions & 2 deletions utils/kernel_module.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ func IsKernelModuleLoaded(name string) (bool, error) {

const kernelOSReleasePath = "/proc/sys/kernel/osrelease"

// GetKernelVersion returns the parsed OS kernel version.
func GetKernelVersion() (*KernelVersion, error) {
ver, err := os.ReadFile(kernelOSReleasePath)
if err != nil {
Expand All @@ -37,7 +38,7 @@ func GetKernelVersion() (*KernelVersion, error) {

log.Debugf("kernel version: %s", string(ver))

return ParseKernelVersion(ver)
return parseKernelVersion(ver)
}

// KernelVersion holds the parsed OS kernel version.
Expand All @@ -48,7 +49,7 @@ type KernelVersion struct {
Remainder string // the rest of the version string, e.g. "-amd64"
}

func ParseKernelVersion(v []byte) (*KernelVersion, error) {
func parseKernelVersion(v []byte) (*KernelVersion, error) {

re := regexp.MustCompile(`(?P<Major>\d+)\.(?P<Minor>\d+)\.(?P<Revision>\d+)(?P<Remainder>\S+)`)

Expand Down

0 comments on commit 4de4d11

Please sign in to comment.