Update multus-cni from v3.2 to ecc474a (#15)

Update package multus-cni from v3.2 to current tip of master.

Multus added support for multiple IPs/interface in this
PR: k8snetworkplumbingwg/multus-cni#387

The latest available tag is v3.3, which does not include
the above PR.

Signed-off-by: vpickard <vpickard@redhat.com>

.gopath/src/github.com/intel/network-resources-injector

@@ -0,0 +1 @@
+../../../..

glide.yaml

@@ -6,9 +6,12 @@ import:
   - csr
 - package: github.com/golang/glog
 - package: github.com/intel/multus-cni
-  version: ~3.2
+  version: ecc474a26425fd5e6d1b75468a479a24e58add91
   subpackages:
   - types
+- package: github.com/k8snetworkplumbingwg/network-attachment-definition-client/
+  subpackages:
+    - pkg/apis/k8s.cni.cncf.io/v1
 - package: github.com/pkg/errors
   version: ~0.8.1
 - package: k8s.io/api

pkg/installer/installer.go

@@ -42,7 +42,7 @@ func generateCSR() ([]byte, []byte, error) {
 	glog.Infof("generating Certificate Signing Request")
 	serviceName := strings.Join([]string{prefix, "service"}, "-")
 	certRequest := csr.New()
-	certRequest.KeyRequest = &csr.BasicKeyRequest{"rsa", 2048}
+	certRequest.KeyRequest = &csr.KeyRequest{"rsa", 2048}
 	certRequest.CN = strings.Join([]string{serviceName, namespace, "svc"}, ".")
 	certRequest.Hosts = []string{
 		serviceName,

pkg/webhook/webhook.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/golang/glog"
 	"github.com/intel/multus-cni/types"
+	cniv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
 	"github.com/pkg/errors"
 
 	"k8s.io/api/admission/v1beta1"
@@ -116,9 +117,9 @@ func deserializeAdmissionReview(body []byte) (*v1beta1.AdmissionReview, error) {
 	return ar, err
 }
 
-func deserializeNetworkAttachmentDefinition(ar *v1beta1.AdmissionReview) (types.NetworkAttachmentDefinition, error) {
+func deserializeNetworkAttachmentDefinition(ar *v1beta1.AdmissionReview) (cniv1.NetworkAttachmentDefinition, error) {
 	/* unmarshal NetworkAttachmentDefinition from AdmissionReview request */
-	netAttachDef := types.NetworkAttachmentDefinition{}
+	netAttachDef := cniv1.NetworkAttachmentDefinition{}
 	err := json.Unmarshal(ar.Request.Object.Raw, &netAttachDef)
 	return netAttachDef, err
 }
@@ -228,7 +229,7 @@ func parsePodNetworkSelectionElement(selection, defaultNamespace string) (*types
 	return networkSelectionElement, nil
 }
 
-func getNetworkAttachmentDefinition(namespace, name string) (*types.NetworkAttachmentDefinition, error) {
+func getNetworkAttachmentDefinition(namespace, name string) (*cniv1.NetworkAttachmentDefinition, error) {
 	path := fmt.Sprintf("/apis/k8s.cni.cncf.io/v1/namespaces/%s/network-attachment-definitions/%s", namespace, name)
 	rawNetworkAttachmentDefinition, err := clientset.ExtensionsV1beta1().RESTClient().Get().AbsPath(path).DoRaw()
 	if err != nil {
@@ -237,7 +238,7 @@ func getNetworkAttachmentDefinition(namespace, name string) (*types.NetworkAttac
 		return nil, err
 	}
 
-	networkAttachmentDefinition := types.NetworkAttachmentDefinition{}
+	networkAttachmentDefinition := cniv1.NetworkAttachmentDefinition{}
 	json.Unmarshal(rawNetworkAttachmentDefinition, &networkAttachmentDefinition)
 
 	return &networkAttachmentDefinition, nil
@@ -371,7 +372,7 @@ func MutateHandler(w http.ResponseWriter, req *http.Request) {
 			glog.Infof("network attachment definition '%s/%s' found", n.Namespace, n.Name)
 
 			/* network object exists, so check if it contains resourceName annotation */
-			if resourceName, exists := networkAttachmentDefinition.Metadata.Annotations[networkResourceNameKey]; exists {
+			if resourceName, exists := networkAttachmentDefinition.ObjectMeta.Annotations[networkResourceNameKey]; exists {
 				/* add resource to map/increment if it was already there */
 				resourceRequests[resourceName]++
 				glog.Infof("resource '%s' needs to be requested for network '%s/%s'", resourceName, n.Namespace, n.Name)