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

Sort component template fields before compare to avoid false positives #809

Conversation

Capitrium
Copy link
Contributor

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

  • 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
  • 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 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.

Copy link
Collaborator

@swoehrl-mw swoehrl-mw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @Capitrium. Thanks for contributing this fix.
LGTM

@swoehrl-mw swoehrl-mw changed the title sort component template fields before compare Sort component template fields before compare to avoid false positives May 13, 2024
@swoehrl-mw swoehrl-mw merged commit f38eb26 into opensearch-project:main May 13, 2024
8 checks passed
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 <[email protected]>
(cherry picked from commit f38eb26)
@mskitroot
Copy link

Was this released?

swoehrl-mw pushed a commit that referenced this pull request Jun 18, 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 <[email protected]>
(cherry picked from commit f38eb26)
swoehrl-mw pushed a commit to MaibornWolff/opensearch-operator that referenced this pull request Jul 2, 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 <[email protected]>
(cherry picked from commit f38eb26)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] OpenSearchComponentTemplate resources are constantly reconciled
3 participants