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.

Sign up for GitHub

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

Jump to bottom

⚠️ Adjust CC & Cluster controller to block on variable conflicts, deprecate definitionFrom #10841

Merged
merged 2 commits into from
Jul 15, 2024
Merged

⚠️ Adjust CC & Cluster controller to block on variable conflicts, deprecate definitionFrom #10841

merged 2 commits into from
Jul 15, 2024

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Jul 8, 2024 •
edited
Loading

What this PR does / why we need it:
This PR contains the following changes:

  • ClusterClass controller will now set VariablesReconciled condition on the ClusterClass to false if there are variable conflicts
    • The consequence of that will be that the Cluster topology controller will stop reconciling corresponding clusters until the conflicts are resvoled
  • Deprecation of the definitionFrom field
  • Add "name" as a map key for variable arrays. This will allow separate ownership per variable
  • Corresponding changes & cleanups to the variable defaulting and validation code

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 #10666

@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 Jul 8, 2024
@k8s-ci-robot k8s-ci-robot added do-not-merge/needs-area PR is missing an area label size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 8, 2024
@sbueringer sbueringer force-pushed the pr-deprecate-definition-from branch from cbc46ca to bb1c09c Compare July 8, 2024 10:22
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 8, 2024
@sbueringer sbueringer force-pushed the pr-deprecate-definition-from branch 2 times, most recently from 9589d4e to 61b0ec2 Compare July 8, 2024 10:56
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

@sbueringer sbueringer force-pushed the pr-deprecate-definition-from branch from 61b0ec2 to e87e89c Compare July 8, 2024 13:18
@sbueringer sbueringer changed the title [WIP] ⚠️ adjust CC & Cluster controller to block on variable conflicts, deprecate definitionFrom ⚠️ Adjust CC & Cluster controller to block on variable conflicts, deprecate definitionFrom Jul 8, 2024
@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 Jul 8, 2024
@sbueringer sbueringer added the area/clusterclass Issues or PRs related to clusterclass label Jul 8, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Jul 8, 2024
@sbueringer sbueringer force-pushed the pr-deprecate-definition-from branch from e87e89c to a11e92a Compare July 8, 2024 14:39
@sbueringer
Copy link
Member Author

/test ?

@k8s-ci-robot
Copy link
Contributor

@sbueringer: The following commands are available to trigger required jobs:

  • /test pull-cluster-api-build-main
  • /test pull-cluster-api-e2e-blocking-main
  • /test pull-cluster-api-e2e-conformance-ci-latest-main
  • /test pull-cluster-api-e2e-conformance-main
  • /test pull-cluster-api-e2e-main
  • /test pull-cluster-api-e2e-mink8s-main
  • /test pull-cluster-api-e2e-upgrade-1-30-1-31-main
  • /test pull-cluster-api-test-main
  • /test pull-cluster-api-test-mink8s-main
  • /test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-apidiff-main
  • pull-cluster-api-build-main
  • pull-cluster-api-e2e-blocking-main
  • pull-cluster-api-test-main
  • pull-cluster-api-verify-main

In response to this:

/test ?

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-sigs/prow repository.

@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-30-1-31-main

@sbueringer sbueringer force-pushed the pr-deprecate-definition-from branch from a11e92a to 0deaa9d Compare July 8, 2024 14:43
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-30-1-31-main

@sbueringer
Copy link
Member Author

/assign @fabriziopandini @chrischdi

/assign @killianmuldoon
(In case you have some time, otherwise just fyi :))

@sbueringer sbueringer force-pushed the pr-deprecate-definition-from branch from 0deaa9d to 6efdc0d Compare July 8, 2024 15:55
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-30-1-31-main

fabriziopandini
fabriziopandini reviewed Jul 9, 2024
View reviewed changes
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.

Huge simplification for the end users and nice cleanup in the code base
Only a couple of nits from my side

api/v1beta1/cluster_types.go Show resolved Hide resolved
internal/topology/variables/cluster_variable_defaulting.go Show resolved Hide resolved
internal/topology/variables/cluster_variable_defaulting_test.go Show resolved Hide resolved
internal/topology/variables/cluster_variable_defaulting_test.go Outdated Show resolved Hide resolved
@sbueringer sbueringer added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jul 9, 2024
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-30-1-31-main

@sbueringer
Copy link
Member Author

@fabriziopandini Thx for the quick review. Findings should be addressed, PTAL :)

@sbueringer sbueringer added this to the v1.8 milestone Jul 10, 2024
@fabriziopandini
Copy link
Member

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

@fabriziopandini
Copy link
Member

/lgtm
/approve

/hold for @chrischdi to take a look

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Jul 10, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 412479cb71bae21d557e738554180321a1c4298d

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 10, 2024
@sbueringer sbueringer mentioned this pull request Jul 10, 2024
Open
55 tasks
@chrischdi
Copy link
Member

/approve

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 15, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi, 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:
  • OWNERS [chrischdi,fabriziopandini]

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 merged commit 6b3f021 into kubernetes-sigs:main Jul 15, 2024
34 checks passed
@sbueringer sbueringer deleted the pr-deprecate-definition-from branch July 15, 2024 11:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fabriziopandini fabriziopandini fabriziopandini left review comments

@jackfrancis jackfrancis Awaiting requested review from jackfrancis

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

Assignees

@chrischdi chrischdi

@fabriziopandini fabriziopandini

@killianmuldoon killianmuldoon

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/clusterclass Issues or PRs related to clusterclass 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Milestone
v1.8
Development

Successfully merging this pull request may close these issues.
5 participants
@sbueringer @k8s-ci-robot @fabriziopandini @chrischdi @killianmuldoon