✨ Handle variable definition conflicts for external variables #8107

killianmuldoon · 2023-02-14T15:35:59Z

Add handling for conflicting definitions in variables defined in the ClusterClass and external patches. This change includes:

Comparing variables and signalling which variables conflict in the ClusterClass status
Validation and Defaulting of variables based on the appropriate definiton where conflicts exist
Validating that Cluster's define a DefinitionFrom field when there are conflicting variables

Part of #7985

killianmuldoon

/hold

This PR contains a commit from #8076 which should be reviewed and merged first.

killianmuldoon · 2023-02-16T15:40:49Z

This is ready for a round of review @sbueringer

internal/controllers/clusterclass/clusterclass_controller.go

sbueringer

Next iteration. And now reviewing internal/topology/variables

internal/controllers/clusterclass/clusterclass_controller.go

internal/webhooks/cluster_test.go

internal/topology/variables/cluster_variable_validation.go

internal/topology/variables/cluster_variable_defaulting.go

internal/topology/variables/cluster_variable_validation.go

killianmuldoon · 2023-02-22T19:09:21Z

Should be ready for another round @sbueringer

sbueringer · 2023-02-23T11:58:34Z

/retest

Some new flakes but independent of this PR (I'll probably take a look later)

sbueringer · 2023-02-24T15:10:40Z

Sorry my bad. Have to fix the job config..

internal/topology/variables/utils.go

fabriziopandini

This is outstanding work!
Just few comments from my side

internal/controllers/clusterclass/clusterclass_controller.go

fabriziopandini · 2023-02-28T08:44:46Z

internal/topology/variables/cluster_variable_defaulting.go

-func defaultClusterVariable(clusterVariable *clusterv1.ClusterVariable, clusterClassVariable *clusterv1.ClusterClassVariable, fldPath *field.Path, createVariable bool) (*clusterv1.ClusterVariable, field.ErrorList) {
-	if clusterVariable == nil {
+// defaultValue defaults a clusterVariable based on the default value in the clusterClassVariable.
+func defaultValue(currentValue *clusterv1.ClusterVariable, definition *statusVariableDefinition, fldPath *field.Path, createVariable bool) (*clusterv1.ClusterVariable, field.ErrorList) {


kudos for cleaning up the wording (the distinction between value/definition make code more readable)

Absolutely agree. clusterVariable vs clusterClassVariable was driving me slightly crazy :)
(disclaimer I wrote this code initially)

killianmuldoon · 2023-02-28T12:07:42Z

/hold remove

Underlying PRs all merged

killianmuldoon · 2023-02-28T12:08:08Z

/remove-hold

sbueringer

Last nits from my side

internal/topology/variables/cluster_variable_defaulting_test.go

sbueringer · 2023-02-28T12:40:32Z

Thank you very much!!

Really great work, thank you especially for the extensive test coverage!!!

/lgtm

sbueringer · 2023-02-28T12:40:38Z

/assign @fabriziopandini

k8s-ci-robot · 2023-02-28T12:40:38Z

LGTM label has been added.

Git tree hash: 0265b8c4b59c34b7820460c203e763f106fba2f9

fabriziopandini · 2023-02-28T13:32:39Z

yay!
/lgtm
/approve

k8s-ci-robot · 2023-02-28T13:32:51Z

[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:

~~OWNERS~~ [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 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 Feb 14, 2023

k8s-ci-robot requested review from jackfrancis and vincepri February 14, 2023 15:36

k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Feb 14, 2023

killianmuldoon commented Feb 14, 2023

View reviewed changes

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 14, 2023

killianmuldoon mentioned this pull request Feb 14, 2023

External variable discovery #7985

Closed

34 tasks

killianmuldoon force-pushed the pr-exvars-handle-definition-conflict branch 2 times, most recently from f5673c1 to 8a5d8b6 Compare February 14, 2023 19:22

killianmuldoon mentioned this pull request Feb 15, 2023

🌱 Default and Validate Cluster variables based on ClusterClass status #8076

Merged

killianmuldoon force-pushed the pr-exvars-handle-definition-conflict branch 4 times, most recently from f07cbe2 to 042a2a6 Compare February 16, 2023 15:35

killianmuldoon changed the title ~~[WIP] ✨ Handle variable definition conflicts for external variables~~ ✨ Handle variable definition conflicts for external variables Feb 16, 2023

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 Feb 16, 2023

sbueringer reviewed Feb 16, 2023

View reviewed changes

sbueringer reviewed Feb 17, 2023

View reviewed changes

internal/controllers/clusterclass/clusterclass_controller.go Show resolved Hide resolved

internal/webhooks/cluster_test.go Outdated Show resolved Hide resolved

internal/webhooks/cluster_test.go Outdated Show resolved Hide resolved

sbueringer reviewed Feb 17, 2023

View reviewed changes

killianmuldoon force-pushed the pr-exvars-handle-definition-conflict branch from 042a2a6 to d12193b Compare February 17, 2023 11:39

killianmuldoon changed the title ~~✨ Handle variable definition conflicts for external variables~~ ✨ [WIP] Handle variable definition conflicts for external variables Feb 17, 2023

killianmuldoon force-pushed the pr-exvars-handle-definition-conflict branch 4 times, most recently from 2f79163 to 90f9126 Compare February 22, 2023 19:06

killianmuldoon changed the title ~~✨ [WIP] Handle variable definition conflicts for external variables~~ ✨ Handle variable definition conflicts for external variables Feb 22, 2023

killianmuldoon force-pushed the pr-exvars-handle-definition-conflict branch 3 times, most recently from bdcc0e1 to 97b8caf Compare February 24, 2023 15:08

This comment was marked as off-topic.

Sign in to view

killianmuldoon force-pushed the pr-exvars-handle-definition-conflict branch 2 times, most recently from ea0f959 to a9c7a35 Compare February 27, 2023 13:39

sbueringer mentioned this pull request Feb 27, 2023

Consider replacing reflect.DeepEqual #8186

Closed

sbueringer reviewed Feb 27, 2023

View reviewed changes

internal/topology/variables/utils.go Outdated Show resolved Hide resolved

killianmuldoon force-pushed the pr-exvars-handle-definition-conflict branch from a9c7a35 to 9ab052c Compare February 27, 2023 15:56

fabriziopandini reviewed Feb 28, 2023

View reviewed changes

killianmuldoon force-pushed the pr-exvars-handle-definition-conflict branch 2 times, most recently from f1d4b91 to 30315cc Compare February 28, 2023 11:09

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 28, 2023

sbueringer reviewed Feb 28, 2023

View reviewed changes

internal/topology/variables/cluster_variable_defaulting_test.go Outdated Show resolved Hide resolved

internal/topology/variables/cluster_variable_defaulting_test.go Outdated Show resolved Hide resolved

Add handling for variables with conflicting definitions

56f9a52

killianmuldoon force-pushed the pr-exvars-handle-definition-conflict branch from 30315cc to 56f9a52 Compare February 28, 2023 12:28

k8s-ci-robot assigned sbueringer Feb 28, 2023

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 28, 2023

k8s-ci-robot assigned fabriziopandini Feb 28, 2023

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 28, 2023

k8s-ci-robot merged commit 83e7476 into kubernetes-sigs:main Feb 28, 2023

k8s-ci-robot added this to the v1.4 milestone Feb 28, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

✨ Handle variable definition conflicts for external variables #8107

✨ Handle variable definition conflicts for external variables #8107

killianmuldoon commented Feb 14, 2023

killianmuldoon left a comment

killianmuldoon commented Feb 16, 2023 •

edited

Loading

sbueringer left a comment

killianmuldoon commented Feb 22, 2023

sbueringer commented Feb 23, 2023

This comment was marked as off-topic.

sbueringer commented Feb 24, 2023

fabriziopandini left a comment

fabriziopandini Feb 28, 2023

sbueringer Feb 28, 2023

killianmuldoon commented Feb 28, 2023

killianmuldoon commented Feb 28, 2023

sbueringer left a comment

sbueringer commented Feb 28, 2023

sbueringer commented Feb 28, 2023

k8s-ci-robot commented Feb 28, 2023

fabriziopandini commented Feb 28, 2023

k8s-ci-robot commented Feb 28, 2023

✨ Handle variable definition conflicts for external variables #8107

✨ Handle variable definition conflicts for external variables #8107

Conversation

killianmuldoon commented Feb 14, 2023

killianmuldoon left a comment

Choose a reason for hiding this comment

killianmuldoon commented Feb 16, 2023 • edited Loading

sbueringer left a comment

Choose a reason for hiding this comment

killianmuldoon commented Feb 22, 2023

sbueringer commented Feb 23, 2023

This comment was marked as off-topic.

sbueringer commented Feb 24, 2023

fabriziopandini left a comment

Choose a reason for hiding this comment

fabriziopandini Feb 28, 2023

Choose a reason for hiding this comment

sbueringer Feb 28, 2023

Choose a reason for hiding this comment

killianmuldoon commented Feb 28, 2023

killianmuldoon commented Feb 28, 2023

sbueringer left a comment

Choose a reason for hiding this comment

sbueringer commented Feb 28, 2023

sbueringer commented Feb 28, 2023

k8s-ci-robot commented Feb 28, 2023

fabriziopandini commented Feb 28, 2023

k8s-ci-robot commented Feb 28, 2023

killianmuldoon commented Feb 16, 2023 •

edited

Loading