⚠️ Stop using v1beta1 status in CAPD controllers #12438
Merged
Conversation
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
k8s-ci-robot
added
the
cncf-cla: yes
k8s-ci-robot
added
do-not-merge/needs-area
sivchari
force-pushed
the
stop-using-deprecated-status
branch
from
67c5a0f to
11e6e27
Compare
|
/assign |
k8s-ci-robot
added
area/provider/infrastructure-docker
fabriziopandini
changed the title
|
/retest |
sivchari
force-pushed
the
stop-using-deprecated-status
branch
3 times, most recently
from
df041e4 to
bea06a7
Compare
k8s-ci-robot
added
the
needs-rebase
sivchari
force-pushed
the
stop-using-deprecated-status
branch
from
bea06a7 to
17b96b2
Compare
k8s-ci-robot
removed
the
needs-rebase
sivchari
force-pushed
the
stop-using-deprecated-status
branch
from
17b96b2 to
1565206
Compare
sbueringer
changed the title
sbueringer
changed the title
sbueringer
reviewed
Jul 4, 2025
test/infrastructure/docker/internal/controllers/backends/docker/dockercluster_backend.go
Outdated
Show resolved
Hide resolved
test/infrastructure/docker/internal/controllers/backends/docker/dockermachine_backend.go
Outdated
Show resolved
Hide resolved
sivchari
force-pushed
the
stop-using-deprecated-status
branch
from
1565206 to
9bbfb2a
Compare
sbueringer
reviewed
Jul 4, 2025
test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller_phases.go
Outdated
Show resolved
Hide resolved
sivchari
force-pushed
the
stop-using-deprecated-status
branch
from
9bbfb2a to
45d196d
Compare
|
Thank you very much!! /test pull-cluster-api-e2e-main /assign @fabriziopandini |
k8s-ci-robot
added
the
lgtm
|
LGTM label has been added. Git tree hash: 48dba1c4d6756fc4fc100fe7b679183fb13a196c
|
There was a problem hiding this comment.
I have found two other possible candidates for changes in this file, could you kindly double check?
L136: should this be condition := conditions.Get(dockerMachine, infrav1.DevMachineDockerContainerProvisionedCondition)?
L241: should this be "!conditions.Has(dockerMachine, infrav1.DevMachineDockerContainerBootstrapExecSucceededCondition) {
There was a problem hiding this comment.
Great catch!
Thanks, fixed.
Signed-off-by: sivchari <[email protected]>
sivchari
force-pushed
the
stop-using-deprecated-status
branch
from
45d196d to
b2046fd
Compare
k8s-ci-robot
removed
the
lgtm
k8s-ci-robot
added
the
lgtm
|
LGTM label has been added. Git tree hash: a76f8bf3c6ad5529266e8e347293bbed725a86f1
|
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: fabriziopandini 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
|
/retest |
sbueringer
reviewed
Jul 4, 2025
| @@ -133,8 +133,8 @@ func (r *MachineBackendReconciler) ReconcileNormal(ctx context.Context, cluster | |||
| // In this case recover the information from the existing v1beta1 condition, because we do not know if | |||
| // all commands succeeded. | |||
| if !conditions.Has(dockerMachine, infrav1.DevMachineDockerContainerBootstrapExecSucceededCondition) { | |||
| condition := v1beta1conditions.Get(dockerMachine, infrav1.BootstrapExecSucceededV1Beta1Condition) | |||
| if condition == nil || condition.Status == corev1.ConditionTrue { | |||
| condition := conditions.Get(dockerMachine, infrav1.DevMachineDockerContainerBootstrapExecSucceededCondition) | |||
There was a problem hiding this comment.
I think we have to revert this one. See the godoc comment directly above
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 PR does / why we need it:
Part of #11947
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 #