✨ ROSA: Reconcile ROSAMachinePool fields #4804
Merged
Conversation
This file contains 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
k8s-ci-robot
added
release-note
k8s-ci-robot
added
cncf-cla: yes
muraee
changed the title
muraee
force-pushed
the
reconcile-rosa-machinepool
branch
2 times, most recently
from
713e7eb to
aa768e4
Compare
k8s-ci-robot
added
the
needs-rebase
muraee
force-pushed
the
reconcile-rosa-machinepool
branch
from
aa768e4 to
4930814
Compare
muraee
changed the title
k8s-ci-robot
removed
the
needs-rebase
muraee
force-pushed
the
reconcile-rosa-machinepool
branch
2 times, most recently
from
da45677 to
ddfd1ce
Compare
serngawy
reviewed
Feb 29, 2024
5 tasks
- add Taints field - add TuningConfigs field
This is required for when the managment cluster has OwnerReferencesPermissionEnforcement admission controller enabled.
muraee
force-pushed
the
reconcile-rosa-machinepool
branch
from
8e9a0b5 to
1d3df4a
Compare
muraee
force-pushed
the
reconcile-rosa-machinepool
branch
from
1d3df4a to
a481de3
Compare
muraee
force-pushed
the
reconcile-rosa-machinepool
branch
from
a16b1b1 to
610691b
Compare
|
@stevekuznetsov added, we can add more test cases later. |
|
Sounds good, the round-trip unit test is what I had in mind. /lgtm |
k8s-ci-robot
added
the
lgtm
vincepri
reviewed
Mar 1, 2024
Comment on lines
90
to
93
| // +kubebuilder:validation:Required | ||
| // | ||
| // The taint key to be applied to a node. | ||
| Key string `json:"key"` |
There was a problem hiding this comment.
We usually have the +kubebuilder tags after the comment, like:
Suggested change
| // +kubebuilder:validation:Required | |
| // | |
| // The taint key to be applied to a node. | |
| Key string `json:"key"` | |
| // The taint key to be applied to a node. | |
| // | |
| // +kubebuilder:validation:Required | |
| Key string `json:"key"` |
vincepri
reviewed
Mar 1, 2024
| @@ -115,6 +115,7 @@ func (r *ROSAControlPlaneReconciler) SetupWithManager(ctx context.Context, mgr c | |||
| // +kubebuilder:rbac:groups=cluster.x-k8s.io,resources=machinepools,verbs=get;list;watch | |||
| // +kubebuilder:rbac:groups=controlplane.cluster.x-k8s.io,resources=rosacontrolplanes,verbs=get;list;watch;update;patch;delete | |||
| // +kubebuilder:rbac:groups=controlplane.cluster.x-k8s.io,resources=rosacontrolplanes/status,verbs=get;update;patch | |||
| // +kubebuilder:rbac:groups=controlplane.cluster.x-k8s.io,resources=rosacontrolplanes/finalizers,verbs=update | |||
There was a problem hiding this comment.
vincepri
reviewed
Mar 1, 2024
Comment on lines
303
to
305
| // TODO: expose in status | ||
| rosaScope.Error(err, "rosacontrolplane.spec.network.machineCIDR invalid", networkSpec.MachineCIDR) | ||
| return ctrl.Result{}, nil |
There was a problem hiding this comment.
Could we move this to a validation webhook, and just return the error here (backoff loop) or set a condition?
There was a problem hiding this comment.
Returning an error when the data provided by the user is incorrect would only lead to infinite retry by the controller and not result in a good outcome. It seems universally correct to expose states like this in status so that the user knows that they need to update the object's .spec and so that the controller does not do extra reconciliation loops that cannot possibly result in a better outcome.
k8s-ci-robot
added
size/XL
- cleanup *types.go - report erros in conditions
muraee
force-pushed
the
reconcile-rosa-machinepool
branch
from
99b3515 to
3defa28
Compare
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: stevekuznetsov, vincepri The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
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 type of PR is this?
/kind feature
What this PR does / why we need it:
reconcile changes to the ROSAMachinePool fields
Add 2 new fields
TaintsTuningConfigsWhich 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:
Release note: