summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>2018-03-07 20:38:56 +0000
committerGerrit Code Review <gerrit@onap.org>2018-03-07 20:38:56 +0000
commit9752007b556bd2fe9f75436667533652b5cf07e9 (patch)
tree816c11d1decfa081d6df0f34ebb9c2eb109a4f1d
parent23d155ec787e0260503a4f9eb9d379711f6239e6 (diff)
parentb7d08b201b0f702936724473e90b14fed04ab21b (diff)
Merge "Replica Scaling of Consul and Log container"
-rw-r--r--kubernetes/consul/templates/consul-agent-deployment.yaml1
-rw-r--r--kubernetes/consul/templates/consul-server-deployment.yaml2
-rw-r--r--kubernetes/consul/values.yaml2
-rw-r--r--kubernetes/log/templates/elasticsearch-deployment.yaml1
-rw-r--r--kubernetes/log/templates/kibana-deployment.yaml1
-rw-r--r--kubernetes/log/templates/logstash-deployment.yaml1
-rw-r--r--kubernetes/log/values.yaml3
7 files changed, 10 insertions, 1 deletions
diff --git a/kubernetes/consul/templates/consul-agent-deployment.yaml b/kubernetes/consul/templates/consul-agent-deployment.yaml
index 81b16b54ca..a2bbe6636f 100644
--- a/kubernetes/consul/templates/consul-agent-deployment.yaml
+++ b/kubernetes/consul/templates/consul-agent-deployment.yaml
@@ -7,6 +7,7 @@ metadata:
name: consul-agent
namespace: "{{ .Values.nsPrefix }}"
spec:
+ replicas: {{ .Values.consulAgentReplicas }}
selector:
matchLabels:
app: consul-agent
diff --git a/kubernetes/consul/templates/consul-server-deployment.yaml b/kubernetes/consul/templates/consul-server-deployment.yaml
index c9f2cfb372..6aafee4cb2 100644
--- a/kubernetes/consul/templates/consul-server-deployment.yaml
+++ b/kubernetes/consul/templates/consul-server-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
name: consul-server
namespace: "{{ .Values.nsPrefix }}"
spec:
- replicas: 3
+ replicas: {{ .Values.consulServerReplicas }}
selector:
matchLabels:
app: consul-server
diff --git a/kubernetes/consul/values.yaml b/kubernetes/consul/values.yaml
index 89f3ecd0a7..a6909d7d21 100644
--- a/kubernetes/consul/values.yaml
+++ b/kubernetes/consul/values.yaml
@@ -3,5 +3,7 @@ nodePortPrefix: 302
consuldockerTag: "latest"
rootHostPath: "/dockerdata-nfs"
consulimageRegistry: "docker.io/consul"
+consulAgentReplicas: 1
+consulServerReplicas: 3
service:
type: NodePort
diff --git a/kubernetes/log/templates/elasticsearch-deployment.yaml b/kubernetes/log/templates/elasticsearch-deployment.yaml
index 2b596d263a..cbc19a8591 100644
--- a/kubernetes/log/templates/elasticsearch-deployment.yaml
+++ b/kubernetes/log/templates/elasticsearch-deployment.yaml
@@ -7,6 +7,7 @@ metadata:
name: log-elasticsearch
namespace: {{ .Values.nsPrefix }}
spec:
+ replicas: {{ .Values.elasticsearchReplicas }}
selector:
matchLabels:
app: elasticsearch
diff --git a/kubernetes/log/templates/kibana-deployment.yaml b/kubernetes/log/templates/kibana-deployment.yaml
index f627a3c729..6e5c36c993 100644
--- a/kubernetes/log/templates/kibana-deployment.yaml
+++ b/kubernetes/log/templates/kibana-deployment.yaml
@@ -7,6 +7,7 @@ metadata:
name: log-kibana
namespace: {{ .Values.nsPrefix }}
spec:
+ replicas: {{ .Values.kibanaReplicas }}
selector:
matchLabels:
app: kibana
diff --git a/kubernetes/log/templates/logstash-deployment.yaml b/kubernetes/log/templates/logstash-deployment.yaml
index 743108124c..1d3b945711 100644
--- a/kubernetes/log/templates/logstash-deployment.yaml
+++ b/kubernetes/log/templates/logstash-deployment.yaml
@@ -7,6 +7,7 @@ metadata:
name: log-logstash
namespace: {{ .Values.nsPrefix }}
spec:
+ replicas: {{ .Values.logstashReplicas }}
selector:
matchLabels:
app: logstash
diff --git a/kubernetes/log/values.yaml b/kubernetes/log/values.yaml
index af53915d27..69efa27b3d 100644
--- a/kubernetes/log/values.yaml
+++ b/kubernetes/log/values.yaml
@@ -2,6 +2,9 @@ nsPrefix: onap
pullPolicy: Always
nodePortPrefix: 302
dataRootDir: /dockerdata-nfs
+elasticsearchReplicas: 1
+kibanaReplicas: 1
+logstashReplicas: 1
image:
readiness: oomk8s/readiness-check:1.1.0
logstash: docker.elastic.co/logstash/logstash:5.4.3