[AAI] Fix sometimes missing AAI root models

- the update-query-data job loads aai root/widget models into AAI
- it does so via the resources service, which has to be up and running
  accordingly
- if these models are missing, model distribution does not work as model-loader
  will fail to create models in the resources service since `model-ver`s are missing

Issue-ID: AAI-4226
Change-Id: Ie0ba43cef77eb16aa678621f09bd40c6e1b7a189
Signed-off-by: Fiete Ostkamp <fiete.ostkamp@telekom.de>

diff --git a/kubernetes/aai/Chart.yaml b/kubernetes/aai/Chart.yaml
index 2a3dd57..7401e17 100644 (file)
--- a/kubernetes/aai/Chart.yaml
+++ b/kubernetes/aai/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: ONAP Active and Available Inventory
 name: aai
-version: 16.0.2
+version: 16.0.3
 
 dependencies:
   - name: common

diff --git a/kubernetes/aai/components/aai-traversal/templates/job.yaml b/kubernetes/aai/components/aai-traversal/templates/job.yaml
index 8b1935c..9ee38c1 100644 (file)
--- a/kubernetes/aai/components/aai-traversal/templates/job.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/job.yaml
@@ -38,37 +38,7 @@ spec:
     spec:
       {{ include "common.podSecurityContext" . | indent 6 | trim }}
       initContainers:
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_traversal) | nindent 6 }}
-      - name: {{ include "common.name" . }}-wait-for-aai-haproxy
-        image: {{ include "repositoryGenerator.image.curl" . }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        securityContext:
-          runAsUser: 100
-          runAsGroup: 65533
-          readOnlyRootFilesystem: true
-          privileged: false
-          allowPrivilegeEscalation: false
-          capabilities:
-            drop:
-              - ALL
-              - CAP_NET_RAW
-        command:
-        - sh
-        - "-c"
-        - |
-           set -x;
-
-           until nc -w10 -z -v aai.{{.Release.Namespace}} 80; do
-            echo "Retrying to reach aai on port 80";
-            sleep 1;
-           done;
-        resources:
-          limits:
-            cpu: "100m"
-            memory: "500Mi"
-          requests:
-            cpu: "3m"
-            memory: "20Mi"
+      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_update_query_data) | nindent 6 }}
       containers:
       - name: {{ include "common.name" . }}-job
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/aai/components/aai-traversal/values.yaml b/kubernetes/aai/components/aai-traversal/values.yaml
index 896f681..c81050d 100644 (file)
--- a/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@ -452,6 +452,11 @@ readinessCheck:
   wait_for_traversal:
     services:
       - aai-traversal
+  wait_for_update_query_data:
+    # the init query data job makes requests against resources via aai (ha-proxy)
+    services:
+      - aai
+      - aai-resources
 
 jobAnnotations:
   "helm.sh/hook": pre-upgrade,pre-rollback,post-install