X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fvnfsdk%2Fvalues.yaml;h=2b6fd99b2e1ac571815b94413f310bded995c2b2;hb=refs%2Fheads%2Fmaster;hp=a19f15d991205c47055a4914290a8c452a72dc98;hpb=150a63ff9d0e1d5edd6695d655929fae15af71a5;p=oom.git

diff --git a/kubernetes/vnfsdk/values.yaml b/kubernetes/vnfsdk/values.yaml
index a19f15d991..723dfc3b4f 100644
--- a/kubernetes/vnfsdk/values.yaml
+++ b/kubernetes/vnfsdk/values.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications © 2023 Deutsche Telekom
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -33,37 +34,6 @@ secrets:
     password: '{{ .Values.postgres.config.pgUserPassword }}'
     passwordPolicy: generate
 
-#################################################################
-# AAF part
-#################################################################
-certInitializer:
-  nameOverride: refrepo-cert-initializer
-  aafDeployFqi: deployer@people.osaaf.org
-  aafDeployPass: demo123456!
-  # aafDeployCredsExternalSecret: some secret
-  fqdn: refrepo
-  fqi: refrepo@refrepo.onap.org
-  fqi_namespace: org.onap.refrepo
-  public_fqdn: refrepo.onap.org
-  cadi_longitude: "0.0"
-  cadi_latitude: "0.0"
-  app_ns: org.osaaf.aaf
-  credsPath: /opt/app/osaaf/local
-  aaf_add_config: |
-    echo "*** transform AAF certs into pem files"
-    mkdir -p {{ .Values.credsPath }}/certs
-    echo "keystore password: $$cadi_keystore_password_p12"
-    openssl pkcs12 -in {{ .Values.credsPath }}/{{ .Values.fqi_namespace }}.p12 \
-      -nokeys -out {{ .Values.credsPath }}/certs/cert.pem \
-      -passin pass:$cadi_keystore_password_p12 \
-      -passout pass:$cadi_keystore_password_p12
-    echo "*** copy key"
-    cp {{ .Values.credsPath }}/{{ .Values.fqi_namespace }}.key \
-      {{ .Values.credsPath }}/certs/cert.key
-    echo "*** change ownership of certificates to targeted user"
-    chown -R 999 {{ .Values.credsPath }}/certs
-
-
 #################################################################
 # Application configuration defaults.
 #################################################################
@@ -104,18 +74,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2000m
-      memory: 4Gi
+      cpu: "2000m"
+      memory: "4Gi"
     requests:
-      cpu: 500m
-      memory: 1Gi
+      cpu: "500m"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 4000m
-      memory: 8Gi
+      cpu: "4000m"
+      memory: "8Gi"
     requests:
-      cpu: 1000m
-      memory: 2Gi
+      cpu: "1000m"
+      memory: "2Gi"
   unlimited: {}
 
 # probe configuration parameters
@@ -133,9 +103,11 @@ readiness:
 service:
   type: NodePort
   name: refrepo
-  portName: https
-  nodePort: 97
   internalPort: 8703
+  ports:
+    - name: http
+      port: 8703
+      nodePort: '97'
 
 ingress:
   enabled: false
@@ -145,3 +117,12 @@ ingress:
       port: 8703
   config:
     ssl: "redirect"
+
+readinessCheck:
+  wait_for:
+    services:
+      - '{{ .Values.postgres.service.name2 }}'
+
+wait_for_job_container:
+  containers:
+    - '{{ include "common.name" . }}-job'