Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Patch kubeadmconfig objects only if no error occurs during reconciliation #242

Merged
merged 1 commit into from
Sep 23, 2019

Conversation

accepting
Copy link
Contributor

Signed-off-by: JunLi [email protected]

What this PR does / why we need it:
There is no need to update KubeadmConfig objects if any error occurs during the reconciliation.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 22, 2019
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 22, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @accepting. Thanks for your PR.

I'm waiting for a kubernetes-sigs or kubernetes 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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 22, 2019
@chuckha
Copy link
Contributor

chuckha commented Sep 23, 2019

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 23, 2019
log.Error(err, "failed to patch config")
if rerr == nil {
rerr = err
if rerr == nil {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like a departure from other cluster-api related use cases, where we would potentially want to ensure that we persist some type of intermediate or partial state back to the resource. That said, the behaviors of this controller vs those other cases it is probably generally ok.

Are we attempting to set ErrorMessage and ErrorReason anywhere where this change could potentially prevent those changes from persisting?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do not currently use ErrorMessage or ErrorReason in this provider

@chuckha
Copy link
Contributor

chuckha commented Sep 23, 2019

@accepting This is right. We never set the config value except in the successful case so there is no reason to issue a patch in an error case, but I'm curious why you want this change? Was there a bug you were encountering that this fixes?

@accepting
Copy link
Contributor Author

@chuckha In our use cases, the bootstrap objects support update. When we try to update a bootstrap object, we found the object was updated even if some error occurs afterwards.

@chuckha
Copy link
Contributor

chuckha commented Sep 23, 2019

That's interesting. Does an update to the bootstrap object actually modify the cluster?

@accepting
Copy link
Contributor Author

Yes, with the help of kubeadm phases, we update the control planes/worker nodes' settings by updating their bootstrap objects.

@chuckha
Copy link
Contributor

chuckha commented Sep 23, 2019

I'm fine merging this and reverting or changing behavior back if we need to start populating the error message.

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: accepting, chuckha

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 23, 2019
@detiber
Copy link
Contributor

detiber commented Sep 23, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 23, 2019
@k8s-ci-robot k8s-ci-robot merged commit e5441e0 into kubernetes-retired:master Sep 23, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants