From 8789a7276007c632f414e7b4224179d216dbb2c1 Mon Sep 17 00:00:00 2001
From: Alexander Dehn <alexander.dehn@highstreet-technologies.com>
Date: Fri, 16 Oct 2020 14:29:05 +0000
Subject: [SDNC] fix broken sdnc-web deployment

fix deployment.yaml

Issue-ID: OOM-2600
Signed-off-by: Alexander Dehn <alexander.dehn@highstreet-technologies.com>
Change-Id: Id8f8f6c341bed30ce26cc061b47aeb6e312e7bfa
---
 .../sdnc/components/sdnc-web/templates/deployment.yaml      | 13 ++++++++++++-
 kubernetes/sdnc/components/sdnc-web/values.yaml             | 13 +++++++++----
 kubernetes/sdnc/values.yaml                                 |  2 +-
 3 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'kubernetes/sdnc')

diff --git a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
index 96f499a21f..6f67817afb 100644
--- a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-nclude "common.repository" . }}apiVersion: apps/v1
+apiVersion: apps/v1
 kind: Deployment
 metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
 spec:
@@ -74,6 +74,17 @@ spec:
             value: {{ .Values.config.sslCertiticate }}
           - name: SSL_CERTIFICATE_KEY
             value: {{ .Values.config.sslCertKey }}
+          {{ if .Values.config.transportpce.enabled }}
+          - name: TRPCEURL
+            value: {{ .Values.config.transportpce.transportpceUrl }}
+          {{ end }}
+          {{ if .Values.config.topologyserver.enabled }}
+          - name: TOPOURL
+            value: {{ .Values.config.topologyserver.topologyserverUrl }}
+          - name: TILEURL
+            value: {{ .Values.config.topologyserver.tileserverUrl }}
+          {{ end }}
+
           volumeMounts:  {{ include "common.certInitializer.volumeMount" . | nindent 10 }}
           - mountPath: /etc/localtime
             name: localtime
diff --git a/kubernetes/sdnc/components/sdnc-web/values.yaml b/kubernetes/sdnc/components/sdnc-web/values.yaml
index 2c0b3eabe2..7319e2272f 100644
--- a/kubernetes/sdnc/components/sdnc-web/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/values.yaml
@@ -27,21 +27,26 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: "onap/sdnc-web-image:2.0.2"
+image: "onap/sdnc-web-image:2.0.3"
 pullPolicy: Always
 
 config:
   sdncChartName: sdnc
   webProtocol: HTTPS
   webPort: 8443
-  #sdnrProtocol: HTTPS
-  sdnrProtocol: HTTPS
-  #sdnrHost: "sdnc.onap"
+  sdnrProtocol: https
   sdnrHost: "sdnc"
   sdnrPort: "8443"
   sslCertDir: "/opt/app/osaaf/local/certs"
   sslCertiticate: "cert.pem"
   sslCertKey: "key.pem"
+  transportpce:
+    enabled: false
+    transportpceUrl: http://transportpce.transportpce:8181
+  topologyserver:
+    enabled: false
+    topologyserverUrl: http://toplogy-api-service.topology:3001
+    tileserverUrl: https://tile.openstreetmap.org
 
 
 #################################################################
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index c41f5eadbf..2c5b0b905e 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -365,7 +365,7 @@ elasticsearch:
     nameOverride: sdnrdb
 # enable
 sdnc-web:
-  enabled: false
+  enabled: true
 # default number of instances
 replicaCount: 1
 
-- 
cgit 1.2.3-korg