Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/filebeat] filebeat fixes #6332

Merged
merged 4 commits into from
Jul 15, 2018
Merged

[stable/filebeat] filebeat fixes #6332

merged 4 commits into from
Jul 15, 2018

Conversation

rtluckie
Copy link
Contributor

@rtluckie rtluckie commented Jun 26, 2018

  • remove opinionated tolerations
  • use oss image
  • bump image version to 6.3.0
  • include /var/log/messages and /var/log/syslog
  • fix indent in .Values.config
  • bump chart version
  • bump appVersion

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 26, 2018
@rtluckie
Copy link
Contributor Author

/assign @mgoodness

@rtluckie
Copy link
Contributor Author

/assign @unguiculus

@unguiculus
Copy link
Member

cc @rendhalver @sstarcher

@unguiculus
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 28, 2018
@@ -75,6 +77,12 @@ resources: {}
# cpu: 100m
# memory: 100Mi

nodeSelector: {}

tolerations: []
Copy link
Collaborator

Choose a reason for hiding this comment

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

please put the "opinionated" toleration here as users will expect this to collect all logs.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@sstarcher fixed

Copy link
Collaborator

@rendhalver rendhalver Jul 10, 2018

Choose a reason for hiding this comment

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

What about the other tolerations?

      - key: node-role.kubernetes.io/master
        operator: Exists
        effect: NoSchedule

You have missed all the elements of the original toleration

Copy link
Contributor

@dcwangmit01 dcwangmit01 Jul 10, 2018

Choose a reason for hiding this comment

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

@rendhalver The toleration that is in this PR, but commented out by default and serving as an example:

tolerations: []
#  - operator: Exists

Should match everything.

From the docs:

    An empty key with operator Exists matches all keys, values and effects which means this will tolerate everything.

tolerations:
- operator: "Exists"

Copy link
Collaborator

Choose a reason for hiding this comment

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

I don't think you are correct.
The - indicates it's an array and the whole hash i pasted is one element of that array.
You have only included one part of that sub hash.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Oh I see what you are doing.
What does removing the rest of elements of the hash achieve?
Does it do the same thing as the original?
The main reason I am asking is people have probably already used this to deploy filebeat and we could be changing how it functions.

version: 0.3.0
appVersion: 6.2.3
version: 0.3.1
appVersion: 6.3.0
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is increasing the image version really a bugfix?
Increasing the minor version of the appVersion and image seems like cause for increasing at least the minor version of the chart.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@rendhalver good catch!
fixed.

@sstarcher
Copy link
Collaborator

I still have a issue with the toleration the previous chart would run on all servers using the default toleration, but this is a breaking change. As long as everyone is willing to accept a breaking change that's fine.

I'm aware of the change so I can easily make the proper configuration changes on my end.

Ryan Luckie added 4 commits July 12, 2018 23:30
- remove opinionated tolerations
- use oss image
- bump image version to 6.3.0
- include `/var/log/messages` and `/var/log/syslog`
- fix indent in .Values.config
- bump chart version
- bump appVersion
- bump chart minor version
- bump filebeat image version to 6.3.1
- update default `.Values.tolerations` to ensure filebeat pod is scheduled on every node (including masters)
@rtluckie
Copy link
Contributor Author

@rendhalver @sstarcher

I enabled the previously commented tolerations so that filebeat pods will be scheduled on all nodes.

TMK... If the intent is to ensure that a filebeat pod is, by default, scheduled on all nodes (including masters) then the tolerations specified in values.yaml should suffice. All the other elements in the hash are superfluous.

Tolerations seem to work on k8s 1.9.9, 1.10.5 and 1.11.0, but maybe I missed something.

@sstarcher
Copy link
Collaborator

@rtluckie nope it looks perfectly fine. Last I looked I thought it was still toleration: [] and below that a commented out example.

@sstarcher
Copy link
Collaborator

@rtluckie thanks for the great work

@unguiculus
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 15, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rtluckie, unguiculus

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 15, 2018
@k8s-ci-robot k8s-ci-robot merged commit 6b15aac into helm:master Jul 15, 2018
NicolasT added a commit to scality/charts that referenced this pull request Jul 15, 2018
…labels

* kubernetes/master: (411 commits)
  [stable/efs-provisioner] Chart for efs-provisioner, a Kubernetes external-storage provisioner (helm#3233)
  [stable/filebeat] filebeat fixes (helm#6332)
  [stable/stolon] Add support for priorityClasses (helm#6607)
  [stable/external-dns] Add support for priorityClasses (helm#6606)
  [stable/minio] Add support for priorityClasses (helm#6604)
  [stable/cluster-autoscaler] Add support for priorityClasses (helm#6603)
  [stable/oauth2-proxy] Add support for priorityClasses (helm#6586)
  [stable/elasticsearch-exporter] add support for priorityClasses (helm#6584)
  [stable/traefik] adding support for traefik wildcard certificates (helm#6015)
  gcloud-sqlproxy: add tolerations and affinity to the Deployment (helm#6495)
  Review readme (helm#6399)
  [stable/mongodb-replicaset] Prometheus Metrics export (helm#6282)
  [stable/artifactory-ha] Typo fix: livessProbed->livenessProbed (helm#6462)
  [stable/artifactory] livessProbed->livenessProbed (helm#6461)
  [incubator/kube-spot-termination-notice-handler] Add Support for Tolerations (helm#5813)
  [stable/kanister-operator] RBAC changes and kanister profile creation (helm#6280)
  fix redis-ha NOTE.txt, stable/redis-ha don't create master-0 pod (helm#6131)
  [stable/concourse] add support for custom envvars for the web containers (helm#6441)
  upgrade to latest prometheus release 2.3.2 and alertmanager 0.15.1 (helm#6623)
  cert-manager: fast-forward to upstream 777ce6f4 (helm#6625)
  ...
@rtluckie rtluckie deleted the bugfix/filebeat branch July 18, 2018 21:09
Jnig pushed a commit to Jnig/charts that referenced this pull request Nov 13, 2018
* Filebeat fixes

- remove opinionated tolerations
- use oss image
- bump image version to 6.3.0
- include `/var/log/messages` and `/var/log/syslog`
- fix indent in .Values.config
- bump chart version
- bump appVersion

* requested changes

* requested changes

- bump chart minor version
- bump filebeat image version to 6.3.1

* Requested changes

- update default `.Values.tolerations` to ensure filebeat pod is scheduled on every node (including masters)

Signed-off-by: Jakob Niggel <info@jakobniggel.de>
gsemet pushed a commit to gsemet/charts that referenced this pull request Nov 13, 2018
* Filebeat fixes

- remove opinionated tolerations
- use oss image
- bump image version to 6.3.0
- include `/var/log/messages` and `/var/log/syslog`
- fix indent in .Values.config
- bump chart version
- bump appVersion

* requested changes

* requested changes

- bump chart minor version
- bump filebeat image version to 6.3.1

* Requested changes

- update default `.Values.tolerations` to ensure filebeat pod is scheduled on every node (including masters)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants