diff --git a/images/multus-daemonset-crio-pre1.16.yml b/images/multus-daemonset-crio-pre1.16.yml index 4b8a02c72..00bca117d 100644 --- a/images/multus-daemonset-crio-pre1.16.yml +++ b/images/multus-daemonset-crio-pre1.16.yml @@ -1,11 +1,10 @@ --- -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: network-attachment-definitions.k8s.cni.cncf.io spec: group: k8s.cni.cncf.io - version: v1 scope: Namespaced names: plural: network-attachment-definitions @@ -13,13 +12,24 @@ spec: kind: NetworkAttachmentDefinition shortNames: - net-attach-def - validation: - openAPIV3Schema: - properties: - spec: + versions: + - 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: - config: - type: string + 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 --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1beta1 diff --git a/images/multus-daemonset-crio.yml b/images/multus-daemonset-crio.yml index f9a11901e..5009a5652 100644 --- a/images/multus-daemonset-crio.yml +++ b/images/multus-daemonset-crio.yml @@ -18,12 +18,17 @@ spec: 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: 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 --- kind: ClusterRole diff --git a/images/multus-daemonset-pre-1.16.yml b/images/multus-daemonset-pre-1.16.yml index aa10a0c0f..25667da94 100644 --- a/images/multus-daemonset-pre-1.16.yml +++ b/images/multus-daemonset-pre-1.16.yml @@ -1,11 +1,10 @@ --- -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: network-attachment-definitions.k8s.cni.cncf.io spec: group: k8s.cni.cncf.io - version: v1 scope: Namespaced names: plural: network-attachment-definitions @@ -13,13 +12,24 @@ spec: kind: NetworkAttachmentDefinition shortNames: - net-attach-def - validation: - openAPIV3Schema: - properties: - spec: + versions: + - 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: - config: - type: string + 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 --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1beta1 diff --git a/images/multus-daemonset.yml b/images/multus-daemonset.yml index c8dd6fd07..d5cf4d19d 100644 --- a/images/multus-daemonset.yml +++ b/images/multus-daemonset.yml @@ -18,12 +18,17 @@ spec: 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: 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 --- kind: ClusterRole