From: Mike Elliott Date: Thu, 24 May 2018 18:00:43 +0000 (+0000) Subject: Merge "log-logstash is now a daemonSet" X-Git-Tag: 2.0.0-ONAP~57 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=51aa682664610ab0be891d43651ee4f1e6c142e0;hp=529caa1d365c1ebba94eaa653881c4cbdc3fa2da;p=oom.git Merge "log-logstash is now a daemonSet" --- diff --git a/kubernetes/log/charts/log-logstash/templates/deployment.yaml b/kubernetes/log/charts/log-logstash/templates/deployment.yaml index 7735c82616..0811563cef 100644 --- a/kubernetes/log/charts/log-logstash/templates/deployment.yaml +++ b/kubernetes/log/charts/log-logstash/templates/deployment.yaml @@ -13,7 +13,7 @@ # limitations under the License. apiVersion: extensions/v1beta1 -kind: Deployment +kind: DaemonSet metadata: name: {{ include "common.fullname" . }} namespace: {{ include "common.namespace" . }} @@ -23,7 +23,6 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ .Values.replicaCount }} template: metadata: labels: diff --git a/kubernetes/log/charts/log-logstash/values.yaml b/kubernetes/log/charts/log-logstash/values.yaml index 87551037d1..51062c9f7e 100644 --- a/kubernetes/log/charts/log-logstash/values.yaml +++ b/kubernetes/log/charts/log-logstash/values.yaml @@ -38,9 +38,7 @@ config: elasticsearchServiceName: log-es elasticsearchPort: 9200 -# default number of instances -# 30+ logs/sec will saturate a single node to 6+ vCores -replicaCount: 3 +# default number of instances matches cluster size via DaemonSet deployment nodeSelector: {}