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

🐛 SSA: ignore diff of other managers #6880

Merged

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Jul 8, 2022

What this PR does / why we need it:

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

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 8, 2022
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 8, 2022
@sbueringer
Copy link
Member Author

cc @fabriziopandini @chrischdi

@sbueringer
Copy link
Member Author

/retest

@sbueringer sbueringer force-pushed the pr-optimize-ssa-dryrun branch from 9dd1cf9 to 88cd676 Compare July 8, 2022 15:43
Copy link
Member

@vincepri vincepri 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 Jul 8, 2022
@chrischdi
Copy link
Member

Change makes sense to me.

/lgtm

Should we add a proper failing test at internal/controllers/topology/cluster/structuredmerge/serversidepathhelper_test.go TestServerSideApply:

  1. Create obj using topology mgr + ssa
  2. modify object using other manager (to get a change in cache so the diff would occur in managedFields when creating the patchhelper)
  3. create patchhelper using output obj of 1.
  4. assert that there would be no changes?

@sbueringer sbueringer force-pushed the pr-optimize-ssa-dryrun branch from 88cd676 to 0528eda Compare July 11, 2022 07:52
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 11, 2022
@sbueringer
Copy link
Member Author

Change makes sense to me.

/lgtm

Should we add a proper failing test at internal/controllers/topology/cluster/structuredmerge/serversidepathhelper_test.go TestServerSideApply:

  1. Create obj using topology mgr + ssa
  2. modify object using other manager (to get a change in cache so the diff would occur in managedFields when creating the patchhelper)
  3. create patchhelper using output obj of 1.
  4. assert that there would be no changes?

Integrated it one of the tests we already have

@sbueringer
Copy link
Member Author

/cherry-pick release-1.2

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

/cherry-pick release-1.2

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.

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.

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 11, 2022
@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 Jul 11, 2022
@k8s-ci-robot k8s-ci-robot merged commit b2605ab into kubernetes-sigs:main Jul 11, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.3 milestone Jul 11, 2022
@k8s-infra-cherrypick-robot

@sbueringer: new pull request created: #6888

In response to this:

/cherry-pick release-1.2

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 sbueringer deleted the pr-optimize-ssa-dryrun branch July 11, 2022 09:26
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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

SSA dryrun detects changes of other controllers
6 participants