summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>2018-04-26 21:15:31 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-26 21:15:31 +0000
commit880fa5c26aab08e504a887e2659828693c2b12fd (patch)
treead13da77dd6d88c3eaa68dde85249bb78b6b28a3
parent2917c651fd869fb6f6a355542754b2dbff168eeb (diff)
parent0440a32f01c07acf2b965417c951413d53142687 (diff)
Merge "Reduce consul default replica count"
-rw-r--r--kubernetes/consul/charts/consul-server/templates/deployment.yaml4
-rw-r--r--kubernetes/consul/charts/consul-server/values.yaml7
-rw-r--r--kubernetes/consul/templates/deployment.yaml2
-rw-r--r--kubernetes/consul/values.yaml5
4 files changed, 8 insertions, 10 deletions
diff --git a/kubernetes/consul/charts/consul-server/templates/deployment.yaml b/kubernetes/consul/charts/consul-server/templates/deployment.yaml
index d14c42bf19..12403e77c9 100644
--- a/kubernetes/consul/charts/consul-server/templates/deployment.yaml
+++ b/kubernetes/consul/charts/consul-server/templates/deployment.yaml
@@ -35,7 +35,7 @@ spec:
name: {{ include "common.name" . }}
spec:
containers:
- - image: "{{ .Values.repository | default .Values.global.repository }}/{{ .Values.image }}"
+ - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
command: ["/usr/local/bin/docker-entrypoint.sh"]
- args: ["agent","-server","-client","0.0.0.0","-enable-script-checks","-bootstrap-expect=3","-ui","-join","{{ include "common.servicename" . }}.{{ include "common.namespace" . }}"]
+ args: ["agent","-server","-client","0.0.0.0","-enable-script-checks","-bootstrap-expect={{ .Values.replicaCount }}","-ui"]
name: {{ include "common.name" . }}
diff --git a/kubernetes/consul/charts/consul-server/values.yaml b/kubernetes/consul/charts/consul-server/values.yaml
index 406f9b634e..081ba2a240 100644
--- a/kubernetes/consul/charts/consul-server/values.yaml
+++ b/kubernetes/consul/charts/consul-server/values.yaml
@@ -16,7 +16,6 @@
#################################################################
global:
nodePortPrefix: 302
- repository: nexus3.onap.org:10001
repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
readinessRepository: oomk8s
readinessImage: readiness-check:2.0.0
@@ -34,7 +33,7 @@ pullPolicy: Always
# flag to enable debugging - application support required
debugEnabled: false
-replicaCount: 3
+replicaCount: 1
nodeSelector: {}
@@ -42,14 +41,14 @@ affinity: {}
# probe configuration parameters
liveness:
- initialDelaySeconds: 10
+ initialDelaySeconds: 90
periodSeconds: 10
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
enabled: true
readiness:
- initialDelaySeconds: 10
+ initialDelaySeconds: 90
periodSeconds: 10
service:
diff --git a/kubernetes/consul/templates/deployment.yaml b/kubernetes/consul/templates/deployment.yaml
index 504d54cc54..646922b30f 100644
--- a/kubernetes/consul/templates/deployment.yaml
+++ b/kubernetes/consul/templates/deployment.yaml
@@ -35,7 +35,7 @@ spec:
name: {{ include "common.name" . }}
spec:
containers:
- - image: "{{ .Values.repository | default .Values.global.repository }}/{{ .Values.image }}"
+ - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
command:
- /bin/sh
- "-c"
diff --git a/kubernetes/consul/values.yaml b/kubernetes/consul/values.yaml
index b35ec35cf4..6ff0390991 100644
--- a/kubernetes/consul/values.yaml
+++ b/kubernetes/consul/values.yaml
@@ -16,7 +16,6 @@
#################################################################
global:
nodePortPrefix: 302
- repository: nexus3.onap.org:10001
repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
readinessRepository: oomk8s
readinessImage: readiness-check:2.0.0
@@ -47,14 +46,14 @@ affinity: {}
# probe configuration parameters
liveness:
- initialDelaySeconds: 10
+ initialDelaySeconds: 90
periodSeconds: 10
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
enabled: true
readiness:
- initialDelaySeconds: 10
+ initialDelaySeconds: 90
periodSeconds: 10
service: {}