From 666bedf59dad94a49d50b8fd16868d31d714b083 Mon Sep 17 00:00:00 2001
From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Thu, 19 Nov 2020 17:38:23 +0100
Subject: [UUI] Uses new tpls for repos / images

This commit makes UUI template to use the new generator for repositories and
images.

Issue-ID: OOM-2364
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I0578820c2ac414bd2e3acd8b961cf16c1de46fde
---
 kubernetes/uui/charts/uui-server/templates/deployment.yaml | 2 +-
 kubernetes/uui/requirements.yaml                           | 3 +++
 kubernetes/uui/templates/deployment.yaml                   | 2 +-
 kubernetes/uui/values.yaml                                 | 2 --
 4 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'kubernetes')

diff --git a/kubernetes/uui/charts/uui-server/templates/deployment.yaml b/kubernetes/uui/charts/uui-server/templates/deployment.yaml
index 55b7b23426..ea6f7b7a23 100644
--- 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 cf085205ab..8f74b745d3 100644
--- 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 ef73642095..8c523b2388 100644
--- 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 77351f9f3e..1adb2565a0 100644
--- 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
 
-- 
cgit 1.2.3-korg