aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2019-10-04 15:23:37 +0000
committerGerrit Code Review <gerrit@onap.org>2019-10-04 15:23:37 +0000
commit79d2f504e49215df6d918ed7e96469f3f460f5c7 (patch)
treeeee6bdd66fa8b1d50a66002c58295697e674a72b
parent7f145c7b0769849c2fae9677fa3daa6a58ca99d1 (diff)
parent6142d94779e6a57e01833bdb1dba14b183f9a806 (diff)
Merge "Increase liness/readiness timeout and period"
-rw-r--r--kubernetes/onap/resources/environments/public-cloud.yaml19
-rw-r--r--kubernetes/onap/resources/overrides/environment.yaml17
-rw-r--r--kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-fe/values.yaml6
-rw-r--r--kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-onboarding-be/values.yaml10
6 files changed, 49 insertions, 7 deletions
diff --git a/kubernetes/onap/resources/environments/public-cloud.yaml b/kubernetes/onap/resources/environments/public-cloud.yaml
index 2d4360c579..3062e4e3fa 100644
--- a/kubernetes/onap/resources/environments/public-cloud.yaml
+++ b/kubernetes/onap/resources/environments/public-cloud.yaml
@@ -95,11 +95,24 @@ portal:
readiness:
initialDelaySeconds: 60
sdc:
+ sdc-fe:
+ liveness:
+ initialDelaySeconds: 120
+ periodSeconds: 60
+ timeoutSeconds: 15
+ readiness:
+ initialDelaySeconds: 120
+ periodSeconds: 60
+ timeoutSeconds: 15
sdc-be:
liveness:
initialDelaySeconds: 120
+ periodSeconds: 60
+ timeoutSeconds: 15
readiness:
initialDelaySeconds: 120
+ periodSeconds: 60
+ timeoutSeconds: 15
sdc-cs:
liveness:
initialDelaySeconds: 120
@@ -107,14 +120,18 @@ sdc:
initialDelaySeconds: 120
sdc-es:
liveness:
- initialDelaySeconds: 60
+ initialDelaySeconds: 120
readiness:
initialDelaySeconds: 120
sdc-onboarding-be:
liveness:
initialDelaySeconds: 120
+ periodSeconds: 60
+ timeoutSeconds: 15
readiness:
initialDelaySeconds: 120
+ periodSeconds: 60
+ timeoutSeconds: 15
sdnc:
liveness:
initialDelaySeconds: 60
diff --git a/kubernetes/onap/resources/overrides/environment.yaml b/kubernetes/onap/resources/overrides/environment.yaml
index 75ce8e529b..2788e244e2 100644
--- a/kubernetes/onap/resources/overrides/environment.yaml
+++ b/kubernetes/onap/resources/overrides/environment.yaml
@@ -157,11 +157,24 @@ portal:
readiness:
periodSeconds: 60
sdc:
+ sdc-fe:
+ liveness:
+ initialDelaySeconds: 120
+ periodSeconds: 60
+ timeoutSeconds: 15
+ readiness:
+ initialDelaySeconds: 120
+ periodSeconds: 60
+ timeoutSeconds: 15
sdc-be:
liveness:
initialDelaySeconds: 120
+ periodSeconds: 60
+ timeoutSeconds: 15
readiness:
initialDelaySeconds: 120
+ periodSeconds: 60
+ timeoutSeconds: 15
sdc-cs:
liveness:
initialDelaySeconds: 120
@@ -177,8 +190,12 @@ sdc:
sdc-onboarding-be:
liveness:
initialDelaySeconds: 120
+ periodSeconds: 60
+ timeoutSeconds: 15
readiness:
initialDelaySeconds: 120
+ periodSeconds: 60
+ timeoutSeconds: 15
sdnc:
liveness:
initialDelaySeconds: 60
diff --git a/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml
index 62dffd6376..ee4da9b7b1 100644
--- a/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml
@@ -73,12 +73,14 @@ spec:
port: {{ .Values.service.internalPort2 }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
+ timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
{{ end }}
readinessProbe:
tcpSocket:
port: {{ .Values.service.internalPort2 }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
+ timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
resources:
{{ include "common.resources" . | indent 12 }}
env:
diff --git a/kubernetes/sdc/charts/sdc-fe/values.yaml b/kubernetes/sdc/charts/sdc-fe/values.yaml
index 6831555a44..8878f1a0b6 100644
--- a/kubernetes/sdc/charts/sdc-fe/values.yaml
+++ b/kubernetes/sdc/charts/sdc-fe/values.yaml
@@ -51,14 +51,16 @@ affinity: {}
# probe configuration parameters
liveness:
initialDelaySeconds: 10
- periodSeconds: 10
+ periodSeconds: 60
+ timeoutSeconds: 15
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
enabled: true
readiness:
initialDelaySeconds: 10
- periodSeconds: 10
+ periodSeconds: 60
+ timeoutSeconds: 15
service:
#Example service definition with external, internal and node ports.
diff --git a/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml
index 70895d308d..dee139beb5 100644
--- a/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml
@@ -60,6 +60,7 @@ spec:
- "/var/lib/ready-probe.sh"
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
+ timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
{{ end }}
readinessProbe:
exec:
@@ -67,6 +68,7 @@ spec:
- "/var/lib/ready-probe.sh"
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
+ timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
resources:
{{ include "common.resources" . | indent 12 }}
env:
diff --git a/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml b/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
index ce04d480f0..a6a3f6bd22 100644
--- a/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
@@ -48,15 +48,17 @@ affinity: {}
# probe configuration parameters
liveness:
- initialDelaySeconds: 60
- periodSeconds: 10
+ initialDelaySeconds: 120
+ periodSeconds: 60
+ timeoutSeconds: 15
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
enabled: true
readiness:
- initialDelaySeconds: 60
- periodSeconds: 10
+ initialDelaySeconds: 120
+ periodSeconds: 60
+ timeoutSeconds: 15
service:
type: ClusterIP