From d026d7ecbcde494a5d033ffe5816a77eb7d3a044 Mon Sep 17 00:00:00 2001 From: Minhan Xia Date: Thu, 31 Mar 2016 13:54:45 -0700 Subject: [PATCH] Update cni binary --- cluster/saltbase/salt/cni/init.sls | 4 ++-- pkg/kubelet/network/kubenet/kubenet_linux.go | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cluster/saltbase/salt/cni/init.sls b/cluster/saltbase/salt/cni/init.sls index 544f33f522b..6af2c451041 100644 --- a/cluster/saltbase/salt/cni/init.sls +++ b/cluster/saltbase/salt/cni/init.sls @@ -12,9 +12,9 @@ cni-tar: - user: root - name: /opt/cni - makedirs: True - - source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-09214926.tar.gz + - source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-42c4cb842dad606a84e93aad5a4484ded48e3046.tar.gz - tar_options: v - - source_hash: md5=58f8631f912dd88be6a0920775db7274 + - source_hash: md5=8cee1d59f01a27e8c2c10c120dce1e7d - archive_format: tar - if_missing: /opt/cni/bin diff --git a/pkg/kubelet/network/kubenet/kubenet_linux.go b/pkg/kubelet/network/kubenet/kubenet_linux.go index 92826d036e5..f6fbfebf3e6 100644 --- a/pkg/kubelet/network/kubenet/kubenet_linux.go +++ b/pkg/kubelet/network/kubenet/kubenet_linux.go @@ -139,6 +139,7 @@ func (plugin *kubenetNetworkPlugin) Event(name string, details map[string]interf cidr.IP.To4()[3] += 1 json := fmt.Sprintf(NET_CONFIG_TEMPLATE, BridgeName, plugin.MTU, network.DefaultInterfaceName, podCIDR, cidr.IP.String()) + glog.V(2).Infof("CNI network config set to %v", json) plugin.netConfig, err = libcni.ConfFromBytes([]byte(json)) if err == nil { glog.V(5).Infof("CNI network config:\n%s", json) @@ -197,6 +198,7 @@ func (plugin *kubenetNetworkPlugin) SetUpPod(namespace string, name string, id k return fmt.Errorf("Error building CNI config: %v", err) } + glog.V(3).Infof("Calling cni plugins to add container to network with cni runtime: %+v", rt) res, err := plugin.cniConfig.AddNetwork(plugin.netConfig, rt) if err != nil { return fmt.Errorf("Error adding container to network: %v", err) @@ -252,6 +254,7 @@ func (plugin *kubenetNetworkPlugin) TearDownPod(namespace string, name string, i } delete(plugin.podCIDRs, id) + glog.V(3).Infof("Calling cni plugins to remove container from network with cni runtime: %+v", rt) if err := plugin.cniConfig.DelNetwork(plugin.netConfig, rt); err != nil { return fmt.Errorf("Error removing container from network: %v", err) }