summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-12-16 16:54:25 +0000
committerGerrit Code Review <gerrit@onap.org>2020-12-16 16:54:25 +0000
commit5b27caf49a96fff0c0ae24c18ccd77ee3325c74e (patch)
tree01611996863be0ca7c1f5053f7f4624335b9ceb6
parent6effd804e453ce754df599b97d7d92566ed71180 (diff)
parentc681111a545e69d0705ac9708a74b440976d6334 (diff)
Merge "[CMPV2] Add readiness check"
-rw-r--r--kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml3
-rw-r--r--kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml2
-rw-r--r--kubernetes/platform/components/cmpv2-cert-provider/values.yaml4
3 files changed, 9 insertions, 0 deletions
diff --git a/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml b/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml
index def35866d7..cd195b6689 100644
--- a/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml
+++ b/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml
@@ -15,3 +15,6 @@
- name: common
version: ~7.x-0
repository: '@local'
+ - name: readinessCheck
+ version: ~7.x-0
+ repository: '@local'
diff --git a/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml b/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml
index 3f0027f1be..3a993734e4 100644
--- a/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml
+++ b/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml
@@ -33,6 +33,8 @@ spec:
labels:
control-plane: controller-manager
spec:
+ initContainers:
+ {{ include "common.readinessCheck.waitFor" . | indent 6 | trim }}
containers:
- name: {{ .Values.deploymentProxy.name }}
image: {{ .Values.deploymentProxy.image }}
diff --git a/kubernetes/platform/components/cmpv2-cert-provider/values.yaml b/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
index 5ea763a812..990c36d7a3 100644
--- a/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
+++ b/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
@@ -25,6 +25,7 @@ global:
namespace: onap
+
# Service configuration
service:
name: oom-certservice-cmpv2issuer-metrics-service
@@ -60,6 +61,9 @@ deploymentProxy:
requests:
cpu: 50m
memory: 32Mi
+readinessCheck:
+ wait_for:
+ - oom-cert-service
# CMPv2Issuer
cmpv2issuer: