Fix KCP remediation & add machine deployment remediation test #109
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
Signed-off-by: nasusoba <[email protected]> fix lint Signed-off-by: nasusoba <[email protected]> fix comment
mogliang
approved these changes
May 14, 2024
| @@ -41,7 +42,7 @@ import ( | |||
| // reconcileUnhealthyMachines tries to remediate KThreesControlPlane unhealthy machines | |||
| // based on the process described in https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20191017-kubeadm-based-control-plane.md#remediation-using-delete-and-recreate | |||
| // taken from the kubeadm codebase and adapted for the k3s provider. | |||
| func (r *KThreesControlPlaneReconciler) reconcileUnhealthyMachines(ctx context.Context, controlPlane *k3s.ControlPlane) (ret ctrl.Result, retErr error) { | |||
| func (r *KThreesControlPlaneReconciler) reconcileUnhealthyMachines(ctx context.Context, controlPlane *k3s.ControlPlane) (ret ctrl.Result, retErr error) { //nolint:gocyclo | |||
There was a problem hiding this comment.
it's ok to have nolint here only because we want to keep code structure same with kubeadmControlplane, so that it's easier for maintain.
| @@ -14,33 +14,34 @@ See the License for the specific language governing permissions and | |||
| limitations under the License. | |||
| */ | |||
|
|
|||
| // Package locking implements locking functionality. | |||
There was a problem hiding this comment.
This file is from kcp, and copied everywhere, e.g. k3s provider, etcdadm-bootstrap-provider, cluster-api-provider-rke2
Shall we raise an issue to CAPI, ask if it's feasible to set this as public?
There was a problem hiding this comment.
I have raised an issue
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.
machine.Status.NodeRef=nilreconcileKubeConfigFixed #108