summaryrefslogtreecommitdiffstats
path: root/kubernetes/log
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/log')
-rw-r--r--kubernetes/log/charts/log-elasticsearch/requirements.yaml2
-rw-r--r--kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml2
-rw-r--r--kubernetes/log/charts/log-elasticsearch/values.yaml5
-rw-r--r--kubernetes/log/charts/log-kibana/requirements.yaml2
-rw-r--r--kubernetes/log/charts/log-kibana/templates/deployment.yaml2
-rw-r--r--kubernetes/log/charts/log-kibana/values.yaml5
-rw-r--r--kubernetes/log/charts/log-logstash/requirements.yaml2
-rw-r--r--kubernetes/log/charts/log-logstash/templates/deployment.yaml2
-rw-r--r--kubernetes/log/charts/log-logstash/values.yaml5
-rw-r--r--kubernetes/log/requirements.yaml2
10 files changed, 16 insertions, 13 deletions
diff --git a/kubernetes/log/charts/log-elasticsearch/requirements.yaml b/kubernetes/log/charts/log-elasticsearch/requirements.yaml
index 204a77562f..897df32ce0 100644
--- a/kubernetes/log/charts/log-elasticsearch/requirements.yaml
+++ b/kubernetes/log/charts/log-elasticsearch/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml b/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml
index 5ff01b8274..fcbe643dc7 100644
--- a/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml
+++ b/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml
@@ -60,7 +60,7 @@ spec:
image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
ports:
- containerPort: {{ .Values.service.internalPort }}
name: {{ .Values.service.name }}
diff --git a/kubernetes/log/charts/log-elasticsearch/values.yaml b/kubernetes/log/charts/log-elasticsearch/values.yaml
index 3a621f9be8..9c3525aec8 100644
--- a/kubernetes/log/charts/log-elasticsearch/values.yaml
+++ b/kubernetes/log/charts/log-elasticsearch/values.yaml
@@ -95,7 +95,7 @@ service:
ingress:
enabled: false
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources:
@@ -112,4 +112,5 @@ resources:
memory: 8Gi
requests:
cpu: 1
- memory: 4Gi \ No newline at end of file
+ memory: 4Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/log/charts/log-kibana/requirements.yaml b/kubernetes/log/charts/log-kibana/requirements.yaml
index 204a77562f..897df32ce0 100644
--- a/kubernetes/log/charts/log-kibana/requirements.yaml
+++ b/kubernetes/log/charts/log-kibana/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/log/charts/log-kibana/templates/deployment.yaml b/kubernetes/log/charts/log-kibana/templates/deployment.yaml
index a39dfe6668..ac52f62fde 100644
--- a/kubernetes/log/charts/log-kibana/templates/deployment.yaml
+++ b/kubernetes/log/charts/log-kibana/templates/deployment.yaml
@@ -51,7 +51,7 @@ spec:
image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
ports:
- containerPort: {{ .Values.service.internalPort }}
name: {{ .Values.service.name }}
diff --git a/kubernetes/log/charts/log-kibana/values.yaml b/kubernetes/log/charts/log-kibana/values.yaml
index 81d0241f4f..8a56151c38 100644
--- a/kubernetes/log/charts/log-kibana/values.yaml
+++ b/kubernetes/log/charts/log-kibana/values.yaml
@@ -76,7 +76,7 @@ service:
ingress:
enabled: false
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources:
@@ -93,4 +93,5 @@ resources:
memory: 8Gi
requests:
cpu: 2
- memory: 4Gi \ No newline at end of file
+ memory: 4Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/log/charts/log-logstash/requirements.yaml b/kubernetes/log/charts/log-logstash/requirements.yaml
index 204a77562f..897df32ce0 100644
--- a/kubernetes/log/charts/log-logstash/requirements.yaml
+++ b/kubernetes/log/charts/log-logstash/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/log/charts/log-logstash/templates/deployment.yaml b/kubernetes/log/charts/log-logstash/templates/deployment.yaml
index 7d0fc6e57d..86b1a8c264 100644
--- a/kubernetes/log/charts/log-logstash/templates/deployment.yaml
+++ b/kubernetes/log/charts/log-logstash/templates/deployment.yaml
@@ -50,7 +50,7 @@ spec:
image: "{{ .Values.global.loggingRepository| default .Values.loggingRepository }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
ports:
- containerPort: {{ .Values.service.internalPort }}
name: {{ .Values.service.name }}
diff --git a/kubernetes/log/charts/log-logstash/values.yaml b/kubernetes/log/charts/log-logstash/values.yaml
index ce227d99b7..7779ffe490 100644
--- a/kubernetes/log/charts/log-logstash/values.yaml
+++ b/kubernetes/log/charts/log-logstash/values.yaml
@@ -73,7 +73,7 @@ service:
ingress:
enabled: false
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources:
@@ -90,4 +90,5 @@ resources:
memory: 4Gi
requests:
cpu: 2
- memory: 4Gi \ No newline at end of file
+ memory: 4Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/log/requirements.yaml b/kubernetes/log/requirements.yaml
index a72a96a6e3..220dc4619b 100644
--- a/kubernetes/log/requirements.yaml
+++ b/kubernetes/log/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'