X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fvid%2Fvalues.yaml;h=aba010eb26ca25b09c8a1ee7c57c12990d4eaec4;hb=e4aac7a3c577b7bb9eaae93387d482f952ee4b72;hp=4cd3321b7d9e9e53b80bcd2bea0f277be300b2cb;hpb=70f269ea180517b0f6878fb34e65e61cde3a3b2c;p=oom.git

diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index 4cd3321b7d..aba010eb26 100644
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Copyright © 2020 Samsung Electronics
+# Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,39 +19,85 @@
 # Declare variables to be passed into your templates.
 global:
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:3.0.1
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
+  mariadbGalera: &mariadbGalera
+    #This flag allows VID to instantiate its own mariadb-galera cluster
+    localCluster: false
+    service: mariadb-galera
+    internalPort: 3306
+    nameOverride: mariadb-galera
+  centralizedLoggingEnabled: true
 
 #################################################################
 # Secrets metaconfig
 #################################################################
 secrets:
   - uid: vid-db-user-secret
-    name: '{{ include "common.release" . }}-vid-db-user-secret'
+    name: &dbUserSecretName '{{ include "common.release" . }}-vid-db-user-secret'
     type: basicAuth
     externalSecret: '{{ tpl (default "" .Values.config.db.userCredentialsExternalSecret) . }}'
     login: '{{ .Values.config.db.userName }}'
     password: '{{ .Values.config.db.userPassword }}'
 
+#################################################################
+# AAF part
+#################################################################
+certInitializer:
+  nameOverride: vid-cert-initializer
+  aafDeployFqi: deployer@people.osaaf.org
+  aafDeployPass: demo123456!
+  # aafDeployCredsExternalSecret: some secret
+  fqdn: vid
+  fqi: vid@vid.onap.org
+  public_fqdn: vid.onap.org
+  fqi_namespace: "org.onap.vid"
+  cadi_longitude: "0.0"
+  cadi_latitude: "0.0"
+  app_ns: org.osaaf.aaf
+  credsPath: /opt/app/osaaf/local
+  aaf_add_config: |
+    echo "*** retrieving password for keystore and trustore"
+    export $(/opt/app/aaf_config/bin/agent.sh local showpass \
+    {{.Values.fqi}} {{ .Values.fqdn }} | grep '^c' | xargs -0)
+    if [ -z "$cadi_keystore_password" ]
+    then
+      echo "  /!\ certificates retrieval failed"
+      exit 1
+    else
+      echo "*** changing them into shell safe ones"
+      export KEYSTORE_PASSWD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w64 | head -n1)
+      export TRUSTORE_PASSWD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w64 | head -n1)
+      cd {{ .Values.credsPath }}
+      keytool -storepasswd -new "${KEYSTORE_PASSWD}" \
+        -storepass "${cadi_keystore_password_jks}" \
+        -keystore {{ .Values.fqi_namespace }}.jks
+      keytool -storepasswd -new "${TRUSTORE_PASSWD}" \
+        -storepass "${cadi_truststore_password}" \
+        -keystore {{ .Values.fqi_namespace }}.trust.jks
+      echo "*** set key password as same password as keystore password"
+      keytool -keypasswd -new "${KEYSTORE_PASSWD}" \
+        -keystore {{ .Values.fqi_namespace }}.jks \
+        -keypass "${cadi_keystore_password_jks}" \
+        -storepass "${KEYSTORE_PASSWD}" -alias {{ .Values.fqi }}
+      echo "*** save the generated passwords"
+      echo "VID_KEYSTORE_PASSWORD=${KEYSTORE_PASSWD}" > mycreds.prop
+      echo "VID_TRUSTSTORE_PASSWORD=${TRUSTORE_PASSWD}" >> mycreds.prop
+      echo "*** change ownership of certificates to targeted user"
+      chown -R 1000 .
+    fi
+
 subChartsOnly:
   enabled: true
 
 # application image
-repository: nexus3.onap.org:10001
-image: onap/vid:6.0.4
+image: onap/vid:8.0.2
 pullPolicy: Always
 
-# mariadb image for initializing
-mariadb_image: library/mariadb:10
-
 # application configuration
 config:
   db:
     userName: vidadmin
 #    userCredentialsExternalSecret: some secret
 #    userPassword: password
-  vidkeystorepassword: 'F:.\,csU\&ew8\;tdVitnfo\}O\!g'
   asdcclientrestauth: "Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
   asdcclientrestport: "8443"
   vidaaiport: "8443"
@@ -67,14 +114,11 @@ config:
   roleaccesscentralized: remote
 
 mariadb-galera:
-  config:
-    userCredentialsExternalSecret: '{{ include "common.release" . }}-vid-db-user-secret'
-    mysqlDatabase: vid_openecomp_epsdk
-  nameOverride: vid-galera
-  service:
-    name: vid-galera
-    portName: mysql-vid
-    internalPort: "3306"
+  db:
+    # password:
+    externalSecret: *dbUserSecretName
+    name: &mysqlDbName vid_openecomp_epsdk
+  nameOverride: &vid-galera vid-galera
   replicaCount: 3
   persistence:
     enabled: true
@@ -82,6 +126,17 @@ mariadb-galera:
   externalConfig: |-
     [mysqld]
     lower_case_table_names = 1
+  serviceAccount:
+    nameOverride: *vid-galera
+
+mariadb-init:
+  config:
+    userCredentialsExternalSecret: *dbUserSecretName
+    mysqlDatabase: *mysqlDbName
+  nameOverride: vid-mariadb-init
+  # A configMap of same name is created. It points to file that will be run after
+  # The DB has been created.
+  dbScriptConfigMap: '{{ include "common.release" . }}-vid-db-init'
 
 # default number of instances
 replicaCount: 1
@@ -115,11 +170,11 @@ service:
 ingress:
   enabled: false
   service:
-       - baseaddr: "vid.api"
-         name: "vid-http"
-         port: 8443
+    - baseaddr: "vid.api"
+      name: "vid-http"
+      port: 8443
   config:
-       ssl: "redirect"
+    ssl: "redirect"
 
 # Resource Limit flavor -By Default using small
 flavor: small
@@ -140,3 +195,7 @@ resources:
       cpu: 200m
       memory: 2Gi
   unlimited: {}
+
+# Log configuration
+log:
+  path: /var/log/onap