Merge "Add ovn4nfv-network addon"

10 files changed, 65 insertions, 1 deletions

diff --git a/kud/deployment_infra/emco/Makefile b/kud/deployment_infra/emco/Makefile
index e06b5f6b..e6e05880 100644
--- a/kud/deployment_infra/emco/Makefile
+++ b/kud/deployment_infra/emco/Makefile
@@ -25,6 +25,7 @@ ADDONS := \
 	multus-cni \
 	node-feature-discovery \
 	ovn4nfv \
+	ovn4nfv-network \
 	sriov-network \
 	sriov-network-operator \
 	qat-device-plugin
diff --git a/kud/deployment_infra/emco/examples/values.yaml.example b/kud/deployment_infra/emco/examples/values.yaml.example
index 4f5e45ed..8c4b6c30 100644
--- a/kud/deployment_infra/emco/examples/values.yaml.example
+++ b/kud/deployment_infra/emco/examples/values.yaml.example
@@ -33,4 +33,5 @@ AddonResourcesDeploymentIntentGroup: addon-resources-deployment-intent-group
 AddonResourcesDeploymentIntent: addon-resources-deployment-intent
 AddonResourcesPlacementIntent: addon-resources-placement-intent
 AddonResources:
+- ovn4nfv-network
 - sriov-network
diff --git a/kud/deployment_infra/helm/ovn4nfv-network/.helmignore b/kud/deployment_infra/helm/ovn4nfv-network/.helmignore
new file mode 100644
index 00000000..0e8a0eb3
--- /dev/null
+++ b/kud/deployment_infra/helm/ovn4nfv-network/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/kud/deployment_infra/helm/ovn4nfv-network/Chart.yaml b/kud/deployment_infra/helm/ovn4nfv-network/Chart.yaml
new file mode 100644
index 00000000..1b57a746
--- /dev/null
+++ b/kud/deployment_infra/helm/ovn4nfv-network/Chart.yaml
@@ -0,0 +1,24 @@
+# Copyright 2021 Intel Corporation, Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v2
+appVersion: v2.2.0
+description: |
+  OVN4NFV K8s Plugin - Network definitions
+home: https://github.com/opnfv/ovn4nfv-k8s-plugin
+name: ovn4nfv-network
+sources:
+  - https://github.com/opnfv/ovn4nfv-k8s-plugin
+type: application
+version: 0.1.0
diff --git a/kud/deployment_infra/helm/ovn4nfv-network/templates/ovnnetwork.yaml b/kud/deployment_infra/helm/ovn4nfv-network/templates/ovnnetwork.yaml
new file mode 100644
index 00000000..cdb44f4a
--- /dev/null
+++ b/kud/deployment_infra/helm/ovn4nfv-network/templates/ovnnetwork.yaml
@@ -0,0 +1,10 @@
+apiVersion: k8s.cni.cncf.io/v1
+kind: NetworkAttachmentDefinition
+metadata:
+  name: ovn-networkobj
+spec:
+  config: '{
+     "cniVersion": "0.3.1",
+     "name": "ovn4nfv-k8s-plugin",
+     "type": "ovn4nfvk8s-cni"
+  }'
diff --git a/kud/deployment_infra/helm/ovn4nfv-network/values.yaml b/kud/deployment_infra/helm/ovn4nfv-network/values.yaml
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/kud/deployment_infra/helm/ovn4nfv-network/values.yaml
diff --git a/kud/deployment_infra/profiles/ovn4nfv-network/manifest.yaml b/kud/deployment_infra/profiles/ovn4nfv-network/manifest.yaml
new file mode 100644
index 00000000..4d381d02
--- /dev/null
+++ b/kud/deployment_infra/profiles/ovn4nfv-network/manifest.yaml
@@ -0,0 +1,4 @@
+---
+version: v1
+type:
+  values: "override_values.yaml"
diff --git a/kud/deployment_infra/profiles/ovn4nfv-network/override_values.yaml b/kud/deployment_infra/profiles/ovn4nfv-network/override_values.yaml
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/kud/deployment_infra/profiles/ovn4nfv-network/override_values.yaml
diff --git a/kud/hosting_providers/containerized/addons/values.yaml.tmpl b/kud/hosting_providers/containerized/addons/values.yaml.tmpl
index f4f0b76c..328c37de 100644
--- a/kud/hosting_providers/containerized/addons/values.yaml.tmpl
+++ b/kud/hosting_providers/containerized/addons/values.yaml.tmpl
@@ -33,4 +33,5 @@ AddonResourcesDeploymentIntentGroup: addon-resources-deployment-intent-group
 AddonResourcesDeploymentIntent: addon-resources-deployment-intent
 AddonResourcesPlacementIntent: addon-resources-placement-intent
 AddonResources:
+- ovn4nfv-network
 - sriov-network
diff --git a/kud/hosting_providers/containerized/installer.sh b/kud/hosting_providers/containerized/installer.sh
index 28f1f915..4ed1833b 100755
--- a/kud/hosting_providers/containerized/installer.sh
+++ b/kud/hosting_providers/containerized/installer.sh
@@ -226,7 +226,7 @@ function install_host_artifacts {
     local -r host_addons_dir="${host_dir}/addons"
     local -r host_artifacts_dir="${host_dir}/${cluster_name}/artifacts"
 
-    for addon in cdi cdi-operator cpu-manager kubevirt kubevirt-operator multus-cni node-feature-discovery ovn4nfv qat-device-plugin sriov-network sriov-network-operator; do
+    for addon in cdi cdi-operator cpu-manager kubevirt kubevirt-operator multus-cni node-feature-discovery ovn4nfv ovn4nfv-network qat-device-plugin sriov-network sriov-network-operator; do
         mkdir -p ${host_addons_dir}/${addon}/{helm,profile}
         cp -r ${kud_infra_folder}/helm/${addon} ${host_addons_dir}/${addon}/helm
         cp -r ${kud_infra_folder}/profiles/${addon}/* ${host_addons_dir}/${addon}/profile