Add metadata and ipamConfig to worker configuration
#39
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
github-actions
bot
added
documentation
defo89
force-pushed
the
enh-worker-ipam
branch
from
8427bca to
54079ff
Compare
Nuckal777
reviewed
Jan 24, 2025
| for _, networkRef := range providerSpec.AddressesFromNetworks { | ||
| // check if IPAddress exists | ||
| ipAddr := &ipamv1alpha1.IP{} | ||
| ipAddrName := req.Machine.Name |
There was a problem hiding this comment.
Here is a naming collision, if a machine requests more than one IP.
Comment on lines
+89
to
+95
| if err = d.metalClient.Get(ctx, ipAddrKey, ipAddr); err != nil && !apierrors.IsNotFound(err) { | ||
| return nil, err | ||
| } | ||
| if err == nil { | ||
| klog.V(3).Infof("IP found %s", ipAddrName) | ||
| } | ||
| if apierrors.IsNotFound(err) { |
There was a problem hiding this comment.
This looks quite complicated to me. What about the following?
err = d.metalClient.Get()
if err == nil {
// append ip
continue
}
if !apierrors.IsNotFound(err) {
return nil, err
}
// IP creation path + append ip| @@ -45,6 +47,18 @@ func (d *metalDriver) DeleteMachine(ctx context.Context, req *driver.DeleteMachi | |||
| return nil, status.Error(codes.Unknown, fmt.Sprintf("error deleting ignition secret: %s", err.Error())) | |||
| } | |||
|
|
|||
| ip := &ipamv1alpha1.IP{ | |||
| ObjectMeta: metav1.ObjectMeta{ | |||
| Name: req.Machine.Name, | |||
There was a problem hiding this comment.
Also, needs a change to support multiple IP objects per node.
afritzler
requested changes
Jan 27, 2025
pkg/api/v1alpha1/provider.go
Outdated
| @@ -32,4 +34,15 @@ type ProviderSpec struct { | |||
| DnsServers []netip.Addr `json:"dnsServers,omitempty"` | |||
| // ServerLabels are passed to the ServerClaim to find a server with certain properties | |||
| ServerLabels map[string]string `json:"serverLabels,omitempty"` | |||
| // MedaData is a key-value map of additional data which should be passed to the Machine. | |||
Nuckal777
force-pushed
the
enh-worker-ipam
branch
from
54079ff to
2d168a6
Compare
Nuckal777
force-pushed
the
enh-worker-ipam
branch
from
674876e to
4b804f7
Compare
afritzler
approved these changes
Jan 28, 2025
afritzler
changed the title
worker metadata and ipamConfig
afritzler
changed the title
worker metadata and ipamConfig metadata and ipamConfig to worker configuration
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.
Proposed Changes
Fixes #