X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Foof%2Fcomponents%2Foof-has%2Fcomponents%2Foof-has-api%2Fvalues.yaml;h=6fa2a69dfffb8bae71ee7d0bad125efa88bc1a30;hb=555db9c1f910db06341070941b466e6c05827e27;hp=46d7172b844cafcd5e3244c55fe8feab65d3b6f4;hpb=103b679fffc112f20cd8a4aa3fb5bc0113890ef1;p=oom.git

diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
index 46d7172b84..6fa2a69dff 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
@@ -16,30 +16,37 @@
 global: # global defaults
   nodePortPrefix: 302
   image:
-    optf_has: onap/optf-has:2.1.2
+    optf_has: onap/optf-has:2.3.1
 
 #################################################################
 # secrets metaconfig
 #################################################################
 secrets:
-  - uid: oof-onap-certs
-    externalSecret: '{{ tpl (default "" .Values.certSecret) . }}'
-    type: generic
-    filePaths: '{{ .Values.secretsFilePaths }}'
+  - uid: oof-has-etcd-secret
+    name: &user-creds '{{ include "common.release" . }}-oof-has-etcd-secret'
+    type: basicAuth
+    externalSecret: '{{ tpl (default "" .Values.config.etcd.userCredentialsExternalSecret) . }}'
+    login: '{{ .Values.config.etcd.appUser }}'
+    password: '{{ .Values.config.etcd.appPassword }}'
+    passwordPolicy: required
+
+config:
+  etcd:
+    appUser: user
+    appPassword: pass
 
 service:
   type: NodePort
   name: oof-has-api
-  externalPort: 8091
   internalPort: 8091
-  nodePort: 75
-  portName: oof-has-api
+  ports:
+    - name: http
+      port: 8091
+      nodePort: '75'
 
 #backend container info
 uwsgi:
   internalPort: 8080
-ingress:
-  enabled: false
 replicaCount: 1
 nodeSelector: {}
 affinity: {}
@@ -49,18 +56,18 @@ flavor: small
 resources:
   small:
     limits:
-      memory: 4Gi
-      cpu: 2000m
+      memory: 1Gi
+      cpu: 999
     requests:
       memory: 1Gi
-      cpu: 500m
+      cpu: 0.5
   large:
     limits:
-      memory: 8Gi
-      cpu: 4000m
+      memory: 2Gi
+      cpu: 999
     requests:
       memory: 2Gi
-      cpu: 1000m
+      cpu: 1
   unlimited: {}
 # probe configuration parameters
 liveness:
@@ -73,29 +80,21 @@ readiness:
   initialDelaySeconds: 10
   periodSeconds: 10
 
-#sub-charts configuration
-certInitializer:
-  nameOverride: oof-has-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/bitnami/nginx/ssl
-  aaf_add_config: >
-    chmod 444 {{ .Values.credsPath }}/{{ .Values.fqi_namespace }}.key;
-
-
 ingress:
   enabled: false
   service:
-    - baseaddr: "oof-has-api.onap"
+    - baseaddr: "oof-has-api"
       name: "oof-has-api"
       port: 8091
   config:
     ssl: "redirect"
+
+readinessCheck:
+  wait_for:
+    - oof-has-controller
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: oof-has-api
+  roles:
+    - read