Merge pull request #45166 from feiskyer/namespace-network

Automatic merge from submit-queue (batch tested with PRs 45013, 45166) CRI: remove PodSandboxStatus.Linux.Namespaces.Network **What this PR does / why we need it**: PodSandboxStatus.Linux.Namespaces.Network is not used, so this PR removes it from CRI. **Which issue this PR fixes** Closes: #44972 **Special notes for your reviewer**: **Release note**: ```release-note Remove PodSandboxStatus.Linux.Namespaces.Network from CRI. ``` /assign @Random-Liu @yujuhong

Merge pull request #45166 from feiskyer/namespace-network
2371a70b · Kubernetes Submit Queue · GitHub · 960ff51d · d301f228 · 2371a70b
Commit 2371a70b authored May 02, 2017 by Kubernetes Submit Queue Committed by GitHub May 02, 2017
4 changed files
--- a/pkg/kubelet/api/v1alpha1/runtime/api.pb.go
+++ b/pkg/kubelet/api/v1alpha1/runtime/api.pb.go
--- a/pkg/kubelet/api/v1alpha1/runtime/api.proto
+++ b/pkg/kubelet/api/v1alpha1/runtime/api.proto
@@ -338,8 +338,6 @@ message PodSandboxNetworkStatus {

 // Namespace contains paths to the namespaces.
 message Namespace {
-    // Path to the network namespace.
-    string network = 1;
    // Namespace options for Linux namespaces.
    NamespaceOption options = 2;
 }

--- a/pkg/kubelet/dockershim/docker_sandbox.go
+++ b/pkg/kubelet/dockershim/docker_sandbox.go
@@ -322,7 +322,6 @@ func (ds *dockerService) PodSandboxStatus(podSandboxID string) (*runtimeapi.PodS
 		return nil, err
 	}
 	network := &runtimeapi.PodSandboxNetworkStatus{Ip: IP}
-	netNS := getNetworkNamespace(r)
 	hostNetwork := sharesHostNetwork(r)

 	// If the sandbox has no containerTypeLabelKey label, treat it as a legacy sandbox.
@@ -351,7 +350,6 @@ func (ds *dockerService) PodSandboxStatus(podSandboxID string) (*runtimeapi.PodS
 		Network:     network,
 		Linux: &runtimeapi.LinuxPodSandboxStatus{
 			Namespaces: &runtimeapi.Namespace{
-				Network: netNS,
 				Options: &runtimeapi.NamespaceOption{
 					HostNetwork: hostNetwork,
 					HostPid:     sharesHostPid(r),

--- a/pkg/kubelet/dockershim/docker_sandbox_test.go
+++ b/pkg/kubelet/dockershim/docker_sandbox_test.go
@@ -20,7 +20,6 @@ import (
 	"errors"
 	"fmt"
 	"net"
-	"os"
 	"testing"
 	"time"

@@ -100,7 +99,6 @@ func TestSandboxStatus(t *testing.T) {
 	// TODO: The following variables depend on the internal
 	// implementation of FakeDockerClient, and should be fixed.
 	fakeIP := "2.3.4.5"
-	fakeNS := fmt.Sprintf("/proc/%d/ns/net", os.Getpid())

 	state := runtimeapi.PodSandboxState_SANDBOX_READY
 	ct := int64(0)
@@ -110,7 +108,7 @@ func TestSandboxStatus(t *testing.T) {
 		CreatedAt:   ct,
 		Metadata:    config.Metadata,
 		Network:     &runtimeapi.PodSandboxNetworkStatus{Ip: fakeIP},
-		Linux:       &runtimeapi.LinuxPodSandboxStatus{Namespaces: &runtimeapi.Namespace{Network: fakeNS, Options: &runtimeapi.NamespaceOption{HostNetwork: hostNetwork}}},
+		Linux:       &runtimeapi.LinuxPodSandboxStatus{Namespaces: &runtimeapi.Namespace{Options: &runtimeapi.NamespaceOption{HostNetwork: hostNetwork}}},
 		Labels:      labels,
 		Annotations: annotations,
 	}