Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ ClusterClass: use exact versions from ClusterClass, stop api bump in CC #7231

Merged
merged 1 commit into from
Sep 28, 2022

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Sep 16, 2022

What this PR does / why we need it:
WIP => only first version, unit tests are not complete yet

Condition will be implemented in a separate PR.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Part of #7212

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 16, 2022
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 16, 2022
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

quick, pass, overall lgtm.
it is great to see this happen, it can really simplify the UX for management cluster upgrades when using ClusterClass

internal/controllers/topology/cluster/current_state.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/current_state.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/current_state.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/current_state.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/desired_state.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/desired_state.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/desired_state.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 19, 2022
@sbueringer sbueringer changed the title [WIP] ✨ ClusterClass: use exact versions from ClusterClass, stop api bump in CC ✨ ClusterClass: use exact versions from ClusterClass, stop api bump in CC Sep 19, 2022
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 19, 2022
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 19, 2022
@sbueringer
Copy link
Member Author

@fabriziopandini Should be ready for another round of review now.

cc @killianmuldoon

@sbueringer
Copy link
Member Author

/assign @fabriziopandini

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 27, 2022
@sbueringer
Copy link
Member Author

@fabriziopandini PTAL. Findings should be addressed or answered

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 27, 2022
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-full-main

@fabriziopandini
Copy link
Member

/lgtm

@killianmuldoon PTAL

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 27, 2022
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 27, 2022
@sbueringer
Copy link
Member Author

Squashed the last fix

@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-full-main

Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 28, 2022
@sbueringer
Copy link
Member Author

Thx for thr reviews!

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 28, 2022
@sbueringer
Copy link
Member Author

sbueringer commented Sep 28, 2022

Given this fixes / significantly improves the behavior during Cluster API upgrades I would like to cherry-pick this into the 1.2.x release

/cherry-pick release-1.2

(cc @fabriziopandini )

@k8s-infra-cherrypick-robot

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.2 in a new PR and assign it to you.

In response to this:

Given this fixes the behavior during Cluster API upgrades I would like to cherry-pick this into the 1.2.x release

/cherry-pick release-1.2

(cc @fabriziopandini )

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 merged commit a943e75 into kubernetes-sigs:main Sep 28, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.3 milestone Sep 28, 2022
@k8s-infra-cherrypick-robot

@sbueringer: #7231 failed to apply on top of branch "release-1.2":

Applying: ClusterClass: use exact versions from ClusterClass, stop api bump in CC
Using index info to reconstruct a base tree...
M	internal/controllers/clusterclass/clusterclass_controller.go
M	internal/controllers/topology/cluster/current_state.go
M	internal/controllers/topology/cluster/current_state_test.go
M	internal/controllers/topology/cluster/desired_state.go
M	internal/controllers/topology/cluster/desired_state_test.go
M	internal/controllers/topology/cluster/util_test.go
Falling back to patching base and 3-way merge...
Auto-merging internal/controllers/topology/cluster/util_test.go
Auto-merging internal/controllers/topology/cluster/desired_state_test.go
Auto-merging internal/controllers/topology/cluster/desired_state.go
CONFLICT (content): Merge conflict in internal/controllers/topology/cluster/desired_state.go
Auto-merging internal/controllers/topology/cluster/current_state_test.go
CONFLICT (content): Merge conflict in internal/controllers/topology/cluster/current_state_test.go
Auto-merging internal/controllers/topology/cluster/current_state.go
Auto-merging internal/controllers/clusterclass/clusterclass_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ClusterClass: use exact versions from ClusterClass, stop api bump in CC
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

Given this fixes / significantly improves the behavior during Cluster API upgrades I would like to cherry-pick this into the 1.2.x release

/cherry-pick release-1.2

(cc @fabriziopandini )

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.

@sbueringer
Copy link
Member Author

Manual cherry-pick > #7306

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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 "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants