[OOM] Fixing k8s cpu limits

[oom.git] / kubernetes / oof / values.yaml

diff --git a/kubernetes/oof/values.yaml b/kubernetes/oof/values.yaml
index e7660ad..ddff8f4 100644 (file)
--- a/kubernetes/oof/values.yaml
+++ b/kubernetes/oof/values.yaml
@@ -17,16 +17,13 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:3.0.1
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
   persistence: {}
+
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-repository: nexus3.onap.org:10001
-image: onap/optf-osdf:2.0.4
+image: onap/optf-osdf:3.0.8
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -47,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
@@ -61,45 +60,58 @@ 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://config.db.url:8080
-  configDbGetCellListUrl: 'SDNCConfigDBAPI/getCellList'
-  configDbGetNbrListUrl: 'SDNCConfigDBAPI/getNbrList'
+  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:
+    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:
+    http: http://des.url:8080
+  desApiPath: /datalake/v1/exposure/
+  desUsername: ''
+  desPassword: ''
 # default number of instances
 replicaCount: 1
 nodeSelector: {}
 affinity: {}
 # Resource Limit flavor -By Default using small
 flavor: small
+
 # Segregation for Different environment (Small and Large)
 resources:
   small:
     limits:
-      memory: 2Gi
-      cpu: 1000m
+      cpu: 1
+      memory: 1Gi
     requests:
+      cpu: 0.5
       memory: 1Gi
-      cpu: 500m
   large:
     limits:
-      memory: 4Gi
-      cpu: 2000m
+      cpu: 2
+      memory: 2Gi
     requests:
+      cpu: 1
       memory: 2Gi
-      cpu: 1000m
+
   unlimited: {}
 # probe configuration parameters
 liveness:
@@ -114,14 +126,31 @@ 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:
     ssl: "redirect"
+
+#component overrides
+
+oof-has:
+  enabled: true
+
+readinessCheck:
+  wait_for:
+    - policy-xacml-pdp
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: oof
+  roles:
+    - read