Merge "[AAI] Add model-loader tracing config"

[oom.git] / kubernetes / sdc / components / sdc-onboarding-be / values.yaml

diff --git a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
index 5a1c664..a555656 100644 (file)
--- a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
@@ -18,7 +18,6 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  aafEnabled: true
   persistence: {}
   sdc_cassandra:
     #This flag allows SDC to instantiate its own cluster, serviceName
@@ -32,35 +31,12 @@ global:
     clusterName: cassandra
     dataCenter: Pod
 
-#################################################################
-# AAF Part
-#################################################################
-certInitializer:
-  nameOverride: sdc-onboarding-be-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-onboard-backend:1.11.4
-onboardingInitImage: onap/sdc-onboard-cassandra-init:1.11.4
+image: onap/sdc-onboard-backend:1.13.6
+onboardingInitImage: onap/sdc-onboard-cassandra-init:1.13.6
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -109,12 +85,15 @@ startup:
 service:
   type: ClusterIP
   name: sdc-onboarding-be
-  portName: http
-  internalPort: 8445
-  externalPort: 8445
+  internalPort: 8081
+  ports:
+    - name: http
+      port: 8081
 
-  internalPort2: 8081
-  externalPort2: 8081
+serviceMesh:
+  authorizationPolicy:
+    authorizedPrincipals:
+      - serviceAccount: sdc-be-read
 
 ## Persist data to a persitent volume
 persistence:
@@ -139,17 +118,6 @@ persistence:
   mountPath: /dockerdata-nfs
   mountSubPath: /sdc/sdc-cs/CS
 
-##Certificate storage persistence
-##This is temporary solution for SDC-1980
-cert:
-  certDir: /app/jetty/cert
-  persistence:
-    enabled: true
-    size: 10Mi
-    accessMode: ReadWriteOnce
-    volumeReclaimPolicy: Retain
-    mountSubPath: /sdc/onbaording/cert
-
 securityContext:
   fsGroup: 35953
   runAsUser: 352070
@@ -163,18 +131,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 500m
-      memory: 2Gi
+      cpu: "1"
+      memory: "1.5Gi"
     requests:
-      cpu: 40m
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1.5Gi"
   large:
     limits:
-      cpu: 1
-      memory: 4Gi
+      cpu: "2"
+      memory: "3Gi"
     requests:
-      cpu: 80m
-      memory: 2Gi
+      cpu: "1"
+      memory: "3Gi"
   unlimited: {}
 
 #Pods Service Account