3 files changed, 82 insertions, 43 deletions
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 371bc7167e..3113fda8d1 100644
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -15,8 +15,8 @@
 
 apiVersion: v2
 name: onap
-version: 10.0.0
-appVersion: Jakarta
+version: 11.0.0
+appVersion: Kohn
 description: Open Network Automation Platform (ONAP)
 home: https://www.onap.org/
 sources:
@@ -26,160 +26,160 @@ kubeVersion: ">=1.19.11-0"
 
 dependencies:
   - name: aaf
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: aaf.enabled
   - name: aai
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: aai.enabled
   - name: appc
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: appc.enabled
   - name: cassandra
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: cassandra.enabled
   - name: cds
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: cds.enabled
   - name: cli
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: cli.enabled
   - name: common
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
   - name: consul
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: consul.enabled
   - name: contrib
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: global.addTestingComponents
   - name: cps
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: cps.enabled
   - name: dcaegen2
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: dcaegen2.enabled
   - name: dcaegen2-services
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: dcaegen2-services.enabled
   - name: dcaemod
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: dcaemod.enabled
   - name: holmes
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: holmes.enabled
   - name: dmaap
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: dmaap.enabled
   - name: log
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: log.enabled
   - name: sniro-emulator
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: sniro-emulator.enabled
   - name: mariadb-galera
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: mariadb-galera.enabled
   - name: msb
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: msb.enabled
   - name: multicloud
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: multicloud.enabled
   - name: nbi
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: nbi.enabled
   - name: policy
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: policy.enabled
   - name: portal
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: portal.enabled
   - name: postgres
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: postgres.enabled
   - name: oof
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: oof.enabled
   - name: repository-wrapper
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
   - name: robot
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: robot.enabled
   - name: sdc
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: sdc.enabled
   - name: sdnc
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: sdnc.enabled
   - name: so
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: so.enabled
   - name: strimzi
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: strimzi.enabled
   - name: uui
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: uui.enabled
   - name: vfc
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: vfc.enabled
   - name: vid
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: vid.enabled
   - name: vnfsdk
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: vnfsdk.enabled
   - name: modeling
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: modeling.enabled
   - name: platform
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: platform.enabled
   - name: a1policymanagement
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: a1policymanagement.enabled
   - name: cert-wrapper
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: cert-wrapper.enabled
   - name: roles-wrapper
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
     condition: roles-wrapper.enabled
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index f16813fc97..f8f1b4cd81 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -2,6 +2,7 @@
 # Copyright (c) 2020 Nordix Foundation, Modifications
 # Modifications Copyright © 2020 Nokia
 # Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2022 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -56,6 +57,44 @@ dcaegen2:
   enabled: true
 dcaegen2-services:
   enabled: true
+  dcae-datafile-collector:
+    enabled: true
+  dcae-datalake-admin-ui:
+    enabled: true
+  dcae-datalake-des:
+    enabled: true
+  dcae-datalake-feeder:
+    enabled: true
+  dcae-heartbeat:
+    enabled: true
+  dcae-hv-ves-collector:
+    enabled: true
+  dcae-kpi-ms:
+    enabled: true
+  dcae-ms-healthcheck:
+    enabled: true
+  dcae-pm-mapper:
+    enabled: true
+  dcae-pmsh:
+    enabled: true
+  dcae-prh:
+    enabled: true
+  dcae-restconf-collector:
+    enabled: true
+  dcae-slice-analysis-ms:
+    enabled: true
+  dcae-snmptrap-collector:
+    enabled: true
+  dcae-son-handler:
+    enabled: true
+  dcae-tcagen2:
+    enabled: true
+  dcae-ves-collector:
+    enabled: true
+  dcae-ves-mapper:
+    enabled: true
+  dcae-ves-openapi-manager:
+    enabled: true
 dcaemod:
   enabled: true
 holmes:
diff --git a/kubernetes/onap/resources/overrides/sm-onap.yaml b/kubernetes/onap/resources/overrides/sm-onap.yaml
index 37080b8290..2af6e2147b 100644
--- a/kubernetes/onap/resources/overrides/sm-onap.yaml
+++ b/kubernetes/onap/resources/overrides/sm-onap.yaml
@@ -135,7 +135,7 @@ so:
     openStackServiceTenantName: "$OPENSTACK_TENANT_NAME"
     openStackEncryptedPasswordHere: "$OPENSTACK_ENCRYPTED_PASSWORD"
 strimzi:
-  enabled: false
+  enabled: true
 uui:
   enabled: false
 vid: