Merge "[AAF] v1.16+ compatible templates"

[oom.git] / kubernetes / aaf / charts / aaf-locate / values.yaml

diff --git a/kubernetes/aaf/charts/aaf-locate/values.yaml b/kubernetes/aaf/charts/aaf-locate/values.yaml
index 58a5f05..47b2f20 100644 (file)
--- a/kubernetes/aaf/charts/aaf-locate/values.yaml
+++ b/kubernetes/aaf/charts/aaf-locate/values.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications © 2020 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,26 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#################################################################
-# Global configuration defaults.
-#################################################################
-global:
-  nodePortPrefix: 302
-  readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.0
 flavor: small
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_locate:2.1.7
-aaf_register_as: "aaf-locate.onap"
-pullPolicy: Always
+replicaCount: 1
 
+binary: locate
 
-# default number of instances
-replicaCount: 1
+sequence_order:
+  - service
 
 nodeSelector: {}
 
@@ -39,37 +31,44 @@ affinity: {}
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 300
+  initialDelaySeconds: 30
   periodSeconds: 10
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
+  port: api
 
 readiness:
-  initialDelaySeconds: 30
+  initialDelaySeconds: 5
   periodSeconds: 10
+  port: api
 
 service:
   name: aaf-locate
   type: ClusterIP
-  portName: aaf-locate
-  #targetPort
-  internalPort: 8095
-  #port
-  externalPort: 8095
+  ports:
+    - name: api
+      protocol: http
+      port: 8095
 
 ingress:
   enabled: false
+  service:
+    - baseaddr: "aaflocate"
+      name: "aaf-locate"
+      port: 8095
+  config:
+    ssl: "redirect"
 
 # Configure resource requests and limits
 resources:
   small:
     limits:
-      cpu: 200m
-      memory: 600Mi
+      cpu: 100m
+      memory: 320Mi
     requests:
-      cpu: 20m
-      memory: 300Mi
+      cpu: 1m
+      memory: 210Mi
   large:
     limits:
       cpu: 400m