-
Notifications
You must be signed in to change notification settings - Fork 233
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
Fix resource update reconciling, increase log level for users reconciler #727
Fix resource update reconciling, increase log level for users reconciler #727
Conversation
Signed-off-by: Yevhenii Tiutiunnyk <[email protected]>
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 <[email protected]>
Signed-off-by: Yevhenii Tiutiunnyk <[email protected]>
Signed-off-by: Yevhenii Tiutiunnyk <[email protected]>
Signed-off-by: Yevhenii Tiutiunnyk <[email protected]>
@prudhvigodithi could you please review or add someone from active reviewers? |
Thanks @evheniyt for your contribution, the PR LGTM!. |
…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 <[email protected]> Signed-off-by: Sebastian Woehrl <[email protected]>
#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 <[email protected]>
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 <[email protected]> (cherry picked from commit f38eb26)
#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 <[email protected]> (cherry picked from commit f38eb26)
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 <[email protected]> (cherry picked from commit f38eb26)
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
nil
and empty slices, I have replacedreflect.DeepEqual
withcomp.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.