feat(frontend): reject duplicate subnet, NSG, and MRG on cluster create#6004
Open
JakobGray wants to merge 2 commits into
Open
feat(frontend): reject duplicate subnet, NSG, and MRG on cluster create#6004JakobGray wants to merge 2 commits into
JakobGray wants to merge 2 commits into
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: JakobGray The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
Skipping CI for Draft Pull Request. |
JakobGray
force-pushed
the
cluster-install-admission
branch
from
d8f9ac9 to
6e76b7c
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR moves several platform “uniqueness” and NSG placement checks (previously enforced by Cluster Service) into the frontend’s admission/static validation so invalid cluster creates fail early with consistent error messages.
Changes:
- Prefetch subscription-scoped clusters and node pools during cluster CREATE admission and add best-effort checks rejecting duplicate managed RG, subnet, and NSG usage across clusters/node pools.
- Extend static validation so
networkSecurityGroupIdmust be in the same subscription and must not be in the cluster’s managed resource group. - Update unit/integration tests and test artifacts to reflect newly enforced CREATE-time validation behavior.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 7 comments.
Show a summary per file
| File | Description |
|---|---|
| test-integration/frontend/artifacts/FrontendCRUD/Cluster/experimental-features-no-afec/04-httpCreate-cluster-with-4.19/create-with-4.19.json | Updates test create payload resource IDs to avoid conflicts with new admission checks. |
| internal/validation/validate_cluster.go | Adds NSG “same subscription” and “not in managed RG” checks at the cluster-level validation layer. |
| internal/validation/validate_cluster_comprehensive_test.go | Adds/adjusts validation test coverage for new NSG subscription/RG constraints. |
| internal/validation/hcpopenshiftcluster_test.go | Updates test cluster setup to include an NSG ID consistent with the new rules. |
| internal/admission/admit_cluster.go | Introduces CREATE-only cross-cluster/nodepool uniqueness admission checks for MRG/subnet/NSG. |
| internal/admission/admit_cluster_test.go | Adds unit tests verifying the new CREATE-only admission checks. |
| frontend/pkg/frontend/cluster.go | Prefetches subscription clusters and their node pools to populate the admission context on CREATE. |
Comment on lines
+287
to
+288
| existingSubnet := existing.CustomerProperties.Platform.SubnetID | ||
| if strings.EqualFold(subnetID, existingSubnet.String()) { |
Comment on lines
+299
to
+300
| nodePoolSubnet := nodePool.Properties.Platform.SubnetID | ||
| if strings.EqualFold(subnetID, nodePoolSubnet.String()) { |
Comment on lines
+329
to
+330
| existingNSG := existing.CustomerProperties.Platform.NetworkSecurityGroupID | ||
| if strings.EqualFold(nsgID, existingNSG.String()) { |
Comment on lines
+282
to
+284
| subnetPath := fldPath.Child("subnetId") | ||
| subnetID := newObj.SubnetID.String() | ||
| var errs field.ErrorList |
Comment on lines
+324
to
+326
| nsgPath := fldPath.Child("networkSecurityGroupId") | ||
| nsgID := newObj.NetworkSecurityGroupID.String() | ||
| var errs field.ErrorList |
Cluster Service no longer returns synchronous 400s for platform uniqueness checks after async CS create migration. Move those checks to the frontend so invalid cluster PUTs fail at admission time with the same error messages CS used in performSpecValidation. These checks are best-effort and may not catch concurrent creates. - Prefetch subscription clusters and node pools in newClusterAdmissionContext - Add admitClusterManagedResourceGroupName, admitClusterSubnetResourceID, and admitClusterNetworkSecurityGroupResourceID (CREATE only) - Add NSG same-subscription and not-in-MRG rules to static validation (parity with validateAroHcpClusterNetworkSecurityGroupResourceId)
JakobGray
force-pushed
the
cluster-install-admission
branch
from
6e76b7c to
03e5c54
Compare
Comment on lines
+287
to
+288
| existingSubnet := existing.CustomerProperties.Platform.SubnetID | ||
| if strings.EqualFold(subnetID, existingSubnet.String()) { |
Comment on lines
+299
to
+300
| nodePoolSubnet := nodePool.Properties.Platform.SubnetID | ||
| if strings.EqualFold(subnetID, nodePoolSubnet.String()) { |
Comment on lines
+329
to
+330
| existingNSG := existing.CustomerProperties.Platform.NetworkSecurityGroupID | ||
| if strings.EqualFold(nsgID, existingNSG.String()) { |
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Comment on lines
+286
to
+296
| for _, existing := range admissionContext.SubscriptionClusters { | ||
| existingSubnet := existing.CustomerProperties.Platform.SubnetID | ||
| if strings.EqualFold(subnetID, existingSubnet.String()) { | ||
| errs = append(errs, field.Invalid( | ||
| subnetPath, | ||
| subnetID, | ||
| fmt.Sprintf("Subnet '%s' is already in use by another cluster", subnetID), | ||
| )) | ||
| break | ||
| } | ||
| } |
Comment on lines
+298
to
+308
| for _, nodePool := range admissionContext.SubscriptionNodePools { | ||
| nodePoolSubnet := nodePool.Properties.Platform.SubnetID | ||
| if strings.EqualFold(subnetID, nodePoolSubnet.String()) { | ||
| errs = append(errs, field.Invalid( | ||
| subnetPath, | ||
| subnetID, | ||
| fmt.Sprintf("Subnet '%s' is already in use by another cluster", subnetID), | ||
| )) | ||
| break | ||
| } | ||
| } |
Comment on lines
+327
to
+337
| for _, existing := range admissionContext.SubscriptionClusters { | ||
| existingNSG := existing.CustomerProperties.Platform.NetworkSecurityGroupID | ||
| if strings.EqualFold(nsgID, existingNSG.String()) { | ||
| errs = append(errs, field.Invalid( | ||
| nsgPath, | ||
| nsgID, | ||
| fmt.Sprintf("Network Security Group '%s' is already in use by another cluster", nsgID), | ||
| )) | ||
| break | ||
| } | ||
| } |
This file contains hidden or 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
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.
What
This change closes the following gaps in validation during cluster create between CS and ARO-HCP:
These mirror checks done in CS before a cluster create is accepted:
validateAroHcpClusterNetworkSecurityGroupResourceIdvalidateManagedResourceGroupUniquenessvalidateSubnetUniquenessvalidateNsgUniquenessThese checks are best-effort. Race conditions are possible for clusters admitted at the same time.
Why
Cluster Service no longer returns synchronous 400s for platform uniqueness checks after async CS create migration. Move those checks to the frontend so invalid cluster PUTs fail at admission time with the same error messages CS used in performSpecValidation.
Testing
Added unit tests for new functions. Modified integration tests where new errors were occurring because they are now being caught by the admission validation. Tested against existing E2E tests around subnet/NSG/MRG reuse between clusters (
test/e2e/cluster_nsg_subnet_reuse.goandtest/e2e/clusters_sharing_resgroup.go)Special notes for your reviewer
PR Checklist
If E2E tests are included:
demonstrate that the test is able to detect a defect/error and fail with
proper error message and logs which communicates nature of the problem.