Skip to content

Commit

Permalink
Fix NSG e2e error
Browse files Browse the repository at this point in the history
  • Loading branch information
nwnt committed Jul 24, 2023
1 parent 750559c commit f0aa69a
Showing 1 changed file with 34 additions and 34 deletions.
68 changes: 34 additions & 34 deletions pkg/validate/openshiftcluster_validatedynamic.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,40 +170,6 @@ func (dv *openShiftClusterDynamicValidator) Dynamic(ctx context.Context) error {
)
}

// FP validation
fpDynamic := dynamic.NewValidator(
dv.log,
dv.env,
dv.env.Environment(),
dv.subscriptionDoc.ID,
dv.fpAuthorizer,
dv.env.FPClientID(),
dynamic.AuthorizerFirstParty,
fpClientCred,
pdpClient,
)

err = fpDynamic.ValidateVnet(
ctx,
dv.oc.Location,
subnets,
dv.oc.Properties.NetworkProfile.PodCIDR,
dv.oc.Properties.NetworkProfile.ServiceCIDR,
)
if err != nil {
return err
}

err = fpDynamic.ValidateDiskEncryptionSets(ctx, dv.oc)
if err != nil {
return err
}

err = fpDynamic.ValidatePreConfiguredNSGs(ctx, dv.oc, subnets)
if err != nil {
return err
}

tenantID := dv.subscriptionDoc.Subscription.Properties.TenantID
options := dv.env.Environment().ClientSecretCredentialOptions()
spTokenCredential, err := azidentity.NewClientSecretCredential(
Expand Down Expand Up @@ -268,5 +234,39 @@ func (dv *openShiftClusterDynamicValidator) Dynamic(ctx context.Context) error {
return err
}

// FP validation
fpDynamic := dynamic.NewValidator(
dv.log,
dv.env,
dv.env.Environment(),
dv.subscriptionDoc.ID,
dv.fpAuthorizer,
dv.env.FPClientID(),
dynamic.AuthorizerFirstParty,
fpClientCred,
pdpClient,
)

err = fpDynamic.ValidateVnet(
ctx,
dv.oc.Location,
subnets,
dv.oc.Properties.NetworkProfile.PodCIDR,
dv.oc.Properties.NetworkProfile.ServiceCIDR,
)
if err != nil {
return err
}

err = fpDynamic.ValidateDiskEncryptionSets(ctx, dv.oc)
if err != nil {
return err
}

err = fpDynamic.ValidatePreConfiguredNSGs(ctx, dv.oc, subnets)
if err != nil {
return err
}

return nil
}

0 comments on commit f0aa69a

Please sign in to comment.