Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Commit

Permalink
[metricbeat] nit
Browse files Browse the repository at this point in the history 
* add metricbeat/charts to .helmignore
* reorder some values
* improve values description
  • Loading branch information
@jmlrt
jmlrt committed Apr 15, 2020
1 parent bcdab45 commit c6386ab
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions metricbeat/.helmignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
tests/
.pytest_cache/
charts/
6 changes: 4 additions & 2 deletions metricbeat/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,12 @@ helm install --name metricbeat elastic/metricbeat --set imageTag=7.6.2
| `daemonset.affinity` | Configurable [affinity][] for Metricbeat `DaemonSet`. | `{}` |
| `daemonset.metricbeatConfig` | Allows you to add any config files in `/usr/share/metricbeat` such as `metricbeat.yml` for Metricbeat `DaemonSet`. | see [values.yaml][] |
| `daemonset.nodeSelector` | Configurable [nodeSelector][] for Metricbeat `DaemonSet`. | `{}` |
| `daemonset.resources` | Allows you to set the [resources][] for Metricbeat `DaemonSet`. | `requests.cpu: 100m`<br>`requests.memory: 100Mi`<br>`limits.cpu: 1000m`<br>`limits.memory: 200Mi` |
| `daemonset.tolerations` | Configurable [tolerations][] for Metricbeat `DaemonSet`. | `[]` |
| `deployment.affinity` | Configurable [affinity][] for Metricbeat `Deployment`. | `{}` |
| `deployment.metricbeatConfig` | Allows you to add any config files in `/usr/share/metricbeat` such as `metricbeat.yml` for Metricbeat `Deployment`. | see [values.yaml][] |
| `deployment.nodeSelector` | Configurable [nodeSelector][] for Metricbeat `Deployment`. | `{}` |
| `deployment.resources` | Allows you to set the [resources][] for Metricbeat `Deployment`. | `requests.cpu: 100m`<br>`requests.memory: 100Mi`<br>`limits.cpu: 1000m`<br>`limits.memory: 200Mi` |
| `deployment.tolerations` | Configurable [tolerations][] for Metricbeat `Deployment`. | `[]` |
| `extraContainers` | Templatable string of additional containers to be passed to the `tpl` function | `""` |
| `extraInitContainers` | Templatable string of additional containers to be passed to the `tpl` function | `""` |
Expand Down Expand Up @@ -104,9 +106,9 @@ helm install --name metricbeat elastic/metricbeat --set imageTag=7.6.2
### Deprecated
| Parameter | Description | Default |
| --- | --- | --- |
| `affinity` | Configurable [affinity][] | `{}` |
| `affinity` | Configurable [affinity][] for Metricbeat `DaemonSet`. | `{}` |
| `metricbeatConfig` | Allows you to add any config files in `/usr/share/metricbeat` such as `metricbeat.yml` for both Metricbeat `DaemonSet` and `Deployment`. | see [values.yaml][] |
| `nodeSelector` | Configurable [nodeSelector][] | `{}` |
| `nodeSelector` | Configurable [nodeSelector][] for Metricbeat `DaemonSet`. | `{}` |
| `resources` | Allows you to set the [resources][] for both Metricbeat `DaemonSet` and `Deployment`. | `requests.cpu: 100m`<br>`requests.memory: 100Mi`<br>`limits.cpu: 1000m`<br>`limits.memory: 200Mi` |
| `tolerations` | Configurable [tolerations][] for both Metricbeat `DaemonSet` and `Deployment`. | `[]` |

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/templates/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ spec:
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
affinity: {{ toYaml ( .Values.affinity | default .Values.daemonset.affinity ) | nindent 8 }}
nodeSelector: {{ toYaml ( .Values.nodeSelector | default .Values.daemonset.nodeSelector ) | nindent 8 }}
tolerations: {{ toYaml ( .Values.tolerations | default .Values.daemonset.tolerations ) | nindent 8 }}
{{- if .Values.priorityClassName }}
priorityClassName: {{ .Values.priorityClassName }}
{{- end }}
affinity: {{ toYaml ( .Values.affinity | default .Values.daemonset.affinity ) | nindent 8 }}
serviceAccountName: {{ template "metricbeat.serviceAccount" . }}
terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }}
volumes:
Expand Down
8 changes: 3 additions & 5 deletions metricbeat/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,6 @@ deployment:
memory: "200Mi"
tolerations: []

# DEPRECATED
# Allows you to add any config files in /usr/share/metricbeat
# such as metricbeat.yml for both daemonset and deployment
metricbeatConfig: {}

# Replicas being used for the kube-state-metrics metricbeat deployment
replicas: 1

Expand Down Expand Up @@ -230,6 +225,9 @@ fullnameOverride: ""

# DEPRECATED
affinity: {}
# Allows you to add any config files in /usr/share/metricbeat
# such as metricbeat.yml for both daemonset and deployment
metricbeatConfig: {}
nodeSelector: {}
resources: {}
tolerations: []

0 comments on commit c6386ab

Please sign in to comment.