From c681111a545e69d0705ac9708a74b440976d6334 Mon Sep 17 00:00:00 2001
From: Jan Malkiewicz <jan.malkiewicz@nokia.com>
Date: Thu, 10 Dec 2020 10:34:00 +0100
Subject: [PATCH] [CMPV2] Add readiness check

Wait for oom-cert-service

Issue-ID: OOM-2560
Signed-off-by: Jan Malkiewicz <jan.malkiewicz@nokia.com>
Change-Id: Ie78d1ed0500ff44cb24c7859faa9f6366e93ecd8
---
 kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml  | 3 +++
 .../platform/components/cmpv2-cert-provider/templates/deployment.yaml | 2 ++
 kubernetes/platform/components/cmpv2-cert-provider/values.yaml        | 4 ++++
 3 files changed, 9 insertions(+)

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:
-- 
2.16.6