3 files changed, 23 insertions, 3 deletions
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index 229717a990..f92bfa78bc 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -29,6 +29,10 @@ postgres:
   enabled: true
 aaf:
   enabled: true
+  aaf-sms:
+    cps:
+      # you must always set the same values as value set in cps.enabled
+      enabled: true
 aai:
   enabled: true
 appc:
diff --git a/kubernetes/onap/resources/overrides/sm-onap.yaml b/kubernetes/onap/resources/overrides/sm-onap.yaml
index 312fc4b65f..b07b6d3aa2 100644
--- a/kubernetes/onap/resources/overrides/sm-onap.yaml
+++ b/kubernetes/onap/resources/overrides/sm-onap.yaml
@@ -44,6 +44,11 @@
 #######################
 global:
   aafEnabled: false
+  centralizedLoggingEnabled: false
+  serviceMesh:
+    enabled: true
+    tls: true
+    engine: "istio"
 aai:
   enabled: true
   global:
@@ -53,6 +58,10 @@ aai:
     replicaCount: 1
 aaf:
   enabled: false
+  aaf-sms:
+    cps:
+      # you must always set the same values as value set in cps.enabled
+      enabled: false
 appc:
   enabled: false
 cassandra:
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 3ae58a3390..73f96d3eb8 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -78,7 +78,7 @@ global:
 
   # common global images
   # Busybox for simple shell manipulation
-  busyboxImage: busybox:1.32
+  busyboxImage: busybox:1.34.1
 
   # curl image
   curlImage: curlimages/curl:7.80.0
@@ -91,7 +91,7 @@ global:
   htpasswdImage: xmartlabs/htpasswd:latest
 
   # kubenretes client image
-  kubectlImage: bitnami/kubectl:1.19
+  kubectlImage: bitnami/kubectl:1.22.4
 
   # logging agent
   loggingImage: beats/filebeat:5.5.0
@@ -100,7 +100,7 @@ global:
   mariadbImage: bitnami/mariadb:10.6.5-debian-10-r28
 
   # nginx server image
-  nginxImage: bitnami/nginx:1.18-debian-10
+  nginxImage: bitnami/nginx:1.21.4
 
   # postgreSQL client and server image
   postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1
@@ -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: