Merge "[MSB] Uses new tpls for repos / images"

diff --git a/docs/oom_quickstart_guide.rst b/docs/oom_quickstart_guide.rst
index f9693c9..28d3597 100644 (file)
--- a/docs/oom_quickstart_guide.rst
+++ b/docs/oom_quickstart_guide.rst
@@ -236,6 +236,10 @@ for use::
 
     > ~/oom/kubernetes/robot/ete-k8s.sh onap health
 
+  Launch Robot distribute health checks to verify whether ONAP runtime components are healthy::
+
+    > ~/oom/kubernetes/robot/ete-k8s.sh onap healthdist
+
 **Step 10.** Undeploy ONAP
 ::
 

diff --git a/kubernetes/log/components/log-elasticsearch/templates/deployment.yaml b/kubernetes/log/components/log-elasticsearch/templates/deployment.yaml
index 6a0e6d2..b778af8 100644 (file)
--- a/kubernetes/log/components/log-elasticsearch/templates/deployment.yaml
+++ b/kubernetes/log/components/log-elasticsearch/templates/deployment.yaml
@@ -26,6 +26,9 @@ metadata:
     release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
+  selector:
+    matchLabels:
+      app: {{ include "common.name" . }}
   replicas: {{ .Values.replicaCount }}
   template:
     metadata:

diff --git a/kubernetes/log/components/log-kibana/templates/deployment.yaml b/kubernetes/log/components/log-kibana/templates/deployment.yaml
index a1824d2..5e3dc98 100644 (file)
--- a/kubernetes/log/components/log-kibana/templates/deployment.yaml
+++ b/kubernetes/log/components/log-kibana/templates/deployment.yaml
@@ -26,6 +26,9 @@ metadata:
     release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
+  selector:
+    matchLabels:
+      app: {{ include "common.name" . }}
   replicas: {{ .Values.replicaCount }}
   template:
     metadata:

diff --git a/kubernetes/log/components/log-logstash/templates/deployment.yaml b/kubernetes/log/components/log-logstash/templates/deployment.yaml
index 566c7a3..92817fa 100644 (file)
--- a/kubernetes/log/components/log-logstash/templates/deployment.yaml
+++ b/kubernetes/log/components/log-logstash/templates/deployment.yaml
@@ -26,6 +26,9 @@ metadata:
     release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
+  selector:
+    matchLabels:
+      app: {{ include "common.name" . }}
   replicas: {{ .Values.replicaCount }}
   template:
     metadata:

diff --git a/kubernetes/robot b/kubernetes/robot
index 4b76d89..85b5af5 160000 (submodule)
--- a/kubernetes/robot
+++ b/kubernetes/robot
@@ -1 +1 @@
-Subproject commit 4b76d896522b113eff620a732a6ce7b363529f7f
+Subproject commit 85b5af5058bbda19b557add185d917f60c2188ee

diff --git a/kubernetes/vid/requirements.yaml b/kubernetes/vid/requirements.yaml
index a3b349d..c6554ca 100644 (file)
--- a/kubernetes/vid/requirements.yaml
+++ b/kubernetes/vid/requirements.yaml
@@ -27,4 +27,7 @@ dependencies:
     version: ~7.x-0
     repository: '@local'
     condition: not global.mariadbGalera.localCluster
+  - name: repositoryGenerator
+    version: ~7.x-0
+    repository: '@local'
 

diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml
index 41b0019..856a853 100644 (file)
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@ -48,12 +48,12 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
-        image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+        image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-readiness
       containers:
         - name: {{ include "common.name" . }}
-          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+          image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           ports:
           - containerPort: {{ .Values.service.internalPort }}
@@ -139,7 +139,7 @@ spec:
         {{- end }}
       # side car containers
         - name: filebeat-onap
-          image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+          image: {{ include "repositoryGenerator.image.logging" . }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           volumeMounts:
           - mountPath: /usr/share/filebeat/filebeat.yml

diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index 93de57e..47cd73a 100644 (file)
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -18,9 +18,6 @@
 # Declare variables to be passed into your templates.
 global:
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:3.0.1
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
   mariadbGalera: &mariadbGalera
     #This flag allows VID to instantiate its own mariadb-galera cluster
     localCluster: false
@@ -43,7 +40,6 @@ subChartsOnly:
   enabled: true
 
 # application image
-repository: nexus3.onap.org:10001
 image: onap/vid:7.0.0
 pullPolicy: Always
 
@@ -70,8 +66,8 @@ config:
   roleaccesscentralized: remote
 
 mariadb-galera:
- # '&mariadbConfig' means we "store" the values for  later use in the file
- # with '*mariadbConfig' pointer.
+  # '&mariadbConfig' means we "store" the values for  later use in the file
+  # with '*mariadbConfig' pointer.
   config: &mariadbConfig
     userCredentialsExternalSecret: '{{ include "common.release" . }}-vid-db-user-secret'
     mysqlDatabase: vid_openecomp_epsdk
@@ -127,11 +123,11 @@ service:
 ingress:
   enabled: false
   service:
-       - baseaddr: "vid.api"
-         name: "vid-http"
-         port: 8443
+    - baseaddr: "vid.api"
+      name: "vid-http"
+      port: 8443
   config:
-       ssl: "redirect"
+    ssl: "redirect"
 
 # Resource Limit flavor -By Default using small
 flavor: small