Skip to content

🌱 Enhances VirtualMachineSetResourcePolicy reconcile #3518

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

Merged
merged 1 commit into from
Jun 25, 2025
+10 −22
Merged

🌱 Enhances VirtualMachineSetResourcePolicy reconcile #3518

Show file tree
Hide file tree
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
24 changes: 3 additions & 21 deletions pkg/services/vmoperator/resource_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (

"github.com/pkg/errors"
vmoprv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha2"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
Expand All @@ -37,17 +36,10 @@ type RPService struct {
// ReconcileResourcePolicy ensures that a VirtualMachineSetResourcePolicy exists for the cluster
// Returns the name of a policy if it exists, otherwise returns an error.
func (s *RPService) ReconcileResourcePolicy(ctx context.Context, clusterCtx *vmware.ClusterContext) (string, error) {
resourcePolicy, err := s.getVirtualMachineSetResourcePolicy(ctx, clusterCtx)
resourcePolicy, err := s.createOrPatchVirtualMachineSetResourcePolicy(ctx, clusterCtx)
if err != nil {
if !apierrors.IsNotFound(err) {
return "", errors.Errorf("unexpected error in getting the Resource policy: %+v", err)
}
resourcePolicy, err = s.createVirtualMachineSetResourcePolicy(ctx, clusterCtx)
if err != nil {
return "", errors.Errorf("failed to create Resource Policy: %+v", err)
}
return "", errors.Errorf("failed to create Resource Policy: %+v", err)
}

return resourcePolicy.Name, nil
}

Expand All @@ -60,17 +52,7 @@ func (s *RPService) newVirtualMachineSetResourcePolicy(clusterCtx *vmware.Cluste
}
}

func (s *RPService) getVirtualMachineSetResourcePolicy(ctx context.Context, clusterCtx *vmware.ClusterContext) (*vmoprv1.VirtualMachineSetResourcePolicy, error) {
vmResourcePolicy := &vmoprv1.VirtualMachineSetResourcePolicy{}
vmResourcePolicyName := client.ObjectKey{
Namespace: clusterCtx.Cluster.Namespace,
Name: clusterCtx.Cluster.Name,
}
err := s.Client.Get(ctx, vmResourcePolicyName, vmResourcePolicy)
return vmResourcePolicy, err
}

func (s *RPService) createVirtualMachineSetResourcePolicy(ctx context.Context, clusterCtx *vmware.ClusterContext) (*vmoprv1.VirtualMachineSetResourcePolicy, error) {
func (s *RPService) createOrPatchVirtualMachineSetResourcePolicy(ctx context.Context, clusterCtx *vmware.ClusterContext) (*vmoprv1.VirtualMachineSetResourcePolicy, error) {
vmResourcePolicy := s.newVirtualMachineSetResourcePolicy(clusterCtx)

_, err := ctrlutil.CreateOrPatch(ctx, s.Client, vmResourcePolicy, func() error {
Expand Down
8 changes: 7 additions & 1 deletion pkg/services/vmoperator/resource_policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ import (
"testing"

. "github.com/onsi/gomega"
vmoprv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha2"
capi_util "sigs.k8s.io/cluster-api/util"
"sigs.k8s.io/controller-runtime/pkg/client"

"sigs.k8s.io/cluster-api-provider-vsphere/pkg/util"
)
Expand All @@ -44,7 +46,11 @@ func TestRPService(t *testing.T) {
g.Expect(err).NotTo(HaveOccurred())
g.Expect(name).To(Equal(clusterName))

resourcePolicy, err := rpService.getVirtualMachineSetResourcePolicy(ctx, clusterCtx)
resourcePolicy := &vmoprv1.VirtualMachineSetResourcePolicy{}
err = rpService.Client.Get(ctx, client.ObjectKey{
Namespace: clusterCtx.Cluster.Namespace,
Name: clusterCtx.Cluster.Name,
}, resourcePolicy)
g.Expect(err).NotTo(HaveOccurred())
g.Expect(resourcePolicy.Spec.ResourcePool.Name).To(Equal(clusterName))
g.Expect(resourcePolicy.Spec.Folder).To(Equal(clusterName))
Expand Down