Fix resource update reconciling, increase log level for users reconciler #727
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
Signed-off-by: Yevhenii Tiutiunnyk <evheniytyutyunnik@gmail.com>
evheniyt
requested review from
idanl21,
dbason,
swoehrl-mw,
prudhvigodithi,
jochenkressin,
pchmielnik and
salyh
as code owners
|
The reason why tests are broken (and why they were working before) is that in tests |
|
Hi @prudhvigodithi, thank you for your reply. I did a sync with upstream, but I guess in my case the issue is different, please see my comment above that describes why tests are failing for this PR. |
Signed-off-by: Yevhenii Tiutiunnyk <evheniytyutyunnik@gmail.com>
Signed-off-by: Yevhenii Tiutiunnyk <evheniytyutyunnik@gmail.com>
Signed-off-by: Yevhenii Tiutiunnyk <evheniytyutyunnik@gmail.com>
Signed-off-by: Yevhenii Tiutiunnyk <evheniytyutyunnik@gmail.com>
evheniyt
changed the title
|
@prudhvigodithi could you please review or add someone from active reviewers? |
prudhvigodithi
approved these changes
Feb 26, 2024
|
Thanks @evheniyt for your contribution, the PR LGTM!. |
swoehrl-mw
pushed a commit
to MaibornWolff/opensearch-operator
that referenced
this pull request
Apr 25, 2024
…ler (opensearch-project#727) ### Description Fixes opensearch-project#633 Fixes opensearch-project#731 Based on investigations [here](opensearch-project#633 (comment)) and [here](opensearch-project#731 (comment)) it was found that a discrepancy between `<nil slice>` and `<[] slice>` is causing the operator to constantly update User, Role, IndexTemplate, etc. Also, the current log level for User reconciles produces too many logs, so increasing its level may be a good idea here. Because of the issue with comparing `nil` and empty slices, I have replaced `reflect.DeepEqual` with `comp.Equal`. Also, added a helper function that will sort nested json keys in cases when API returns unsorted keys which is casing comparing to return diff. ### Issues Resolved Closes opensearch-project#633 Closes opensearch-project#731 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. For more information on following Developer Certificate of Origin and signing off your commits, please check [here](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin). --------- Signed-off-by: Yevhenii Tiutiunnyk <evheniytyutyunnik@gmail.com> Signed-off-by: Sebastian Woehrl <sebastian.woehrl@maibornwolff.de>
This was referenced May 3, 2024
swoehrl-mw
pushed a commit
that referenced
this pull request
May 13, 2024
#809) ### Description This fixes the same issue that previously existed with `OpenSearchIndexTemplate` resources (#731), which was fixed in #727 but did not apply the fix to `OpenSearchComponentTemplate` resources. ### Issues Resolved Fixes #799 ### Check List - [x] Commits are signed per the DCO using --signoff - [ ] Unittest added for the new/changed functionality and all unit tests are successful - [ ] Customer-visible features documented - [x] No linter warnings (`make lint`) If CRDs are changed: - [ ] CRD YAMLs updated (`make manifests`) and also copied into the helm chart - [ ] Changes to CRDs documented Please refer to the [PR guidelines](https://github.com/opensearch-project/opensearch-k8s-operator/blob/main/docs/developing.md#submitting-a-pr) before submitting this pull request. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. For more information on following Developer Certificate of Origin and signing off your commits, please check [here](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin). Signed-off-by: Zack Brenton <zack@imposium.com>
swoehrl-mw
pushed a commit
to swoehrl-mw/opensearch-k8s-operator
that referenced
this pull request
May 16, 2024
opensearch-project#809) ### Description This fixes the same issue that previously existed with `OpenSearchIndexTemplate` resources (opensearch-project#731), which was fixed in opensearch-project#727 but did not apply the fix to `OpenSearchComponentTemplate` resources. ### Issues Resolved Fixes opensearch-project#799 ### Check List - [x] Commits are signed per the DCO using --signoff - [ ] Unittest added for the new/changed functionality and all unit tests are successful - [ ] Customer-visible features documented - [x] No linter warnings (`make lint`) If CRDs are changed: - [ ] CRD YAMLs updated (`make manifests`) and also copied into the helm chart - [ ] Changes to CRDs documented Please refer to the [PR guidelines](https://github.com/opensearch-project/opensearch-k8s-operator/blob/main/docs/developing.md#submitting-a-pr) before submitting this pull request. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. For more information on following Developer Certificate of Origin and signing off your commits, please check [here](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin). Signed-off-by: Zack Brenton <zack@imposium.com> (cherry picked from commit f38eb26)
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.
Description
Fixes #633
Fixes #731
Based on investigations here and here it was found that a discrepancy between
<nil slice>and<[] slice>is causing the operator to constantly update User, Role, IndexTemplate, etc.Also, the current log level for User reconciles produces too many logs, so increasing its level may be a good idea here.
Because of the issue with comparing
niland empty slices, I have replacedreflect.DeepEqualwithcomp.Equal. Also, added a helper function that will sort nested json keys in cases when API returns unsorted keys which is casing comparing to return diff.Issues Resolved
Closes #633
Closes #731
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.