kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge --kerneloverride into --kernelversion

Browse Source 
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2024-12-04 15:42:28 -07:00
committed by Christian Goll
parent 8f21d54243
commit a844379bc5
21 changed files with 130 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
internal/pkg/upgrade/node.go
View File

@@ -165,16 +165,12 @@ func (this *Node) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded *nod
if this.Kernel != nil {
upgraded.Kernel = this.Kernel.Upgrade(this.ContainerName)
} else {
upgraded.Kernel = new(node.KernelConf)
}
if upgraded.Kernel.Args == "" {
upgraded.Kernel.Args = this.KernelArgs
}
if upgraded.Kernel.Override == "" {
upgraded.Kernel.Override = this.KernelOverride
}
if upgraded.Kernel.Version == "" {
upgraded.Kernel.Version = this.KernelVersion
inlineKernel := &KernelConf{
Args: this.KernelArgs,
Version: this.KernelVersion,
Override: this.KernelOverride,
}
upgraded.Kernel = inlineKernel.Upgrade(this.ContainerName)
}
if this.Keys != nil {
for key, value := range this.Keys {
@@ -358,16 +354,12 @@ func (this *Profile) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded *
if this.Kernel != nil {
upgraded.Kernel = this.Kernel.Upgrade(this.ContainerName)
} else {
upgraded.Kernel = new(node.KernelConf)
}
if upgraded.Kernel.Args == "" {
upgraded.Kernel.Args = this.KernelArgs
}
if upgraded.Kernel.Override == "" {
upgraded.Kernel.Override = this.KernelOverride
}
if upgraded.Kernel.Version == "" {
upgraded.Kernel.Version = this.KernelVersion
inlineKernel := &KernelConf{
Args: this.KernelArgs,
Version: this.KernelVersion,
Override: this.KernelOverride,
}
upgraded.Kernel = inlineKernel.Upgrade(this.ContainerName)
}
if this.Keys != nil {
for key, value := range this.Keys {
@@ -500,14 +492,14 @@ func (this *KernelConf) Upgrade(containerName string) (upgraded *node.KernelConf
for _, kernel_ := range kernels {
wwlog.Debug("checking if kernel '%v' version '%v' from container '%v' matches override '%v'", kernel_, kernel_.Version(), containerName, this.Override)
if kernel_.Version() == version.String() {
upgraded.Override = kernel_.Path
wwlog.Info("kernel override %v -> %v (container %v)", this.Override, upgraded.Override, containerName)
upgraded.Version = kernel_.Path
wwlog.Info("kernel override %v -> version %v (container %v)", this.Override, upgraded.Version, containerName)
}
}
} else if util.IsFile((&kernel.Kernel{ContainerName: containerName, Path: this.Override}).FullPath()) {
upgraded.Override = this.Override
upgraded.Version = this.Override
}
if upgraded.Override == "" {
if upgraded.Version == "" {
containerDisplay := "unknown"
if containerName != "" {
containerDisplay = containerName
@@ -515,7 +507,9 @@ func (this *KernelConf) Upgrade(containerName string) (upgraded *node.KernelConf
wwlog.Warn("unable to resolve kernel override %v (container %v)", this.Override, containerDisplay)
}
}
upgraded.Version = this.Version
if upgraded.Version == "" {
upgraded.Version = this.Version
}
return
}