From: Borislav Glozman Date: Thu, 7 Jun 2018 13:42:17 +0000 (+0000) Subject: Merge "Increase SO DB probe initial delays" X-Git-Tag: 2.0.0-ONAP~4 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2cdfe1d040ded11539676d64934aaf2966400b1c;hp=6f396eb70b196b452caf6e9c21e00f2ce0dc0d2b;p=oom.git Merge "Increase SO DB probe initial delays" --- diff --git a/kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml index 4253d2fb71..893c5acbde 100644 --- a/kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml +++ b/kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: - /bin/sh - -c - > - /bin/sleep 30; + /bin/sleep {{ .Values.readiness.initialDelaySeconds }}; cd /data/; cqlsh -u root -p root -f keyspace.cql ; cqlsh -u root -p root -f init.cql ; diff --git a/kubernetes/aaf/charts/aaf-cs/values.yaml b/kubernetes/aaf/charts/aaf-cs/values.yaml index 6d5ed6c2ad..2131e851ad 100644 --- a/kubernetes/aaf/charts/aaf-cs/values.yaml +++ b/kubernetes/aaf/charts/aaf-cs/values.yaml @@ -42,14 +42,14 @@ affinity: {} # probe configuration parameters liveness: - initialDelaySeconds: 10 + initialDelaySeconds: 180 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: 180 periodSeconds: 10 service: diff --git a/kubernetes/aaf/resources/config/local/org.osaaf.aaf.p12 b/kubernetes/aaf/resources/config/local/org.osaaf.aaf.p12 index f40a7556da..ac1dece85c 100644 Binary files a/kubernetes/aaf/resources/config/local/org.osaaf.aaf.p12 and b/kubernetes/aaf/resources/config/local/org.osaaf.aaf.p12 differ diff --git a/kubernetes/aaf/resources/config/local/org.osaaf.aaf_new-24e41f2f436018568cbdecdc1edbd605.p12 b/kubernetes/aaf/resources/config/local/org.osaaf.aaf_new-24e41f2f436018568cbdecdc1edbd605.p12 deleted file mode 100644 index f40a7556da..0000000000 Binary files a/kubernetes/aaf/resources/config/local/org.osaaf.aaf_new-24e41f2f436018568cbdecdc1edbd605.p12 and /dev/null differ