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

diff --git a/kubernetes/robot b/kubernetes/robot
index 4e61a1c..37ac984 160000 (submodule)
--- a/kubernetes/robot
+++ b/kubernetes/robot
@@ -1 +1 @@
-Subproject commit 4e61a1c981b7e00846c0ca2857cd32be027294e1
+Subproject commit 37ac984e35503182f7fc1b771cefa16bf0c84203

diff --git a/kubernetes/uui/charts/uui-server/templates/deployment.yaml b/kubernetes/uui/charts/uui-server/templates/deployment.yaml
index 55b7b23..ea6f7b7 100644 (file)
--- a/kubernetes/uui/charts/uui-server/templates/deployment.yaml
+++ b/kubernetes/uui/charts/uui-server/templates/deployment.yaml
@@ -37,7 +37,7 @@ spec:
     spec:
       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 }}

diff --git a/kubernetes/uui/requirements.yaml b/kubernetes/uui/requirements.yaml
index cf08520..8f74b74 100644 (file)
--- a/kubernetes/uui/requirements.yaml
+++ b/kubernetes/uui/requirements.yaml
@@ -18,4 +18,7 @@ dependencies:
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
+    repository: '@local'
+  - name: repositoryGenerator
+    version: ~6.x-0
     repository: '@local'
\ No newline at end of file

diff --git a/kubernetes/uui/templates/deployment.yaml b/kubernetes/uui/templates/deployment.yaml
index ef73642..8c523b2 100644 (file)
--- a/kubernetes/uui/templates/deployment.yaml
+++ b/kubernetes/uui/templates/deployment.yaml
@@ -37,7 +37,7 @@ spec:
     spec:
       containers:
         - name: {{ include "common.name" . }}
-          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+          image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           command:
             - /bin/bash

diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml
index 77351f9..1adb256 100644 (file)
--- a/kubernetes/uui/values.yaml
+++ b/kubernetes/uui/values.yaml
@@ -17,7 +17,6 @@
 # Declare variables to be passed into your templates.
 global:
   uuiPortPrefix: 303
-  readinessImage: onap/oom/readiness:3.0.1
 
 subChartsOnly:
   enabled: true
@@ -25,7 +24,6 @@ subChartsOnly:
 flavor: small
 
 # application image
-repository: nexus3.onap.org:10001
 image: onap/usecase-ui:3.0.6
 pullPolicy: Always