From 5a01a0953803b3d1b140a77c779a3b942e293228 Mon Sep 17 00:00:00 2001
From: Grzegorz-Lis <grzegorz.lis@nokia.com>
Date: Mon, 7 Sep 2020 13:38:42 +0200
Subject: [AAI] Use readiness container v3.0.1

Readiness container v3.x and up are now present in ONAP main repository.
They're also not using root user anymore and then script path has
changed.
Finally, "job_complete" script has been integrated in main "ready"
script.
This change will align readinessImage definition with rest of ONAP
components.

Issue-ID: OOM-2545
Signed-off-by: Grzegorz Lis <grzegorz.lis@nokia.com>
Change-Id: I766a16be3ae2669f562c9b4ebef875bfbdfac6a0
---
 components/aai-graphadmin/templates/job-create-db.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'components/aai-graphadmin/templates/job-create-db.yaml')

diff --git a/components/aai-graphadmin/templates/job-create-db.yaml b/components/aai-graphadmin/templates/job-create-db.yaml
index 2546c0a..fe3e6e8 100644
--- a/components/aai-graphadmin/templates/job-create-db.yaml
+++ b/components/aai-graphadmin/templates/job-create-db.yaml
@@ -2,7 +2,8 @@
 # ============LICENSE_START=======================================================
 # org.onap.aai
 # ================================================================================
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2020 Nokia Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -51,7 +52,7 @@ spec:
     spec:
       initContainers:
       - command:
-        - /root/ready.py
+        - /app/ready.py
         args:
         - --container-name
         {{- if .Values.global.cassandra.localCluster }}
@@ -67,7 +68,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
-        image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}"
+        image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-readiness
       containers:
@@ -146,4 +147,4 @@ spec:
       restartPolicy: Never
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
-{{ end }}
\ No newline at end of file
+{{ end }}
-- 
cgit 1.2.3-korg