11 files changed, 82 insertions, 12 deletions
diff --git a/kud/deployment_infra/emco/examples/02-project.yaml b/kud/deployment_infra/emco/examples/02-project.yaml
index 98ecfdb4..d62a4f65 100644
--- a/kud/deployment_infra/emco/examples/02-project.yaml
+++ b/kud/deployment_infra/emco/examples/02-project.yaml
@@ -7,17 +7,63 @@ version: emco/v2
 resourceContext:
   anchor: projects
 metadata :
-   name: {{ .ProjectName }}
+  name: {{ .ProjectName }}
 
 ---
-#create default logical cloud with admin permissions
+#create privileged logical cloud
 version: emco/v2
 resourceContext:
   anchor: projects/{{ .ProjectName }}/logical-clouds
 metadata:
   name: {{ .LogicalCloud }}
 spec:
-  level: "0"
+  namespace: {{ .LogicalCloud }}
+  user:
+    user-name: {{ .LogicalCloud }}-admin
+    type: certificate
+
+---
+#create cluster quotas
+version: emco/v2
+resourceContext:
+  anchor: projects/{{ .ProjectName }}/logical-clouds/{{ .LogicalCloud }}/cluster-quotas
+metadata:
+  name: quota
+spec:
+  #an empty spec means that the addons will not be required to specify
+  #cpu, memory, etc. limits
+
+---
+#add namespaced permissions
+version: emco/v2
+resourceContext:
+  anchor: projects/{{ .ProjectName }}/logical-clouds/{{ .LogicalCloud }}/user-permissions
+metadata:
+  name: namespaced
+spec:
+  namespace: {{ .LogicalCloud }}
+  apiGroups:
+  - "*"
+  resources:
+  - "*"
+  verbs:
+  - "*"
+
+---
+#add non-namespaced permissions
+version: emco/v2
+resourceContext:
+  anchor: projects/{{ .ProjectName }}/logical-clouds/{{ .LogicalCloud }}/user-permissions
+metadata:
+  name: non-namespaced
+spec:
+  namespace: ""
+  apiGroups:
+  - "*"
+  resources:
+  - "*"
+  verbs:
+  - "*"
 
 {{- range $index, $cluster := .Clusters }}
 ---
diff --git a/kud/deployment_infra/emco/examples/values.yaml.example b/kud/deployment_infra/emco/examples/values.yaml.example
index 8c4b6c30..67944eb8 100644
--- a/kud/deployment_infra/emco/examples/values.yaml.example
+++ b/kud/deployment_infra/emco/examples/values.yaml.example
@@ -11,7 +11,7 @@ Clusters:
   Name: cluster
 
 ProjectName: kud
-LogicalCloud: default
+LogicalCloud: kud
 
 PackagesPath: $PWD/../output/packages
 AddonsApp: addons
diff --git a/kud/deployment_infra/helm/kubevirt/values.yaml b/kud/deployment_infra/helm/kubevirt/values.yaml
index c08df7ea..7349c40e 100644
--- a/kud/deployment_infra/helm/kubevirt/values.yaml
+++ b/kud/deployment_infra/helm/kubevirt/values.yaml
@@ -6,7 +6,8 @@ certificateRotateStrategy: {}
 # configuration holds kubevirt configurations.  Same as the virt-configMap.
 configuration:
   developerConfiguration:
-    featureGates: []
+    featureGates:
+    - CPUManager
 
 customizeComponents: {}
 
diff --git a/kud/deployment_infra/helm/ovn4nfv/Chart.yaml b/kud/deployment_infra/helm/ovn4nfv/Chart.yaml
index 5a4e69c1..3d6134e2 100644
--- a/kud/deployment_infra/helm/ovn4nfv/Chart.yaml
+++ b/kud/deployment_infra/helm/ovn4nfv/Chart.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 apiVersion: v2
-appVersion: v2.2.0
+appVersion: v3.0.0
 description: |
   OVN4NFV K8s Plugin - Network controller
 home: https://github.com/opnfv/ovn4nfv-k8s-plugin
diff --git a/kud/deployment_infra/helm/ovn4nfv/values.yaml b/kud/deployment_infra/helm/ovn4nfv/values.yaml
index 660c4eba..2addb6d9 100644
--- a/kud/deployment_infra/helm/ovn4nfv/values.yaml
+++ b/kud/deployment_infra/helm/ovn4nfv/values.yaml
@@ -111,7 +111,7 @@ ovn:
     repository: docker.io/integratedcloudnative/ovn-images
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: ""
+    tag: v2.2.0
   imagePullSecrets: []
 
 ovnControlPlane:
diff --git a/kud/deployment_infra/helm/sriov-network/values.yaml b/kud/deployment_infra/helm/sriov-network/values.yaml
index d9a38222..26111886 100644
--- a/kud/deployment_infra/helm/sriov-network/values.yaml
+++ b/kud/deployment_infra/helm/sriov-network/values.yaml
@@ -4,6 +4,10 @@ policies:
 - # policyName is the name of the policy
   policyName: "policy-xl710"
 
+  # deviceType is the driver type for configured VFs. Allowed values are
+  # "netdevice" and "vfio-pci".
+  deviceType: "vfio-pci"
+
   # nicSelector selects the NICs to be configured.  At least one of
   # vendor, deviceId, pfNames, or rootDevices must be deined.
   nicSelector:
@@ -37,6 +41,7 @@ policies:
   resourceName: "intel_sriov_nic"
 
 - policyName: "policy-82599es"
+  deviceType: "vfio-pci"
   nicSelector:
     deviceID: "10fb"
     vendor: "8086"
@@ -47,6 +52,7 @@ policies:
   resourceName: "intel_sriov_nic"
 
 - policyName: "policy-i350"
+  deviceType: "vfio-pci"
   nicSelector:
     deviceID: "1521"
     vendor: "8086"
@@ -81,7 +87,7 @@ networks:
 
   # deviceType is the driver type for configured VFs. Allowed values are
   # "netdevice" and "vfio-pci".
-  #deviceType: "netdevice"
+  #deviceType: "vfio-pci"
 
   # eSwitchMode NIC Device Mode. Allowed values are "legacy" and
   # "switchdev".
diff --git a/kud/deployment_infra/playbooks/configure-emco.yml b/kud/deployment_infra/playbooks/configure-emco.yml
index 82ce61ad..b3266b70 100644
--- a/kud/deployment_infra/playbooks/configure-emco.yml
+++ b/kud/deployment_infra/playbooks/configure-emco.yml
@@ -62,7 +62,7 @@
       when: "'emco' in emco_roles"
 
     - name: Install emco helm charts
-      command: /usr/local/bin/helm install --wait --namespace emco -f helm_value_overrides.yaml --set emco-db.etcd.clusterDomain={{ cluster_name.stdout }} --set emco-tools.fluentd.clusterDomain={{ cluster_name.stdout }} emco dist/packages/emco-0.1.0.tgz
+      command: /usr/local/bin/helm install --wait --timeout 10m --namespace emco -f helm_value_overrides.yaml --set emco-db.etcd.clusterDomain={{ cluster_name.stdout }} --set emco-tools.fluentd.clusterDomain={{ cluster_name.stdout }} emco dist/packages/emco-0.1.0.tgz
       args:
         chdir: "{{ emco_dir }}/deployments/helm/emcoOpenNESS"
       when: "'emco' in emco_roles"
diff --git a/kud/deployment_infra/playbooks/kud-vars.yml b/kud/deployment_infra/playbooks/kud-vars.yml
index 35057f5b..d627ab22 100644
--- a/kud/deployment_infra/playbooks/kud-vars.yml
+++ b/kud/deployment_infra/playbooks/kud-vars.yml
@@ -80,7 +80,7 @@ optane_ipmctl_package: ipmctl_02.00.00.3474+really01.00.00.3469.orig
 
 emco_git_url: "https://github.com/open-ness/EMCO.git"
 emco_repository: "integratedcloudnative/"
-emco_version: "openness-21.03"
+emco_version: "openness-21.03.06"
 emco_dir: "/opt/emco"
 emco_values:
   global:
@@ -101,8 +101,16 @@ emco_values:
       imageTag: "{{ emco_version }}"
     dtc:
       imageTag: "{{ emco_version }}"
+    nps:
+      imageTag: "{{ emco_version }}"
+    sds:
+      imageTag: "{{ emco_version }}"
     gac:
       imageTag: "{{ emco_version }}"
+    sfc:
+      imageTag: "{{ emco_version }}"
+    sfcclient:
+      imageTag: "{{ emco_version }}"
 emcoconfig_localhost: true
 emcoctl_localhost: true
 emco_roles:
diff --git a/kud/hosting_providers/containerized/addons/README.md.tmpl b/kud/hosting_providers/containerized/addons/README.md.tmpl
index 0cef7923..4ed4610a 100644
--- a/kud/hosting_providers/containerized/addons/README.md.tmpl
+++ b/kud/hosting_providers/containerized/addons/README.md.tmpl
@@ -27,6 +27,12 @@ cloud.
 This deploys the addons listed in the \`Addons\` and
 \`AddonResources\` values in values.yaml.
 
+NOTE: On a single node cluster, the SRIOV addon resource will trigger
+a drain of the worker node.  KubeVirt will prevent the drain from
+completing due to its PodDisruptionBudget.  The workaround is to scale
+down the KubeVirt operator before applying 04-addon-resources-app.yaml
+then scaling it back up after the node is ready again.
+
     \`$ /opt/kud/multi-cluster/${CLUSTER_NAME}/artifacts/emcoctl.sh apply -f 03-addons-app.yaml -v values.yaml\`
     \`$ /opt/kud/multi-cluster/${CLUSTER_NAME}/artifacts/emcoctl.sh apply -f 04-addon-resources-app.yaml -v values.yaml\`
 
diff --git a/kud/hosting_providers/containerized/addons/values.yaml.tmpl b/kud/hosting_providers/containerized/addons/values.yaml.tmpl
index 328c37de..b3e5845c 100644
--- a/kud/hosting_providers/containerized/addons/values.yaml.tmpl
+++ b/kud/hosting_providers/containerized/addons/values.yaml.tmpl
@@ -11,7 +11,7 @@ Clusters:
   Name: cluster
 
 ProjectName: kud
-LogicalCloud: default
+LogicalCloud: kud
 
 PackagesPath: ${PACKAGES_PATH}
 AddonsApp: addons
@@ -20,6 +20,8 @@ AddonsDeploymentIntentGroup: addons-deployment-intent-group
 AddonsDeploymentIntent: addons-deployment-intent
 AddonsPlacementIntent: addons-placement-intent
 Addons:
+- kubevirt-operator
+- cdi-operator
 - multus-cni
 - ovn4nfv
 - node-feature-discovery
@@ -35,3 +37,5 @@ AddonResourcesPlacementIntent: addon-resources-placement-intent
 AddonResources:
 - ovn4nfv-network
 - sriov-network
+- kubevirt
+- cdi
diff --git a/kud/tests/emco.sh b/kud/tests/emco.sh
index 7cc3ca33..1e003968 100755
--- a/kud/tests/emco.sh
+++ b/kud/tests/emco.sh
@@ -521,7 +521,6 @@ function instantiate {
 }
 
 function terminateOrchData {
-    call_api -d "{ }" "${base_url_dcm}/projects/${projectname}/logical-clouds/${admin_logical_cloud_name}/terminate"
     call_api -d "{ }" "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/deployment-intent-groups/${deployment_intent_group_name}/terminate"
     call_api -d "{ }" "${base_url_dcm}/projects/${projectname}/logical-clouds/${admin_logical_cloud_name}/terminate"
 }