Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: properly resolve reference fields in VMwareEnginePrivateCloud controller #4256

Merged
merged 1 commit into from
Apr 7, 2025
+22 −9
Merged

feat: properly resolve reference fields in VMwareEnginePrivateCloud controller #4256

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions pkg/controller/direct/vmwareengine/privatecloud_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,6 @@ func (m *privateCloudModel) AdapterForObject(ctx context.Context, reader client.
return nil, err
}

// normalize reference fields
if obj.Spec.NetworkConfig != nil && obj.Spec.NetworkConfig.VMwareEngineNetworkRef != nil {
if _, err := obj.Spec.NetworkConfig.VMwareEngineNetworkRef.NormalizedExternal(ctx, reader, obj.GetNamespace()); err != nil {
return nil, err
}
}

// Get VMwareEngine GCP client
gcpClient, err := newGCPClient(ctx, &m.config)
if err != nil {
Expand All @@ -86,6 +79,7 @@ func (m *privateCloudModel) AdapterForObject(ctx context.Context, reader client.
gcpClient: client,
id: id,
desired: obj,
reader: reader,
}, nil
}

Expand All @@ -99,6 +93,7 @@ type privateCloudAdapter struct {
id *krm.PrivateCloudIdentity
desired *krm.VMwareEnginePrivateCloud
actual *pb.PrivateCloud
reader client.Reader
}

var _ directbase.Adapter = &privateCloudAdapter{}
Expand All @@ -123,8 +118,12 @@ func (a *privateCloudAdapter) Find(ctx context.Context) (bool, error) {
func (a *privateCloudAdapter) Create(ctx context.Context, createOp *directbase.CreateOperation) error {
log := klog.FromContext(ctx)
log.V(2).Info("creating vmwareengine private cloud", "name", a.id)
mapCtx := &direct.MapContext{}

if err := a.normalizeReferenceFields(ctx); err != nil {
return err
}

mapCtx := &direct.MapContext{}
desired := a.desired.DeepCopy()
resource := VMwareEnginePrivateCloudSpec_ToProto(mapCtx, &desired.Spec)
if mapCtx.Err() != nil {
Expand Down Expand Up @@ -158,8 +157,12 @@ func (a *privateCloudAdapter) Create(ctx context.Context, createOp *directbase.C
func (a *privateCloudAdapter) Update(ctx context.Context, updateOp *directbase.UpdateOperation) error {
log := klog.FromContext(ctx)
log.V(2).Info("updating vmwareengine private cloud", "name", a.id)
mapCtx := &direct.MapContext{}

if err := a.normalizeReferenceFields(ctx); err != nil {
return err
}

mapCtx := &direct.MapContext{}
desired := a.desired.DeepCopy()
resource := VMwareEnginePrivateCloudSpec_ToProto(mapCtx, &desired.Spec)
if mapCtx.Err() != nil {
Expand Down Expand Up @@ -250,3 +253,13 @@ func (a *privateCloudAdapter) Delete(ctx context.Context, deleteOp *directbase.D
}
return true, nil
}

func (a *privateCloudAdapter) normalizeReferenceFields(ctx context.Context) error {
obj := a.desired
if obj.Spec.NetworkConfig != nil && obj.Spec.NetworkConfig.VMwareEngineNetworkRef != nil {
if _, err := obj.Spec.NetworkConfig.VMwareEngineNetworkRef.NormalizedExternal(ctx, a.reader, obj.GetNamespace()); err != nil {
return err
}
}
return nil
}
Loading