X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=blobdiff_plain;f=kubernetes%2Fsdc%2Fcomponents%2Fsdc-fe%2Fvalues.yaml;fp=kubernetes%2Fsdc%2Fcomponents%2Fsdc-fe%2Fvalues.yaml;h=b4a8bd6bfebf69e4fbe4d1784be0632477e3cb70;hp=a9eef905c4c54433980de1e00c7b015399c93bbf;hb=dd34eadb816e1089a7121dda9810e902caf3e6c4;hpb=0879dfcaad420fcc7a6adc77b2b9c72b9522e3cb

diff --git a/kubernetes/sdc/components/sdc-fe/values.yaml b/kubernetes/sdc/components/sdc-fe/values.yaml
index a9eef905c4..b4a8bd6bfe 100644
--- a/kubernetes/sdc/components/sdc-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-fe/values.yaml
@@ -18,30 +18,6 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  aafEnabled: true
-
-#################################################################
-# AAF Part
-#################################################################
-certInitializer:
-  nameOverride: sdc-fe-cert-init
-  aafDeployFqi: deployer@people.osaaf.org
-  aafDeployPass: demo123456!
-  fqdn: sdc
-  fqi: sdc@sdc.onap.org
-  public_fqdn: sdc.onap.org
-  cadi_longitude: "0.0"
-  cadi_latitude: "0.0"
-  app_ns: org.osaaf.aaf
-  credsPath: /opt/app/osaaf/local
-  addconfig: true
-  keystoreFile: "org.onap.sdc.p12"
-  truststoreFile: "org.onap.sdc.trust.jks"
-  permission_user: 352070
-  permission_group: 35953
-  aaf_add_config: |
-    echo "cadi_keystore_password_p12=$cadi_keystore_password_p12" > {{ .Values.credsPath }}/mycreds.prop
-    echo "cadi_truststore_password=$cadi_truststore_password" >> {{ .Values.credsPath }}/mycreds.prop
 
 #################################################################
 # Application configuration defaults.
@@ -54,15 +30,12 @@ config:
   javaOptions: "-Xmx256m -Xms256m"
   plugins:
     dcae_discovery_url:
-      https: "https://sdc-dcae-fe:9444/dcaed/#/home"
       http: "http://sdc-dcae-fe:8183/dcaed/#/home"
     dcae_source_url: "https://sdc.dcae.plugin.simpledemo.onap.org:30264/dcaed/#/home"
     dcae_dt_discovery_url:
-      https: "https://sdc-dcae-dt:9446/dcae/#/dcae/home"
       http: "http://sdc-dcae-dt:8186/dcae/#/dcae/home"
     dcae_dt_source_url: "https://sdc.dcae.plugin.simpledemo.onap.org:30266/dcae/#/dcae/home"
     workflow_discovery_url:
-      https: "https://sdc-wfd-fe:8443/workflows"
       http: "http://sdc-wfd-fe:8080/workflows"
     workflow_source_url: "https://sdc.workflow.plugin.simpledemo.onap.org:30256/workflows/"
 
@@ -106,26 +79,32 @@ startup:
   failureThreshold: 60
 
 service:
-  #Example service definition with external, internal and node ports.
-  #Services may use any combination of ports depending on the 'type' of
-  #service being defined.
   type: NodePort
   name: sdc-fe
-  portName: http
   internalPort: 8181
-  externalPort: 8181
-  internalPort2: 9443
-  externalPort2: 9443
-  nodePort: "07"
-
+  ports:
+    - name: http
+      port: 8181
+      nodePort: '07'
+  annotations:
+    msb.onap.org/service-info: |
+      {{ if .Values.global.msbEnabled -}}[
+        {
+          "serviceName": "sdc-ui",
+          "version": "v1",
+          "url": "/sdc1",
+          "protocol": "UI",
+          "visualRange":"0|1",
+          "port": "{{ .Values.service.internalPort }}",
+        }
+      ]{{ end }}
 
 ingress:
   enabled: false
   service:
     - baseaddr: "sdc-fe-ui"
       name: "sdc-fe"
-      port: 9443
-      plain_port: 8181
+      port: 8181
   config:
     ssl: "redirect"