🐛 Fix a bug in apply resources #389
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This may impact multiple functions Signed-off-by: Jian Qiu <jqiu@redhat.com>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: qiujian16 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 |
|
/assign @zhujian7 |
zhujian7
reviewed
Nov 6, 2023
| @@ -88,6 +89,11 @@ func (r *ResourceReader) applyOneObject(info *resource.Info) error { | |||
| helper := resource.NewHelper(info.Client, info.Mapping). | |||
| DryRun(r.dryRun) | |||
|
|
|||
| modified, err := kubectlutil.GetModifiedConfiguration(info.Object, false, unstructured.UnstructuredJSONScheme) | |||
There was a problem hiding this comment.
Hi @qiujian16 could you add some comments/tests for this, I do not understand why moving this func upper can fix the issue.
There was a problem hiding this comment.
this is to get the modified object, it has to be called before info.Get() otherwise the info.Object will be from the server. A test is added.
Signed-off-by: Jian Qiu <jqiu@redhat.com>
|
/lgtm |
|
/unhold |
openshift-merge-bot
bot
merged commit d7db0ea
into
open-cluster-management-io:main
8 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This may impact multiple functions
Summary
Related issue(s)
Fixes #383