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

diff --combined kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
index 52345de,6f67817..7c1f262
--- 1/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
--- 2/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
@@@ -1,4 -1,3 +1,4 @@@
 +{{/*
  # Copyright © 2020 highstreet technologies GmbH
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
@@@ -12,9 -11,8 +12,9 @@@
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  # 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:
@@@ -76,6 -74,17 +76,17 @@@
              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 --combined kubernetes/sdnc/values.yaml
index 4ba41f1,2c5b0b9..77b4a0e
--- 1/kubernetes/sdnc/values.yaml
--- 2/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@@ -39,7 -39,7 +39,7 @@@ global
    cmpv2Enabled: true
    platform:
      certServiceClient:
 -      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.0.0
 +      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.1.0
        secret:
          name: oom-cert-service-client-tls-secret
          mountPath: /etc/onap/oom/certservice/certs/
@@@ -133,10 -133,9 +133,10 @@@ secrets
  # Application configuration defaults.
  #################################################################
  # application images
 +
  repository: nexus3.onap.org:10001
  pullPolicy: Always
 -image: onap/sdnc-image:2.0.2
 +image: onap/sdnc-image:2.0.3
  busyboxRepository: docker.io
  busyboxImage: busybox:1.30
  
@@@ -366,7 -365,7 +366,7 @@@ elasticsearch
      nameOverride: sdnrdb
  # enable
  sdnc-web:
-   enabled: false
+   enabled: true
  # default number of instances
  replicaCount: 1