From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Fri, 6 Nov 2020 08:16:09 +0000 (+0000)
Subject: Merge "[SDNC] fix broken sdnc-web deployment"
X-Git-Tag: 7.0.0~39
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dd714d1a2746b16644abb42a3f4d3824cbc1132e;hp=e4c276bbc533ce3ffb8de216b550ad6d7e5faf98;p=oom.git

Merge "[SDNC] fix broken sdnc-web deployment"
---

diff --git a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
index 52345deed8..7c1f262ec2 100644
--- a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 */}}
 
-nclude "common.repository" . }}apiVersion: apps/v1
+apiVersion: apps/v1
 kind: Deployment
 metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
 spec:
@@ -76,6 +76,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 4ba41f1a47..77b4a0e274 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -366,7 +366,7 @@ elasticsearch:
     nameOverride: sdnrdb
 # enable
 sdnc-web:
-  enabled: false
+  enabled: true
 # default number of instances
 replicaCount: 1