cluster-api-provider-aws
cluster-api-provider-aws copied to clipboard
kubernetes-sigs
WIP RosaNetwork
What type of PR is this?
/kind feature
What this PR does / why we need it:
Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #
Special notes for your reviewer:
Checklist:
- [ ] squashed commits
- [ ] includes documentation
- [ ] includes emoji in title
- [ ] adds unit tests
- [ ] adds or updates e2e tests
Release note:
Hi @mzazrivec. Thanks for your PR.
I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.
Once the patch is verified, the new status will be reflected by the ok-to-test label.
I understand the commands that are listed here.
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.
you also need to update the ValidatingWebhookConfiguration and MutatingWebhookConfiguration here
Is that really needed at this point? (there are no webhooks implemented for rosanet yet).
The PR looks good in general, we are missing a validation in the RosaControlPlane for making the subnetIDs optional. Please add API (webhook) validation either Subnets OR ROSANetworkRef should defined.
Yep. I added validateROSANetwork() validation fn.
LGTM label has been added.
Based on the convo at https://kubernetes.slack.com/archives/CD6U2V71N/p1759420550389709
/cherry-pick release-2.9
@damdo: once the present PR merges, I will cherry-pick it on top of release-2.9 in a new PR and assign it to you.
In response to this:
Based on the convo at https://kubernetes.slack.com/archives/CD6U2V71N/p1759420550389709
/cherry-pick release-2.9
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: richardcase
The full list of commands accepted by this bot can be found here.
The pull request process is described here
- ~~OWNERS~~ [richardcase]
Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment
@damdo: once the present PR merges, I will cherry-pick it on top of release-2.9 in a new PR and assign it to you.
In response to this:
/cherry-pick release-2.9
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.
LGTM label has been added.
@damdo: #5464 failed to apply on top of branch "release-2.9":
Applying: RosaNetwork: new CRD & reconciler to provision net infra for ROSA-HCP
Using index info to reconstruct a base tree...
M PROJECT
M config/crd/bases/controlplane.cluster.x-k8s.io_rosacontrolplanes.yaml
M config/crd/kustomization.yaml
M config/rbac/role.yaml
M controlplane/rosa/api/v1beta2/rosacontrolplane_types.go
M controlplane/rosa/api/v1beta2/rosacontrolplane_webhook.go
M controlplane/rosa/api/v1beta2/zz_generated.deepcopy.go
M controlplane/rosa/controllers/rosacontrolplane_controller.go
M exp/api/v1beta2/zz_generated.deepcopy.go
M go.mod
M main.go
Falling back to patching base and 3-way merge...
Auto-merging main.go
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging exp/api/v1beta2/zz_generated.deepcopy.go
CONFLICT (content): Merge conflict in exp/api/v1beta2/zz_generated.deepcopy.go
Auto-merging controlplane/rosa/controllers/rosacontrolplane_controller.go
CONFLICT (content): Merge conflict in controlplane/rosa/controllers/rosacontrolplane_controller.go
Auto-merging controlplane/rosa/api/v1beta2/zz_generated.deepcopy.go
CONFLICT (content): Merge conflict in controlplane/rosa/api/v1beta2/zz_generated.deepcopy.go
Auto-merging controlplane/rosa/api/v1beta2/rosacontrolplane_webhook.go
CONFLICT (content): Merge conflict in controlplane/rosa/api/v1beta2/rosacontrolplane_webhook.go
Auto-merging controlplane/rosa/api/v1beta2/rosacontrolplane_types.go
CONFLICT (content): Merge conflict in controlplane/rosa/api/v1beta2/rosacontrolplane_types.go
Auto-merging config/rbac/role.yaml
CONFLICT (content): Merge conflict in config/rbac/role.yaml
Auto-merging config/crd/kustomization.yaml
CONFLICT (content): Merge conflict in config/crd/kustomization.yaml
Auto-merging config/crd/bases/controlplane.cluster.x-k8s.io_rosacontrolplanes.yaml
CONFLICT (content): Merge conflict in config/crd/bases/controlplane.cluster.x-k8s.io_rosacontrolplanes.yaml
Auto-merging PROJECT
CONFLICT (content): Merge conflict in PROJECT
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 RosaNetwork: new CRD & reconciler to provision net infra for ROSA-HCP
In response to this:
/cherry-pick release-2.9
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.
@serngawy: new pull request created: #5701
In response to this:
/cherry-pick release-2.9
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.