Merge "[GLOBAL] Bump busybox image"

[oom.git] / kubernetes / onap / values.yaml

diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 0e2b13b..a4e2d77 100755 (executable)
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -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.
@@ -78,10 +78,10 @@ global:
 
   # common global images
   # Busybox for simple shell manipulation
-  busyboxImage: busybox:1.32
+  busyboxImage: busybox:1.34.1
 
   # curl image
-  curlImage: curlimages/curl:7.69.1
+  curlImage: curlimages/curl:7.80.0
 
   # env substitution image
   envsubstImage: dibi/envsubst:1
@@ -97,7 +97,7 @@ global:
   loggingImage: beats/filebeat:5.5.0
 
   # mariadb client image
-  mariadbImage: bitnami/mariadb:10.5.8
+  mariadbImage: bitnami/mariadb:10.6.5-debian-10-r28
 
   # nginx server image
   nginxImage: bitnami/nginx:1.18-debian-10
@@ -112,7 +112,7 @@ global:
   pullPolicy: Always
 
   # default java image
-  jreImage: onap/integration-java11:7.2.0
+  jreImage: onap/integration-java11:10.0.0
 
   # default clusterName
   # {{ template "common.fullname" . }}.{{ template "common.namespace" . }}.svc.{{ .Values.global.clusterName }}
@@ -155,6 +155,8 @@ 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
@@ -257,8 +259,13 @@ global:
 # Enable/disable and configure helm charts (ie. applications)
 # to customize the ONAP deployment.
 #################################################################
+
 aaf:
   enabled: false
+  aaf-sms:
+    cps:
+      # you must always set the same values as value set in cps.enabled
+      enabled: false
 aai:
   enabled: false
 appc:
@@ -298,8 +305,6 @@ holmes:
   enabled: false
 dmaap:
   enabled: false
-esr:
-  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
 # value than centralizedLoggingEnabled