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

Elasticsearch: add fail_on_detecting_es_version_retry_exceed support #1066

Merged
merged 1 commit into from
Jul 29, 2022

Conversation

ipiticas
Copy link

Q A
Bug fix? no
New feature? yes
API breaks? no
Deprecations? no
Related tickets
License Apache 2.0

What's in this PR?

Add fail_on_detecting_es_version_retry_exceed support for elasticsearch output.

Why?

This field is necessary to prevent Fluend from failing at startup when one or many Elasticsearch hosts are unreachable.

Additional context

Related:

Checklist

  • Code meets the Developer Guide
  • User guide and development docs updated (if needed)
  • Related Helm chart(s) updated (if needed)

@CLAassistant
Copy link

CLAassistant commented Jul 27, 2022

CLA assistant check
All committers have signed the CLA.

@ipiticas ipiticas force-pushed the master branch 3 times, most recently from 335d51f to 799fd6a Compare July 27, 2022 09:38
@ahma ahma requested review from ahma and siliconbrain July 27, 2022 19:27
ahma
ahma previously approved these changes Jul 27, 2022
Copy link
Contributor

@ahma ahma left a comment

Choose a reason for hiding this comment

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

LGTM Thanks @hyperion-hyp

@ipiticas ipiticas force-pushed the master branch 3 times, most recently from dbf679c to 37f9850 Compare July 28, 2022 09:09
siliconbrain
siliconbrain previously approved these changes Jul 28, 2022
@siliconbrain
Copy link
Contributor

@hyperion-hyp to fix the failing build, you should run make generate and commit the changes

@ipiticas
Copy link
Author

@hyperion-hyp to fix the failing build, you should run make generate and commit the changes
... still failing; what did I miss?

@siliconbrain
Copy link
Contributor

siliconbrain commented Jul 28, 2022

@hyperion-hyp seems like you've moved the field from before fail_on_detecting_es_version_retry_exceed to after it sometime after you last ran generate and controller-gen now mirrors this change in the manifest files when the CI build checks for differences in generated stuff. Run

make manifests        # regenerates manifest files
make generate         # regenerates vfs

and commit any changes

@ipiticas
Copy link
Author

@siliconbrain, thanks for your guidance, i've made some progress, but still no luck.

@siliconbrain
Copy link
Contributor

@hyperion-hyp you should check the build details 😉 it says that your newly added field (which is present by default) is missing from a config generation test's expected output:

⋮
--- FAIL: TestAwsElasticsearch (0.00s)
⋮
         exception_backup true
        -fail_on_detecting_es_version_retry_exceed true
         fail_on_putting_template_retry_exceed true
⋮

@ipiticas
Copy link
Author

done!
tnx @siliconbrain

@ipiticas ipiticas force-pushed the master branch 3 times, most recently from c2927bf to d7fe53e Compare July 29, 2022 12:57
@ipiticas ipiticas requested review from ahma and siliconbrain July 29, 2022 15:18
@siliconbrain
Copy link
Contributor

@hyperion-hyp I hate to be the bearer of bad news...again 😅 but it seems that you have a merge conflict in the generated vfs code because another PR has been merged to master which also changed some custom resources. To resolve this, please rebase your branch onto master OR merge master into your branch, then run

make generate        # regenerate any DeepCopy implementations
make manifests       # regenerates manifest files
make generate         # regenerates vfs

and commit and push (or force push, in case of a rebase) your changes.

Copy link
Collaborator

@aslafy-z aslafy-z left a comment

Choose a reason for hiding this comment

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

LGTM

@ipiticas
Copy link
Author

@siliconbrain, A rainbow follows every bad news :), thanks a lot!

Copy link
Contributor

@siliconbrain siliconbrain left a comment

Choose a reason for hiding this comment

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

👍

@siliconbrain siliconbrain merged commit 20a3f93 into kube-logging:master Jul 29, 2022
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.

5 participants