diff options
Diffstat (limited to 'vagrant/playbooks')
| -rw-r--r-- | vagrant/playbooks/configure-multus.yml | 31 | ||||
| -rw-r--r-- | vagrant/playbooks/krd-vars.yml | 2 |
2 files changed, 18 insertions, 15 deletions
diff --git a/vagrant/playbooks/configure-multus.yml b/vagrant/playbooks/configure-multus.yml index 58eda4bd..33e72757 100644 --- a/vagrant/playbooks/configure-multus.yml +++ b/vagrant/playbooks/configure-multus.yml @@ -62,10 +62,13 @@ block: | { "type": "multus", + "name": "multus-cni", + "cniVersion": "0.3.1", "kubeconfig": "/etc/kubernetes/admin.conf", "delegates": [ { "type": "flannel", + "cniVersion": "0.3.1", "masterplugin": true, "delegate": { "isDefaultGateway": true @@ -86,25 +89,25 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: - # name must match the spec fields below, and be in the form: <plural>.<group> - name: networks.kubernetes.cni.cncf.io + name: network-attachment-definitions.k8s.cni.cncf.io spec: - # group name to use for REST API: /apis/<group>/<version> - group: kubernetes.cni.cncf.io - # version name to use for REST API: /apis/<group>/<version> + group: k8s.cni.cncf.io version: v1 - # either Namespaced or Cluster scope: Namespaced names: - # plural name to be used in the URL: /apis/<group>/<version>/<plural> - plural: networks - # singular name to be used as an alias on the CLI and for display - singular: network - # kind is normally the CamelCased singular type. Your resource manifests use this. - kind: Network - # shortNames allow shorter string to match your resource on the CLI + plural: network-attachment-definitions + singular: network-attachment-definition + kind: NetworkAttachmentDefinition shortNames: - - net + - net-attach-def + validation: + openAPIV3Schema: + properties: + spec: + properties: + config: + type: string + - name: create network objects shell: "/usr/local/bin/kubectl apply -f /tmp/crdnetwork.yml" ignore_errors: True diff --git a/vagrant/playbooks/krd-vars.yml b/vagrant/playbooks/krd-vars.yml index d5bec5b6..1e0f732f 100644 --- a/vagrant/playbooks/krd-vars.yml +++ b/vagrant/playbooks/krd-vars.yml @@ -12,7 +12,7 @@ base_dest: /tmp multus_dest: "{{ base_dest }}/multus-cni" multus_source_type: "tarball" -multus_version: 2.0 +multus_version: 3.1 multus_url: "https://github.com/intel/multus-cni/releases/download/v{{ multus_version }}/multus-cni_v{{ multus_version }}_linux_amd64.tar.gz" #multus_source_type: "source" #multus_version: def72938cd2fb272eb3a6f64a8162b1049404357 |