X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=blobdiff_plain;f=kubernetes%2Fsdc%2Fcomponents%2Fsdc-fe%2Fvalues.yaml;h=722f6130a579ee58d831e5d5eb3a16635d0edf7c;hp=05ac50d432ad82c5dde8751861b630f4946677b7;hb=refs%2Fheads%2Fmaster;hpb=e4aac7a3c577b7bb9eaae93387d482f952ee4b72

diff --git a/kubernetes/sdc/components/sdc-fe/values.yaml b/kubernetes/sdc/components/sdc-fe/values.yaml
index 05ac50d432..5745f06be2 100644
--- a/kubernetes/sdc/components/sdc-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-fe/values.yaml
@@ -18,51 +18,24 @@
 #################################################################
 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.
 #################################################################
 # application image
-image: onap/sdc-frontend:1.11.4
+image: onap/sdc-frontend:1.13.6
 pullPolicy: Always
 
 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,46 +79,61 @@ 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.api.fe"
+    - baseaddr: "sdc-fe-ui"
       name: "sdc-fe"
-      port: 9443
+      port: 8181
   config:
     ssl: "redirect"
 
+serviceMesh:
+  authorizationPolicy:
+    authorizedPrincipals:
+      - serviceAccount: consul-read
+      - serviceAccount: consul-server-read
+      - serviceAccount: istio-ingress
+        namespace: istio-ingress
+
 # Resource Limit flavor -By Default using small
 flavor: small
 # Segregation for Different environment (Small and Large)
 resources:
   small:
     limits:
-      cpu: 500m
-      memory: 2Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 40m
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 1
-      memory: 4Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 80m
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account