Vendor: Update k8s version

Signed-off-by: Michał Żyłowski <michal.zylowski@intel.com>

vendor/k8s.io/kubernetes/pkg/kubelet/rkt/BUILD

@@ -38,7 +38,6 @@ go_library(
         "//pkg/kubelet/util/format:go_default_library",
         "//pkg/securitycontext:go_default_library",
         "//pkg/util/exec:go_default_library",
-        "//pkg/util/flowcontrol:go_default_library",
         "//pkg/util/parsers:go_default_library",
         "//pkg/util/selinux:go_default_library",
         "//pkg/util/strings:go_default_library",
@@ -58,6 +57,7 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/types",
         "//vendor:k8s.io/apimachinery/pkg/util/errors",
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
+        "//vendor:k8s.io/client-go/util/flowcontrol",
     ],
 )
 
@@ -80,7 +80,6 @@ go_test(
         "//pkg/kubelet/network/mock_network:go_default_library",
         "//pkg/kubelet/types:go_default_library",
         "//pkg/util/exec:go_default_library",
-        "//pkg/util/testing:go_default_library",
         "//vendor:github.com/appc/spec/schema",
         "//vendor:github.com/appc/spec/schema/types",
         "//vendor:github.com/coreos/go-systemd/dbus",
@@ -89,8 +88,10 @@ go_test(
         "//vendor:github.com/stretchr/testify/assert",
         "//vendor:golang.org/x/net/context",
         "//vendor:google.golang.org/grpc",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/types",
         "//vendor:k8s.io/apimachinery/pkg/util/errors",
+        "//vendor:k8s.io/client-go/util/testing",
     ],
 )
 

vendor/k8s.io/kubernetes/pkg/kubelet/rkt/OWNERS

@@ -1,3 +1,3 @@
-assignees:
-  - euank
-  - yifan-gu
+approvers:
+- euank
+- yifan-gu

vendor/k8s.io/kubernetes/pkg/kubelet/rkt/rkt.go

@@ -41,9 +41,11 @@ import (
 	"github.com/golang/glog"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubetypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/errors"
 	utilwait "k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/client-go/util/flowcontrol"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/client/record"
 	"k8s.io/kubernetes/pkg/credentialprovider"
@@ -59,7 +61,6 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/util/format"
 	"k8s.io/kubernetes/pkg/securitycontext"
 	utilexec "k8s.io/kubernetes/pkg/util/exec"
-	"k8s.io/kubernetes/pkg/util/flowcontrol"
 	"k8s.io/kubernetes/pkg/util/selinux"
 	utilstrings "k8s.io/kubernetes/pkg/util/strings"
 	"k8s.io/kubernetes/pkg/util/term"
@@ -1967,7 +1968,7 @@ func (r *Runtime) cleanupPodNetworkFromServiceFile(serviceFilePath string) error
 		return err
 	}
 	return r.cleanupPodNetwork(&v1.Pod{
-		ObjectMeta: v1.ObjectMeta{
+		ObjectMeta: metav1.ObjectMeta{
 			UID:       kubetypes.UID(id),
 			Name:      name,
 			Namespace: namespace,

vendor/k8s.io/kubernetes/pkg/kubelet/rkt/rkt_test.go

@@ -31,8 +31,10 @@ import (
 	rktapi "github.com/coreos/rkt/api/v1alpha"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubetypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/errors"
+	utiltesting "k8s.io/client-go/util/testing"
 	"k8s.io/kubernetes/pkg/api/resource"
 	"k8s.io/kubernetes/pkg/api/v1"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
@@ -44,7 +46,6 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/network/mock_network"
 	"k8s.io/kubernetes/pkg/kubelet/types"
 	utilexec "k8s.io/kubernetes/pkg/util/exec"
-	utiltesting "k8s.io/kubernetes/pkg/util/testing"
 )
 
 func mustMarshalPodManifest(man *appcschema.PodManifest) []byte {
@@ -1203,7 +1204,7 @@ func TestGenerateRunCommand(t *testing.T) {
 		{
 			kubenet.NewPlugin("/tmp"),
 			&v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name: "pod-name-foo",
 				},
 				Spec: v1.PodSpec{
@@ -1222,7 +1223,7 @@ func TestGenerateRunCommand(t *testing.T) {
 		{
 			kubenet.NewPlugin("/tmp"),
 			&v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name: "pod-name-foo",
 				},
 				Spec: v1.PodSpec{
@@ -1241,7 +1242,7 @@ func TestGenerateRunCommand(t *testing.T) {
 		{
 			kubenet.NewPlugin("/tmp"),
 			&v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name: "pod-name-foo",
 				},
 				Spec: v1.PodSpec{
@@ -1262,7 +1263,7 @@ func TestGenerateRunCommand(t *testing.T) {
 		{
 			kubenet.NewPlugin("/tmp"),
 			&v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name: "pod-name-foo",
 				},
 				Spec: v1.PodSpec{
@@ -1283,7 +1284,7 @@ func TestGenerateRunCommand(t *testing.T) {
 		{
 			kubenet.NewPlugin("/tmp"),
 			&v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name: "pod-name-foo",
 				},
 				Spec: v1.PodSpec{
@@ -1304,7 +1305,7 @@ func TestGenerateRunCommand(t *testing.T) {
 		{
 			&network.NoopNetworkPlugin{},
 			&v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name: "pod-name-foo",
 				},
 				Spec: v1.PodSpec{
@@ -1323,7 +1324,7 @@ func TestGenerateRunCommand(t *testing.T) {
 		{
 			kubenet.NewPlugin("/tmp"),
 			&v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name: "pod-name-foo",
 				},
 				Spec: v1.PodSpec{
@@ -1345,7 +1346,7 @@ func TestGenerateRunCommand(t *testing.T) {
 		{
 			kubenet.NewPlugin("/tmp"),
 			&v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name: "pod-name-foo",
 				},
 				Spec: v1.PodSpec{
@@ -1415,7 +1416,7 @@ func TestLifeCycleHooks(t *testing.T) {
 		{
 			// Case 0, container without any hooks.
 			&v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name:      "pod-1",
 					Namespace: "ns-1",
 					UID:       "uid-1",
@@ -1438,7 +1439,7 @@ func TestLifeCycleHooks(t *testing.T) {
 		{
 			// Case 1, containers with post-start and pre-stop hooks.
 			&v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name:      "pod-1",
 					Namespace: "ns-1",
 					UID:       "uid-1",
@@ -1513,7 +1514,7 @@ func TestLifeCycleHooks(t *testing.T) {
 		{
 			// Case 2, one container with invalid hooks.
 			&v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name:      "pod-1",
 					Namespace: "ns-1",
 					UID:       "uid-1",
@@ -1632,10 +1633,10 @@ func TestGarbageCollect(t *testing.T) {
 				MaxContainers: 0,
 			},
 			[]*v1.Pod{
-				{ObjectMeta: v1.ObjectMeta{UID: "pod-uid-1"}},
-				{ObjectMeta: v1.ObjectMeta{UID: "pod-uid-2"}},
-				{ObjectMeta: v1.ObjectMeta{UID: "pod-uid-3"}},
-				{ObjectMeta: v1.ObjectMeta{UID: "pod-uid-4"}},
+				{ObjectMeta: metav1.ObjectMeta{UID: "pod-uid-1"}},
+				{ObjectMeta: metav1.ObjectMeta{UID: "pod-uid-2"}},
+				{ObjectMeta: metav1.ObjectMeta{UID: "pod-uid-3"}},
+				{ObjectMeta: metav1.ObjectMeta{UID: "pod-uid-4"}},
 			},
 			[]*rktapi.Pod{
 				{
@@ -1716,9 +1717,9 @@ func TestGarbageCollect(t *testing.T) {
 				MaxContainers: 1,
 			},
 			[]*v1.Pod{
-				{ObjectMeta: v1.ObjectMeta{UID: "pod-uid-0"}},
-				{ObjectMeta: v1.ObjectMeta{UID: "pod-uid-1"}},
-				{ObjectMeta: v1.ObjectMeta{UID: "pod-uid-2"}},
+				{ObjectMeta: metav1.ObjectMeta{UID: "pod-uid-0"}},
+				{ObjectMeta: metav1.ObjectMeta{UID: "pod-uid-1"}},
+				{ObjectMeta: metav1.ObjectMeta{UID: "pod-uid-2"}},
 			},
 			[]*rktapi.Pod{
 				{
@@ -1839,7 +1840,7 @@ func TestMakePodManifestAnnotations(t *testing.T) {
 	}{
 		{
 			in: &v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					UID:       "uid-1",
 					Name:      "name-1",
 					Namespace: "namespace-1",