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

Update K8s docs to include OpenShift config info. #8300

Merged
merged 5 commits into from
Oct 5, 2018

Conversation

dedemorton
Copy link
Contributor

Closes #8253

Changes:

  • Added OpenShift config info.
  • Edited to make more concise and remove passive voice, comma splices, run-on sentences, etc.

Please respond to the comments that start with //REVIEWERS:

@dedemorton dedemorton added docs review needs_backport PR is waiting to be backported to other branches. labels Sep 13, 2018
Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

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

Thanks for adding OpenShift instructions, I think this will be useful for many people.

the manifest file and enable the container to run as privileged.

// REVIEWERS: I wanted to make it clearer as to where this info needs to go. Is
// this correct?
Copy link
Member

Choose a reason for hiding this comment

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

Looks correct to me, maybe we could put here the whole kubernetes.yml, so it is more clear how it is expected to be at the end.
Also I think it'd be useful to add it too, commented out, to the deployment files.

If `kube-state-metrics` is not already running, deploy it now.

// REVIEWERS: Should we show the command for deploying kube-state-metrics? Looks
// like it's kubectl apply -f kubernetes. Is that correct?
Copy link
Member

Choose a reason for hiding this comment

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

Yes, it is just this command, but they need to download the files. We might link to their deployment documentation (https://github.com/kubernetes/kube-state-metrics#kubernetes-deployment)

@mikeh-elastic
Copy link

I've verified an additional step in #8253 for daemonset scheduling with the defaultNodeSelector.

Tested on latest 3.10 okd release for both sets of filebeat and metricbeat changes by downloading the manifest and making only those changes.

@@ -77,6 +77,11 @@ data:
period: 10s
host: ${NODE_NAME}
hosts: ["localhost:10255"]
# If using Red Hat OpenShift uncomment this:
#hosts: ["https://${HOSTNAME}:10250"]
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jsoriano Do user also need to remove line 79, or will line 81 overwrite the previous setting if users forget to remove 79?

Copy link
Member

Choose a reason for hiding this comment

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

I think that actually this is overwritten, but not sure if this is always the case. It'd be better to mention that previous hosts entry should be removed.

@dedemorton
Copy link
Contributor Author

@mikeh-elastic @jsoriano @exekias Is this ready to go? I need at least one person to give final approval.

Copy link
Contributor

@exekias exekias left a comment

Choose a reason for hiding this comment

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

Leaving some comments related to the build. This is looking good, we will need to test it before merging

@@ -89,6 +89,8 @@ spec:
value:
securityContext:
runAsUser: 0
# If using Red Hat OpenShift uncomment this:
#privileged: true
Copy link
Contributor

Choose a reason for hiding this comment

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

this file is autogenerated, that's why tests are failing. You will need to update https://github.com/elastic/beats/blob/master/deploy/kubernetes/filebeat/filebeat-daemonset.yaml and run make

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@exekias Can we add comments to the generated file so that folks (like me) will know this in the future?

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm divided here, as we offer this file to download, users normally download it and review it before applying. Would it be ok if they see this comment? It could be misleading

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@exekias That's a good point, and I agree. It would be confusing to users, so let's not add the comment. That's why we have the tests, right.

#hosts: ["https://${HOSTNAME}:10250"]
#bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
#ssl.certificate_authorities:
#- /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt
Copy link
Contributor

Choose a reason for hiding this comment

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

@dedemorton
Copy link
Contributor Author

@exekias Updated the files. Mike did some testing, but it wouldn't hurt for someone to test the updated manifest files. Does someone in dev have the right environment set up to do that?

@exekias
Copy link
Contributor

exekias commented Oct 2, 2018

I just tested this and it works flawlessly for Filebeat, there is a permissions issue in Metricbeat, we need to add this to https://github.com/elastic/beats/blob/master/deploy/kubernetes/metricbeat/metricbeat-role.yaml:

- apiGroups:
  - ""
  resources:
  - nodes/stats
  verbs:
  - get

and then run make script to update metricbeat-kubernetes.yml

Copy link
Contributor

@exekias exekias left a comment

Choose a reason for hiding this comment

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

Thank you so mach for your effort @mikeh-elastic & @dedemorton! adding backport label targeting 6.5

@exekias exekias added the v6.5.0 label Oct 3, 2018
@dedemorton dedemorton merged commit 3487b6c into elastic:master Oct 5, 2018
dedemorton added a commit to dedemorton/beats that referenced this pull request Oct 19, 2018
* Update K8s docs to include OpenShift config info.

* Add changes from the review

* Add another fix from review

* Update correct yaml files and run make update

* Update permissions
@dedemorton dedemorton removed the needs_backport PR is waiting to be backported to other branches. label Oct 19, 2018
dedemorton added a commit that referenced this pull request Oct 19, 2018
* Update K8s docs to include OpenShift config info. (#8300)

* Update K8s docs to include OpenShift config info.

* Add changes from the review

* Add another fix from review

* Update correct yaml files and run make update

* Update permissions

* Remove lsbeat (#8456)

*  Removes extraneous heading from the PostgreSQL module docs  (#8530)

* fixing typo in title

* Remove extraneous heading from the PostgreSQL module docs

* Fix docker command for loading dashboards (#8531)
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.

4 participants