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

⚠️ Add filter to associate variables with specific patches #8128

Merged
merged 1 commit into from
Feb 23, 2023
Merged

⚠️ Add filter to associate variables with specific patches #8128

merged 1 commit into from
Feb 23, 2023

Conversation

killianmuldoon
Copy link
Contributor

This PR adds a filter to the variable creation logic in the patch engine to associate variables with specific patches. This means that variables now have a per-patch definition i.e. inline patches can only use inline variables, while external patches only use variables discovered through a discoverVariablesExtension defined as part of that patch.

Part of #7985

@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. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Feb 17, 2023
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Feb 17, 2023
@killianmuldoon killianmuldoon mentioned this pull request Feb 17, 2023
Closed
34 tasks
@killianmuldoon killianmuldoon force-pushed the pr-exvars-per-definition-patches branch 2 times, most recently from ce5ab5f to dbb9fdf Compare February 17, 2023 17:43
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 17, 2023
@killianmuldoon killianmuldoon force-pushed the pr-exvars-per-definition-patches branch 5 times, most recently from 6e2ff22 to 2da2063 Compare February 21, 2023 18:13
@killianmuldoon killianmuldoon changed the title [WIP] 🌱 Add filter to associate variables with specific patches 🌱 Add filter to associate variables with specific patches Feb 21, 2023
@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 Feb 21, 2023
@killianmuldoon killianmuldoon changed the title 🌱 Add filter to associate variables with specific patches ⚠️ Add filter to associate variables with specific patches Feb 21, 2023
@sbueringer
Copy link
Member

sbueringer commented Feb 22, 2023 •
edited

I like the general direction of this PR.

I think we have to do an additional check though (#8128 (comment)), otherwise only nits
(didn't review variables_test.go as that comment might changes something)

@killianmuldoon killianmuldoon force-pushed the pr-exvars-per-definition-patches branch 2 times, most recently from 690554e to 3b57d7f Compare February 22, 2023 20:02
@killianmuldoon killianmuldoon changed the title ⚠️ Add filter to associate variables with specific patches ⚠️ [WIP] Add filter to associate variables with specific patches Feb 22, 2023
@killianmuldoon killianmuldoon changed the title ⚠️ [WIP] Add filter to associate variables with specific patches ⚠️ Add filter to associate variables with specific patches Feb 22, 2023
sbueringer
sbueringer reviewed Feb 23, 2023
View reviewed changes
internal/controllers/topology/cluster/patches/engine.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/patches/engine.go Show resolved Hide resolved
internal/controllers/topology/cluster/patches/engine.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/patches/engine.go Show resolved Hide resolved
internal/controllers/topology/cluster/patches/variables/variables.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/patches/variables/variables.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/patches/variables/variables.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/patches/variables/variables_test.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/patches/variables/variables_test.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/patches/variables/variables_test.go Outdated Show resolved Hide resolved
@killianmuldoon killianmuldoon force-pushed the pr-exvars-per-definition-patches branch 2 times, most recently from 2acb3cd to a91cbd1 Compare February 23, 2023 13:45
@killianmuldoon
Copy link
Contributor Author

/retest

@sbueringer
Copy link
Member

Thank you very much!

/lgtm

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

LGTM label has been added.

Git tree hash: ade3f05801abd2e6891576ae5a98677464313b84

@sbueringer
Copy link
Member

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

@sbueringer
Copy link
Member

/hold
for e2e test results. Otherwise ready for merge in my opinion

@k8s-ci-robot 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 23, 2023
@fabriziopandini
Copy link
Member

/lgtm
/approve

feel free to un-hold when ready

@k8s-ci-robot
Copy link
Contributor

[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 /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 Feb 23, 2023
@sbueringer
Copy link
Member

e2e is green

Thx everyone!

/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 Feb 23, 2023
@k8s-ci-robot k8s-ci-robot merged commit 41b0fb6 into kubernetes-sigs:main Feb 23, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.4 milestone Feb 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@fabriziopandini fabriziopandini fabriziopandini left review comments

@chrischdi chrischdi Awaiting requested review from chrischdi

@enxebre enxebre Awaiting requested review from enxebre

Assignees

@sbueringer sbueringer

@fabriziopandini fabriziopandini

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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@killianmuldoon @sbueringer @k8s-ci-robot @fabriziopandini