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

Add kubernetes manifests #5349

Merged
merged 8 commits into from
Oct 18, 2017
Merged

Add kubernetes manifests #5349

merged 8 commits into from
Oct 18, 2017

Conversation

exekias
Copy link
Contributor

@exekias exekias commented Oct 6, 2017

Import https://github.com/elastic/beats-kubernetes, these manifests
deploy filebeat & metricbeat to Kubernetes

Also add documentation about them

Related to #5292

@exekias exekias added enhancement Filebeat Filebeat in progress Pull request is currently in progress. Metricbeat Metricbeat labels Oct 6, 2017
@exekias exekias force-pushed the kubernetes-manifests branch 5 times, most recently from d46df15 to e1a48b8 Compare October 9, 2017 09:44
@exekias
Copy link
Contributor Author

exekias commented Oct 9, 2017

jenkins package it please

@exekias exekias force-pushed the kubernetes-manifests branch 7 times, most recently from e4498cf to 8e98fe7 Compare October 10, 2017 14:01
@exekias exekias added review and removed in progress Pull request is currently in progress. labels Oct 10, 2017
@exekias exekias force-pushed the kubernetes-manifests branch from 5793618 to 6a4f2af Compare October 10, 2017 14:17
@@ -149,6 +155,13 @@ python-env:
@$(PYTHON_ENV)/bin/pip install -q --upgrade pip autopep8 six

# Tests if apm works with the current code
.PHONY: python-env
.PHONY: test-apm
Copy link
Member

Choose a reason for hiding this comment

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

thanks for the fix

until $( curl --output /dev/null --silent http://localhost:8080 ) || [ $TIMEOUT -eq $TIMEOUT_COUNT ]; do
echo "Kube is not up yet"
let TIMEOUT=TIMEOUT+1
sleep 20
Copy link
Member

Choose a reason for hiding this comment

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

That would mean in total it could wait up to 800s? Seems like a bit too much. I would probably increase the TIMEOUT_COUNT to a larger number like 300 but just sleep for 1 second each time.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It normally goes up to ~28 iteration of 40, that leaves around 3 extra minutes for the worst case, is not that much, I could make it more granular if you want, but total timeout time looks good to me as it is, wdyt?

Copy link
Member

Choose a reason for hiding this comment

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

oh, didn't expect it to take several minutes to setup. Then the total is definitively good :-)

I would probably modify the checks as checking every second does not seem to be much overhead, it makes the tests quicker (in best case 19s ;-) ) and I think it's easier to read for a dev changing the code (personal preference).

@@ -0,0 +1,22 @@
ALL = filebeat metricbeat
Copy link
Member

Choose a reason for hiding this comment

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

Is the space after ALL on purpose?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No special reason, can change it

@exekias exekias added the needs_backport PR is waiting to be backported to other branches. label Oct 10, 2017
@exekias exekias force-pushed the kubernetes-manifests branch from 6a4f2af to 7d62181 Compare October 10, 2017 16:41
@exekias exekias requested a review from dedemorton October 10, 2017 20:12
@exekias
Copy link
Contributor Author

exekias commented Oct 10, 2017

pinging @dedemorton on the documentation, let me know what do you think

@exekias exekias added the docs label Oct 16, 2017
@tsg tsg merged commit 21eefda into elastic:master Oct 18, 2017
@exekias exekias removed the needs_backport PR is waiting to be backported to other branches. label Oct 18, 2017
exekias added a commit to exekias/beats that referenced this pull request Oct 27, 2017
* Add kubernetes manifests

Import https://github.com/elastic/beats-kubernetes, these manifests
deploy filebeat & metricbeat to Kubernetes

* Add travis tests

* Add packaging

* Add docs

* Update CHANGELOG

* Fix Makefile

* Check k8s health every second

(cherry picked from commit 21eefda)
tsg pushed a commit that referenced this pull request Oct 30, 2017
* Add kubernetes manifests (#5349)

* Add kubernetes manifests

Import https://github.com/elastic/beats-kubernetes, these manifests
deploy filebeat & metricbeat to Kubernetes

* Add travis tests

* Add packaging

* Add docs

* Update CHANGELOG

* Fix Makefile

* Check k8s health every second

(cherry picked from commit 21eefda)

* Fix chown timing issues on k8s deploy (#5410)

It seems to be failing for v1.7.7, this change should fix it

* Publish kubernetes manifests in the code (#5418)

They will be available for download from github

* Update YAML files to current version

* Update CHANGELOG.asciidoc
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
* Add kubernetes manifests (elastic#5349)

* Add kubernetes manifests

Import https://github.com/elastic/beats-kubernetes, these manifests
deploy filebeat & metricbeat to Kubernetes

* Add travis tests

* Add packaging

* Add docs

* Update CHANGELOG

* Fix Makefile

* Check k8s health every second

(cherry picked from commit d8f2092)

* Fix chown timing issues on k8s deploy (elastic#5410)

It seems to be failing for v1.7.7, this change should fix it

* Publish kubernetes manifests in the code (elastic#5418)

They will be available for download from github

* Update YAML files to current version

* Update CHANGELOG.asciidoc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants