X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faaf%2Fcharts%2Faaf-hello%2Fvalues.yaml;h=786f0b03a5fc76ef3f7ced2b0ee944e621d00128;hb=a83b521222ca20d203a754e25858eb23e45c9b69;hp=3432211cdd710be026b809f45572380bd09ce14d;hpb=90b21b1a7649f60ad3470fa4affaacc6f64ea174;p=oom.git

diff --git a/kubernetes/aaf/charts/aaf-hello/values.yaml b/kubernetes/aaf/charts/aaf-hello/values.yaml
index 3432211cdd..786f0b03a5 100644
--- a/kubernetes/aaf/charts/aaf-hello/values.yaml
+++ b/kubernetes/aaf/charts/aaf-hello/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.
@@ -11,55 +12,79 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # 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
+  aafEnabled: true
+
 flavor: small
+
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_hello:2.1.8
-aaf_register_as: "aaf-hello.onap"
-pullPolicy: Always
+aaf_init:
+  # You might want this in your own app.  For AAF, we store in global
+  # replicas: 1
+  fqi: aaf@aaf.osaaf.org
+# This MUST match what is put in AAF's "Artifact" for Certificates
+  fqdn: aaf-hello
+# What is put in Locator for External Access
+  public_fqdn: aaf.osaaf.org
+  cadi_latitude: "38.0"
+  cadi_longitude: "-72.0"
+  credsPath: /opt/app/osaaf/local
+  aafDeployFqi: deployer@people.osaaf.org
+  aafDeployPass: demo123456!
+  # aafDeployCredsExternalSecret: some secret
+  secret_uid: &aaf_secret_uid nbi-aaf-deploy-creds
+  permission_user: 1000
+  permission_group: 999
+
+replicaCount: 0
 
+image: onap/aaf/aaf_hello:2.1.22
 
-# default number of instances
-replicaCount: 1
+service:
+  name: aaf-hello
+  type: ClusterIP
+  ports:
+    - name: api
+      protocol: http
+      port: 8130
 
 nodeSelector: {}
 
 affinity: {}
 
+secrets:
+  - uid: *aaf_secret_uid
+    type: basicAuth
+    externalSecret: '{{ ternary (tpl (default "" .Values.aaf_init.aafDeployCredsExternalSecret) .) "aafIsDisabled" .Values.global.aafEnabled }}'
+    login: '{{ .Values.aaf_init.aafDeployFqi }}'
+    password: '{{ .Values.aaf_init.aafDeployPass }}'
+    passwordPolicy: required
+
 # 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
-
-service:
-  name: aaf-hello
-  type: ClusterIP
-  portName: aaf-hello
-  #targetPort
-  internalPort: 8130
-  #port
-  externalPort: 8130
+  port: api
 
 ingress:
   enabled: false
+  service:
+    - baseaddr: "aafhello"
+      name: "aaf-hello"
+      port: 8130
+  config:
+    ssl: "none"
 
 # Configure resource requests and limits
 resources: