Skip to content

Commit fcf78ac

Browse files
Removed webhook validation
Signed-off-by: anirudhAgniRedhat <[email protected]>
1 parent f99efa7 commit fcf78ac

File tree

2 files changed

+0
-52
lines changed

2 files changed

+0
-52
lines changed

pkg/cloud/azure/actuators/machine/reconciler.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import (
4747
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
4848
"k8s.io/klog/v2"
4949
"k8s.io/utils/ptr"
50-
azureutils "sigs.k8s.io/cluster-api-provider-azure/util/azure"
5150
"sigs.k8s.io/controller-runtime/pkg/client"
5251
)
5352

@@ -682,9 +681,6 @@ func (s *Reconciler) createVirtualMachine(ctx context.Context, nicName, asName s
682681
}
683682

684683
if s.scope.MachineConfig.CapacityReservationGroupID != "" {
685-
if err = validateCapacityReservationGroupID(s.scope.MachineConfig.CapacityReservationGroupID); err != nil {
686-
return fmt.Errorf("invalid capacityReservationGroupID : %w", err)
687-
}
688684
vmSpec.CapacityReservationGroupID = s.scope.MachineConfig.CapacityReservationGroupID
689685
}
690686

@@ -864,10 +860,3 @@ func createDiagnosticsConfig(config *machinev1.AzureMachineProviderSpec) (*compu
864860
)
865861
}
866862
}
867-
868-
func validateCapacityReservationGroupID(capacityReservationGroupID string) error {
869-
if _, err := azureutils.ParseResourceID(capacityReservationGroupID); err != nil {
870-
return err
871-
}
872-
return nil
873-
}

pkg/cloud/azure/actuators/machine/reconciler_test.go

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -620,44 +620,3 @@ func TestCreateDiagnosticsConfig(t *testing.T) {
620620
})
621621
}
622622
}
623-
624-
func TestValidateCapacityReservationGroupID(t *testing.T) {
625-
testCases := []struct {
626-
name string
627-
inputID string
628-
expectedError error
629-
}{
630-
{
631-
name: "validation for capacityReservationGroupID should return nil error if field input is valid",
632-
inputID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroupName/providers/Microsoft.Compute/capacityReservationGroups/myCapacityReservationGroup",
633-
expectedError: nil,
634-
},
635-
{
636-
name: "validation for capacityReservationGroupID should return error if field input does not start with '/'",
637-
inputID: "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroupName/providers/Microsoft.Compute/capacityReservationGroups/myCapacityReservationGroup",
638-
expectedError: errors.New("invalid resource ID: resource id 'subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroupName/providers/Microsoft.Compute/capacityReservationGroups/myCapacityReservationGroup' must start with '/'"),
639-
},
640-
{
641-
name: "validation for capacityReservationGroupID should return error if field input does not have field name subscriptions",
642-
inputID: "/subscripti/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroupName/providers/Microsoft.Compute/capacityReservationGroups/myCapacityReservationGroup",
643-
expectedError: errors.New("invalid resource ID: /subscripti/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroupName/providers/Microsoft.Compute/capacityReservationGroups/myCapacityReservationGroup"),
644-
},
645-
{
646-
name: "validation for capacityReservationGroupID should return error if field input is empty",
647-
inputID: "",
648-
expectedError: errors.New("invalid resource ID: id cannot be empty"),
649-
},
650-
}
651-
652-
for _, tc := range testCases {
653-
t.Run(tc.name, func(t *testing.T) {
654-
g := NewWithT(t)
655-
err := validateCapacityReservationGroupID(tc.inputID)
656-
if tc.expectedError != nil {
657-
g.Expect(err).To(MatchError(tc.expectedError))
658-
} else {
659-
g.Expect(err).ToNot(HaveOccurred())
660-
}
661-
})
662-
}
663-
}

0 commit comments

Comments
 (0)