removed NodeInfo #1020
Open
removed NodeInfo #1020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
mslacken
commented
Dec 15, 2023
•
mslacken
commented
- removed NodeInfo and using NodeConf instead
- wwctl comands without NodeInfo
- api changes for use without NodeInfo
- fixed tests, mostly will use testenv now
- Closes Merge NodeConf and NodeInfo #916
|
@anderbubble Hoho,, that was my present, merge the grub changes, so that I will a present |
mslacken
force-pushed
the
RemoveNodeInfoRebased
branch
9 times, most recently
from
c343a6e
to
e736cb2
Compare
mslacken
force-pushed
the
RemoveNodeInfoRebased
branch
4 times, most recently
from
542b32a
to
f07b774
Compare
|
close #917 |
This was referenced Mar 11, 2024
mslacken
force-pushed
the
RemoveNodeInfoRebased
branch
from
f07b774
to
2bfae02
Compare
|
@mslacken I'd like to start helping to get this merged. I tried to do the rebase myself, but I think you'll be more readably able to resolve the conflicts in |
mslacken
force-pushed
the
RemoveNodeInfoRebased
branch
from
2bfae02
to
9e74a64
Compare
anderbubble
reviewed
May 8, 2024
internal/pkg/node/datastructure.go
Outdated
Comment on lines
21
to
22
| NodeProfiles map[string]*ProfileConf | ||
| Nodes map[string]*NodeConf | ||
| nodeProfiles map[string]*ProfileConf | ||
| nodes map[string]*NodeConf |
There was a problem hiding this comment.
This needs to be consolidated or otherwise updated to not have both exported and non-exported names the same. (I think we can just do everything with the exported names and remove the non-exported, though callers will need to be updated.)
internal/pkg/warewulfd/provision.go
Outdated
| if remoteNode.Kernel.Override != "" { | ||
| stage_file = kernel.KernelImage(remoteNode.Kernel.Override) | ||
| } else if remoteNode.ContainerName != "" { | ||
| stage_file = container.KernelFind(remoteNode.ContainerName) |
There was a problem hiding this comment.
looks like you need to rebase this branch, the function could not be found during make.
mslacken
force-pushed
the
RemoveNodeInfoRebased
branch
2 times, most recently
from
8dfa371
to
fa4b3d4
Compare
mslacken
force-pushed
the
RemoveNodeInfoRebased
branch
from
a170505
to
127735a
Compare
|
Updated my test environment, still seems to be working ok. |
|
Almost ok, ran into this with the debug template: |
|
Also for: Are these fields eliminated so that the examples in the debug template need to be updated (something I can do) or are they just missing? |
6 tasks
mslacken
force-pushed
the
RemoveNodeInfoRebased
branch
from
127735a
to
f6fc421
Compare
mslacken
force-pushed
the
RemoveNodeInfoRebased
branch
from
f6fc421
to
f41d603
Compare
- Closes warewulf#987 To make the overlays testable in isolation, and after discussion with the TSC, removed host/time/source from overlay files. Signed-off-by: Jonathon Anderson <janderson@ciq.com>
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
Tests already exist for this at internal/pkg/batch/batch_test.go Signed-off-by: Jonathon Anderson <janderson@ciq.com>
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This is a significant change in the undelying data model! nodeDb, err := node.New() will result in a structure which contains the on disk values. Only nodeDb.FindAllNodes() or nodeDb.GetNode(id) will give the nodes with its merged in profiles. Signed-off-by: Christian Goll <cgoll@suse.com>
mostly remove Get and calls for the id Signed-off-by: Christian Goll <cgoll@suse.com>
Signed-off-by: Christian Goll <cgoll@suse.com>
Signed-off-by: Christian Goll <cgoll@suse.com>
introduced wwbool and don't export Nodes and NodeConfs. This requires new explict Yaml (un)marshaling as the standard marshaller won't touch these fields Signed-off-by: Christian Goll <cgoll@suse.com>
this types like WWbool are needed so that they can have their own command line parses which allows a UNDEF for e.g. bool or ints. Signed-off-by: Christian Goll <cgoll@suse.com>
Signed-off-by: Christian Goll <cgoll@suse.com>
Signed-off-by: Christian Goll <cgoll@suse.com>
changes can now not be done directly but must go to SetNode or SetProfile. Although its also now possible to access the field direclty with GetNodePtr Signed-off-by: Christian Goll <cgoll@suse.com>
Signed-off-by: Christian Goll <cgoll@suse.com>
Signed-off-by: Christian Goll <cgoll@suse.com>
net.IPMask doesn't have any advantages, as it would marshalled to mask: - 1 - 2 - 3 - 4 Signed-off-by: Christian Goll <cgoll@suse.com>
tests are updated as * Get isn't possible any more * defaults.conf isn't there any more * bools are now not strings any more in yaml Signed-off-by: Christian Goll <cgoll@suse.com>
mslacken
force-pushed
the
RemoveNodeInfoRebased
branch
from
f41d603
to
c20cc72
Compare
|
@anderbubble I have this rebased on the split overlays which had to be updated as we don't have a |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.