X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Foof%2Fvalues.yaml;h=738df14015d4ee959caa18e1d25efe8e7e7eece3;hb=refs%2Fheads%2Fmaster;hp=87e6536c352da7aec4235a7b7e3a348420f65226;hpb=3865d69d33f8f69f7d075d8597b4178e3a5c1442;p=oom.git

diff --git a/kubernetes/oof/values.yaml b/kubernetes/oof/values.yaml
index 87e6536c35..738df14015 100644
--- a/kubernetes/oof/values.yaml
+++ b/kubernetes/oof/values.yaml
@@ -19,23 +19,11 @@ global:
   nodePortPrefix: 302
   persistence: {}
 
-#################################################################
-# Secrets metaconfig
-#################################################################
-secrets:
-  - uid: oof-onap-certs
-    name: &oof-certs '{{ include "common.release" . }}-oof-onap-certs'
-    externalSecret: '{{ tpl (default "" .Values.certSecret) . }}'
-    type: generic
-    filePaths:
-      - resources/config/certs/intermediate_root_ca.pem
-      - resources/config/certs/aaf_root_ca.cer
-
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/optf-osdf:3.0.3
+image: onap/optf-osdf:3.0.8
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -56,13 +44,15 @@ config:
   placementDefaultPatchVersion: "0"
 
   # Url and credentials for Conductor.
-  conductorUrl: https://oof-has-api:8091/v1/plans/
+  conductorUrl:
+    http: http://oof-has-api:8091/v1/plans/
   conductorPingWaitTime: 10
   conductorMaxRetries: 30
   # versions to be set in HTTP header
   conductorMinorVersion: 0
   # Url and credentials for the Policy Platform
-  policyPlatformUrl: https://policy-xacml-pdp:6969/policy/pdpx/v1/decision  # Policy Dev platform URL
+  policyPlatformUrl:
+    http: http://policy-xacml-pdp:8080/policy/pdpx/v1/decision
   policyPlatformEnv: TEST # Environment for policy platform
   # Credentials for the message reader - A placeholder.
   messageReaderHosts: NA
@@ -70,32 +60,31 @@ config:
   # Credentials for the SDC interface - A placeholder.
   sdcUrl: NA
   sdcONAPInstanceID: NA
-  #AAF Authentication
-  is_aaf_enabled: False
-  aaf_cache_expiry_mins: 5
-  aaf_url: https://aaf-service:8100
-  aaf_user_roles:
-      - '/placement:org.onap.oof.access|*|read ALL'
-      - '/pci:org.onap.oof.access|*|read ALL'
-  # Secret Management Service from AAF
-  aaf_sms_url: https://aaf-sms
-  aaf_sms_port: 10443
-  aaf_sms_timeout: 30
-  secret_domain: osdf
-  aaf_ca_certs: /opt/app/ssl_cert/aaf_root_ca.cer
+
+  configClientType: cps
+
   # config db api
   configDbUrl: http://configdb:8080
   configDbGetCellListUrl: 'api/sdnc-config-db/v3/getCellList'
   configDbGetNbrListUrl: 'api/sdnc-config-db/v3/getNbrList'
+
+  # cps api
+  cps:
+    url: cps-tbdmt:8080/execute
+    cellListUrl: 'ran-network/getCellList'
+    nbrListUrl: 'ran-network/getNbrList'
+
   #aai api
-  aaiUrl: https://aai:8443
+  aaiUrl:
+    http: http://aai:80
   aaiGetLinksUrl: /aai/v16/network/logical-links
   aaiServiceInstanceUrl : /aai/v20/nodes/service-instances/service-instance/
   aaiGetControllersUrl: /aai/v19/external-system/esr-thirdparty-sdnc-list
   controllerQueryUrl: /aai/v19/query?format=resource
   aaiGetInterDomainLinksUrl: /aai/v19/network/logical-links?link-type=inter-domain&operational-status=up
   #des api
-  desUrl: https://des.url:9000
+  desUrl:
+    http: http://des.url:8080
   desApiPath: /datalake/v1/exposure/
   desUsername: ''
   desPassword: ''
@@ -106,39 +95,23 @@ affinity: {}
 # Resource Limit flavor -By Default using small
 flavor: small
 
-#sub-charts configuration
-certInitializer:
-  nameOverride: oof-osdf-cert-initializer
-  fqdn: "oof.onap"
-  app_ns: "org.osaaf.aaf"
-  fqi: "oof@oof.onap.org"
-  fqi_namespace: org.onap.oof
-  public_fqdn: "oof.onap.org"
-  aafDeployFqi: "deployer@people.osaaf.org"
-  aafDeployPass: demo123456!
-  cadi_latitude: "0.0"
-  cadi_longitude: "0.0"
-  credsPath: /opt/app/osaaf/local
-  appMountPath: /opt/osdf/osaaf
-  aaf_add_config: >
-    chmod 444 {{ .Values.credsPath }}/{{ .Values.fqi_namespace }}.key;
-
 # Segregation for Different environment (Small and Large)
 resources:
   small:
     limits:
-      memory: 2Gi
-      cpu: 1000m
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      memory: 1Gi
-      cpu: 500m
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      memory: 4Gi
-      cpu: 2000m
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      memory: 2Gi
-      cpu: 1000m
+      cpu: "1"
+      memory: "2Gi"
+
   unlimited: {}
 # probe configuration parameters
 liveness:
@@ -153,13 +126,15 @@ readiness:
 service:
   type: NodePort
   name: oof-osdf
-  externalPort: 8698
   internalPort: 8699
-  nodePort: 48
+  ports:
+    - name: http
+      port: 8698
+      nodePort: '48'
 ingress:
   enabled: false
   service:
-    - baseaddr: "oofosdf"
+    - baseaddr: "oof-osdf-api"
       name: "oof-osdf"
       port: 8698
   config:
@@ -167,8 +142,16 @@ ingress:
 
 #component overrides
 
-oof-cmso:
-  enabled: true
 oof-has:
   enabled: true
-  certSecret: *oof-certs
+
+readinessCheck:
+  wait_for:
+    services:
+      - policy-xacml-pdp
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: oof
+  roles:
+    - read