From b912dafd7aea67e283d10fbb56e24ab50493b894 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Thu, 14 Oct 2021 20:47:23 +0200
Subject: [PATCH] Update multus to 3.8.0
---
README.md | 2 +-
roles/download/defaults/main.yml | 2 +-
.../multus/files/multus-crd.yml | 44 +++++++++++++------
3 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/README.md b/README.md
index ba95f5310..927b79a0f 100644
--- a/README.md
+++ b/README.md
@@ -143,7 +143,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [flanneld](https://github.com/flannel-io/flannel) v0.14.0
- [kube-ovn](https://github.com/alauda/kube-ovn) v1.7.2
- [kube-router](https://github.com/cloudnativelabs/kube-router) v1.3.1
- - [multus](https://github.com/intel/multus-cni) v3.7.2
+ - [multus](https://github.com/intel/multus-cni) v3.8.0
- [ovn4nfv](https://github.com/opnfv/ovn4nfv-k8s-plugin) v1.1.0
- [weave](https://github.com/weaveworks/weave) v2.8.1
- Application
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index eb0b1c2e9..19f854e67 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -85,7 +85,7 @@ pod_infra_version: "3.3"
cilium_version: "v1.9.10"
kube_ovn_version: "v1.7.2"
kube_router_version: "v1.3.1"
-multus_version: "v3.7.2"
+multus_version: "v3.8.0"
ovn4nfv_ovn_image_version: "v1.0.0"
ovn4nfv_k8s_plugin_image_version: "v1.1.0"
helm_version: "v3.7.0"
diff --git a/roles/network_plugin/multus/files/multus-crd.yml b/roles/network_plugin/multus/files/multus-crd.yml
index 0d3a9dd45..24b2c58fc 100644
--- a/roles/network_plugin/multus/files/multus-crd.yml
+++ b/roles/network_plugin/multus/files/multus-crd.yml
@@ -11,17 +11,35 @@ spec:
singular: network-attachment-definition
kind: NetworkAttachmentDefinition
shortNames:
- - net-attach-def
+ - net-attach-def
versions:
- - name: v1
- served: true
- storage: true
- schema:
- openAPIV3Schema:
- type: object
- properties:
- spec:
- type: object
- properties:
- config:
- type: string
+ - name: v1
+ served: true
+ storage: true
+ schema:
+ openAPIV3Schema:
+ description: 'NetworkAttachmentDefinition is a CRD schema specified by the Network Plumbing
+ Working Group to express the intent for attaching pods to one or more logical or physical
+ networks. More information available at: https://github.com/k8snetworkplumbingwg/multi-net-spec'
+ type: object
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this represen
+ tation of an object. Servers should convert recognized schemas to the
+ latest internal value, and may reject unrecognized values. More info:
+ https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: 'NetworkAttachmentDefinition spec defines the desired state of a network attachment'
+ type: object
+ properties:
+ config:
+ description: 'NetworkAttachmentDefinition config is a JSON-formatted CNI configuration'
+ type: string
--
GitLab