Merge 194c27f into dd4e93c

.travis.yml

@@ -10,12 +10,12 @@ env:
 
 before_install:
   - sudo apt-get update -qq
+  - go get github.com/mattn/goveralls
 
 install:
   # workaround golint install error in https://github.com/golang/lint/issues/288
   - mkdir -p $GOPATH/src/golang.org/x
   - pushd $GOPATH/src/golang.org/x
-  - git clone https://github.com/golang/tools.git
   - git clone https://github.com/golang/lint.git
   - go get github.com/golang/lint/golint
   - popd
@@ -29,9 +29,10 @@ before_script:
 script:
   - ./build
   - sudo ./test.sh
+  - $GOPATH/bin/goveralls  -coverprofile=coverage.out -service=travis-ci
   - mkdir -p ${TRAVIS_BUILD_DIR}/dist
   - tar cvfz ${TRAVIS_BUILD_DIR}/dist/multus-cni_amd64.tar.gz --warning=no-file-changed --exclude="dist" --exclude="vendor" .
-  - docker build -t nfvpe/multus -f ./images/Dockerfile .
+  - docker build -t nfvpe/multus .
 
 before_deploy:
   - go get -u github.com/laher/goxc

README.md

@@ -1,5 +1,7 @@
 ![multus-cni Logo](https://github.com/intel/multus-cni/blob/master/doc/images/Multus.png)
 
+[![Travis CI](https://travis-ci.org/intel/multus-cni.svg?branch=master)](https://travis-ci.org/intel/multus-cni/builds)[![Go Report Card](https://goreportcard.com/badge/github.com/intel/multus-cni)](https://goreportcard.com/report/github.com/intel/multus-cni)
+
    * [MULTUS CNI plugin](#multus-cni-plugin)
       * [Quickstart Guide](#quickstart-guide)
       * [Multi-Homed pod](#multi-homed-pod)

examples/npwg-demo-1/01_crd.yml

@@ -2,21 +2,29 @@ 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
+  group: k8s.cni.cncf.io
   # version name to use for REST API: /apis/<group>/<version>
   version: v1
   # either Namespaced or Cluster
   scope: Namespaced
   names:
     # plural name to be used in the URL: /apis/<group>/<version>/<plural>
-    plural: networks
+    plural: network-attachment-definitions
     # singular name to be used as an alias on the CLI and for display
-    singular: network
+    singular: network-attachment-definition
     # kind is normally the CamelCased singular type. Your resource manifests use this.
-    kind: Network
+    kind: NetworkAttachmentDefinition
     # shortNames allow shorter string to match your resource on the CLI
     shortNames:
-    - net
+    - net-attach-def
+  validation:
+    openAPIV3Schema:
+      properties:
+        spec:
+          properties:
+            config:
+                 type: string
+

examples/npwg-demo-1/02_clusterrole.yml

@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: multus-crd-overpowered
+  name: multus
 rules:
 - apiGroups:
   - '*'

glide.yaml

@@ -1,16 +1,18 @@
 package: github.com/intel/multus-cni
+ignore:
+- bytes
 import:
 - package: github.com/containernetworking/cni
   version: 07c1a6da47b7fbf8b357f4949ecce2113e598491
   subpackages:
-  - pkg/ip
-  - pkg/ipam
   - pkg/skel
   - pkg/types
   - pkg/version
 - package: github.com/containernetworking/plugins
   version: 2b8b1ac0af4568e928d96ccc5f47b075416eeabd
   subpackages:
+  - pkg/ip
+  - pkg/ipam
   - pkg/ns
 - package: github.com/onsi/ginkgo
   version: 7f8ab55aaf3b86885aa55b762e803744d1674700

images/70-multus.conf

@@ -6,7 +6,8 @@
       "type": "flannel",
       "name": "flannel.1",
       "delegate": {
-        "isDefaultGateway": true
+        "isDefaultGateway": true,
+        "hairpinMode": true
       }
     }
   ],

images/README.md

@@ -2,10 +2,10 @@
 
 This is used for distribution of Multus in a Docker image.
 
-Typically you'd build this from the root of your Multus clone, and you'd set the `-f` flag to specify the Dockerfile during build time. This allows the addition of the entirety of the Multus git clone as part of the Docker context. Use the `-f` flag with the root of the clone as the context (e.g. your current work directory would be root of git clone), such as:
+Typically you'd build this from the root of your Multus clone, as such:
 
 ```
-$ docker build -t dougbtv/multus -f ./images/Dockerfile .
+$ docker build -t dougbtv/multus .
 ```
 
 ---