X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fonap%2Fvalues.yaml;h=d5d3e109b177126fcb1532193d3ce0b06eb94f37;hb=refs%2Fchanges%2F26%2F122426%2F70;hp=3c8b1e9d90443ad8bdea253f66033d07b7590760;hpb=90a630abc07da1580a247acceb3245872f3989a3;p=oom.git

diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 3c8b1e9d90..08f404a70c 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -1,6 +1,6 @@
 # Copyright © 2019 Amdocs, Bell Canada
 # Copyright (c) 2020 Nordix Foundation, Modifications
-# Modifications Copyright © 2020 Nokia
+# Modifications Copyright © 2020-2021 Nokia
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ global:
   dockerHubRepository: &dockerHubRepository docker.io
   elasticRepository: &elasticRepository docker.elastic.co
   googleK8sRepository: k8s.gcr.io
- 
+  githubContainerRegistry: ghcr.io
 
   #/!\ DEPRECATED /!\
   # Legacy repositories which will be removed at the end of migration.
@@ -81,7 +81,7 @@ global:
   busyboxImage: busybox:1.32
 
   # curl image
-  curlImage: curlimages/curl:7.69.1
+  curlImage: curlimages/curl:7.80.0
 
   # env substitution image
   envsubstImage: dibi/envsubst:1
@@ -97,13 +97,13 @@ global:
   loggingImage: beats/filebeat:5.5.0
 
   # mariadb client image
-  mariadbImage: mariadb:10.1.48
+  mariadbImage: bitnami/mariadb:10.6.5-debian-10-r28
 
   # nginx server image
   nginxImage: bitnami/nginx:1.18-debian-10
 
   # postgreSQL client and server image
-  postgresImage: crunchydata/crunchy-postgres:centos7-10.11-4.2.1
+  postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1
 
   # readiness check image
   readinessImage: onap/oom/readiness:3.0.1
@@ -111,6 +111,9 @@ global:
   # image pull policy
   pullPolicy: Always
 
+  # default java image
+  jreImage: onap/integration-java11:10.0.0
+
   # default clusterName
   # {{ template "common.fullname" . }}.{{ template "common.namespace" . }}.svc.{{ .Values.global.clusterName }}
   clusterName: cluster.local
@@ -141,11 +144,10 @@ global:
   # to the desired value
   # logLevel: DEBUG
 
-  #Global ingress configuration
+  # Global ingress configuration
   ingress:
     enabled: false
     virtualhost:
-      enabled: true
       baseurl: "simpledemo.onap.org"
 
   # Global Service Mesh configuration
@@ -153,6 +155,18 @@ global:
   serviceMesh:
     enabled: false
     tls: true
+    # be aware that linkerd is not well tested
+    engine: "istio" # valid value: istio or linkerd
+
+  # metrics part
+  # If enabled, exporters (for prometheus) will be deployed
+  # if custom resources set to yes, CRD from prometheus operartor will be
+  # created
+  # Not all components have it enabled.
+  #
+  metrics:
+    enabled: true
+    custom_resources: false
 
   # Disabling AAF
   # POC Mode, only for use in development environment
@@ -160,30 +174,37 @@ global:
   aafEnabled: true
   aafAgentImage: onap/aaf/aaf_agent:2.1.20
 
+  # Disabling MSB
+  # POC Mode, only for use in development environment
+  msbEnabled: true
+
+  # default values for certificates
+  certificate:
+    default:
+      renewBefore: 720h #30 days
+      duration:    8760h #365 days
+      subject:
+        organization: "Linux-Foundation"
+        country: "US"
+        locality: "San-Francisco"
+        province: "California"
+        organizationalUnit: "ONAP"
+      issuer:
+        group: certmanager.onap.org
+        kind: CMPv2Issuer
+        name: cmpv2-issuer-onap
+
   # Enabling CMPv2
   cmpv2Enabled: true
   platform:
-    certServiceClient:
-      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.1.0
-      secret:
-        name: oom-cert-service-client-tls-secret
-        mountPath: /etc/onap/oom/certservice/certs/
-      envVariables:
-        # Certificate related
-        cmpv2Organization: "Linux-Foundation"
-        cmpv2OrganizationalUnit: "ONAP"
-        cmpv2Location: "San-Francisco"
-        cmpv2State: "California"
-        cmpv2Country: "US"
-        # Client configuration related
-        caName: "RA"
-        requestURL: "https://oom-cert-service:8443/v1/certificate/"
-        requestTimeout: "30000"
-        keystorePath: "/etc/onap/oom/certservice/certs/certServiceClient-keystore.jks"
-        outputType: "P12"
-        keystorePassword: "secret"
-        truststorePath: "/etc/onap/oom/certservice/certs/truststore.jks"
-        truststorePassword: "secret"
+    certificates:
+      clientSecretName: oom-cert-service-client-tls-secret
+      keystoreKeyRef: keystore.jks
+      truststoreKeyRef: truststore.jks
+      keystorePasswordSecretName: oom-cert-service-certificates-password
+      keystorePasswordSecretKey: password
+      truststorePasswordSecretName: oom-cert-service-certificates-password
+      truststorePasswordSecretKey: password
 
   # Indicates offline deployment build
   # Set to true if you are rendering helm charts for offline deployment
@@ -267,13 +288,17 @@ consul:
 # addTestingComponents
 contrib:
   enabled: *testing
+cps:
+  enabled: false
 dcaegen2:
   enabled: false
+dcaegen2-services:
+  enabled: false
 dcaemod:
   enabled: false
-dmaap:
+holmes:
   enabled: false
-esr:
+dmaap:
   enabled: false
 # Today, "logging" chart that perform the central part of logging must also be
 # enabled in order to make it work. So `logging.enabled` must have the same
@@ -342,11 +367,6 @@ so:
   #   server:
   #     monitoring:
   #       password: demo123456!
-
-  # configure embedded mariadb
-  mariadb:
-    config:
-      mariadbRootPassword: password
 uui:
   enabled: false
 vfc:
@@ -366,3 +386,5 @@ cert-wrapper:
   enabled: true
 repository-wrapper:
   enabled: true
+roles-wrapper:
+  enabled: true