*: initial update to kube 1.8

Signed-off-by: Antonio Murdaca <runcom@redhat.com>

vendor/k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto

@@ -61,6 +61,8 @@ service RuntimeService {
     // ContainerStatus returns status of the container. If the container is not
     // present, returns an error.
     rpc ContainerStatus(ContainerStatusRequest) returns (ContainerStatusResponse) {}
+    // UpdateContainerResources updates ContainerConfig of the container.
+    rpc UpdateContainerResources(UpdateContainerResourcesRequest) returns (UpdateContainerResourcesResponse) {}
 
     // ExecSync runs a command in a container synchronously.
     rpc ExecSync(ExecSyncRequest) returns (ExecSyncResponse) {}
@@ -148,6 +150,16 @@ message PortMapping {
     string host_ip = 4;
 }
 
+enum MountPropagation {
+    // No mount propagation ("private" in Linux terminology).
+    PROPAGATION_PRIVATE = 0;
+    // Mounts get propagated from the host to the container ("rslave" in Linux).
+    PROPAGATION_HOST_TO_CONTAINER = 1;
+    // Mounts get propagated from the host to the container and from the
+    // container to the host ("rshared" in Linux).
+    PROPAGATION_BIDIRECTIONAL = 2;
+}
+
 // Mount specifies a host volume to mount into a container.
 message Mount {
     // Path of the mount within the container.
@@ -158,6 +170,8 @@ message Mount {
     bool readonly = 3;
     // If set, the mount needs SELinux relabeling.
     bool selinux_relabel = 4;
+    // Requested propagation mode.
+    MountPropagation propagation = 5;
 }
 
 // NamespaceOption provides options for Linux namespaces.
@@ -200,6 +214,13 @@ message LinuxSandboxSecurityContext {
     // This allows a sandbox to take additional security precautions if no
     // privileged containers are expected to be run.
     bool privileged = 6;
+    // Seccomp profile for the sandbox, candidate values are:
+    // * docker/default: the default profile for the docker container runtime
+    // * unconfined: unconfined profile, ie, no seccomp sandboxing
+    // * localhost/<full-path-to-profile>: the profile installed on the node.
+    //   <full-path-to-profile> is the full path of the profile.
+    // Default: "", which is identical with unconfined.
+    string seccomp_profile_path = 7;
 }
 
 // LinuxPodSandboxConfig holds platform-specific configurations for Linux
@@ -272,32 +293,12 @@ message PodSandboxConfig {
     //
     // In general, in order to preserve a well-defined interface between the
     // kubelet and the container runtime, annotations SHOULD NOT influence
-    // runtime behaviour. For legacy reasons, there are some annotations which
-    // currently explicitly break this rule, listed below; in future versions
-    // of the interface these will be promoted to typed features.
+    // runtime behaviour.
     //
     // Annotations can also be useful for runtime authors to experiment with
     // new features that are opaque to the Kubernetes APIs (both user-facing
     // and the CRI). Whenever possible, however, runtime authors SHOULD
     // consider proposing new typed fields for any new features instead.
-    //
-    // 1. Seccomp
-    //
-    //      key: security.alpha.kubernetes.io/seccomp/pod
-    //      description: the seccomp profile for the containers of an entire pod.
-    //      value: see below.
-    //
-    //      key: security.alpha.kubernetes.io/seccomp/container/<container name>
-    //      description: the seccomp profile for the container (overrides pod).
-    //      value: see below
-    //
-    //      The value of seccomp is runtime agnostic:
-    //      * runtime/default: the default profile for the container runtime
-    //      * unconfined: unconfined profile, ie, no seccomp sandboxing
-    //      * localhost/<profile-name>: the profile installed to the node's
-    //        local seccomp profile root. Note that profile root is set in
-    //        kubelet, and it is not passed in CRI yet, see https://issues.k8s.io/36997.
-    //
     map<string, string> annotations = 7;
     // Optional configurations specific to Linux hosts.
     LinuxPodSandboxConfig linux = 8;
@@ -459,6 +460,10 @@ message LinuxContainerResources {
     int64 memory_limit_in_bytes = 4;
     // OOMScoreAdj adjusts the oom-killer score. Default: 0 (not specified).
     int64 oom_score_adj = 5;
+    // CpusetCpus constrains the allowed set of logical CPUs. Default: "" (not specified).
+    string cpuset_cpus = 6;
+    // CpusetMems constrains the allowed set of memory nodes. Default: "" (not specified).
+    string cpuset_mems = 7;
 }
 
 // SELinuxOption are the labels to be applied to the container.
@@ -522,6 +527,16 @@ message LinuxContainerSecurityContext {
     //    (localhost) by name. The possible profile names are detailed at
     //    http://wiki.apparmor.net/index.php/AppArmor_Core_Policy_Reference
     string apparmor_profile = 9;
+    // Seccomp profile for the container, candidate values are:
+    // * docker/default: the default profile for the docker container runtime
+    // * unconfined: unconfined profile, ie, no seccomp sandboxing
+    // * localhost/<full-path-to-profile>: the profile installed on the node.
+    //   <full-path-to-profile> is the full path of the profile.
+    // Default: "", which is identical with unconfined.
+    string seccomp_profile_path = 10;
+    // no_new_privs defines if the flag for no_new_privs should be set on the
+    // container.
+    bool no_new_privs = 11;
 }
 
 // LinuxContainerConfig contains platform-specific configuration for
@@ -777,6 +792,15 @@ message ContainerStatusResponse {
     ContainerStatus status = 1;
 }
 
+message UpdateContainerResourcesRequest {
+    // ID of the container to update.
+    string container_id = 1;
+    // Resource configuration specific to Linux containers.
+    LinuxContainerResources linux = 2;
+}
+
+message UpdateContainerResourcesResponse {}
+
 message ExecSyncRequest {
     // ID of the container.
     string container_id = 1;
@@ -990,7 +1014,7 @@ message FilesystemUsage {
     // The underlying storage of the filesystem.
     StorageIdentifier storage_id = 2;
     // UsedBytes represents the bytes used for images on the filesystem.
-    // This may differ from the total bytes used on the filesystem and may not 
+    // This may differ from the total bytes used on the filesystem and may not
     // equal CapacityBytes - AvailableBytes.
     UInt64Value used_bytes = 3;
     // InodesUsed represents the inodes used by the images.

vendor/k8s.io/kubernetes/pkg/kubelet/apis/well_known_annotations.go

@@ -0,0 +1,25 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package apis
+
+const (
+	// When kubelet is started with the "external" cloud provider, then
+	// it sets this annotation on the node to denote an ip address set from the
+	// cmd line flag. This ip is verified with the cloudprovider as valid by
+	// the cloud-controller-manager
+	AnnotationProvidedIPAddr = "alpha.kubernetes.io/provided-node-ip"
+)

vendor/k8s.io/kubernetes/pkg/kubelet/apis/well_known_labels.go

@@ -0,0 +1,33 @@
+/*
+Copyright 2015 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package apis
+
+const (
+	LabelHostname           = "kubernetes.io/hostname"
+	LabelZoneFailureDomain  = "failure-domain.beta.kubernetes.io/zone"
+	LabelMultiZoneDelimiter = "__"
+	LabelZoneRegion         = "failure-domain.beta.kubernetes.io/region"
+
+	LabelInstanceType = "beta.kubernetes.io/instance-type"
+
+	LabelOS   = "beta.kubernetes.io/os"
+	LabelArch = "beta.kubernetes.io/arch"
+)
+
+// When the --failure-domains scheduler flag is not specified,
+// DefaultFailureDomains defines the set of label keys used when TopologyKey is empty in PreferredDuringScheduling anti-affinity.
+var DefaultFailureDomains string = LabelHostname + "," + LabelZoneFailureDomain + "," + LabelZoneRegion

vendor/k8s.io/kubernetes/pkg/kubelet/container/container_reference_manager.go

@@ -19,7 +19,7 @@ package container
 import (
 	"sync"
 
-	"k8s.io/kubernetes/pkg/api/v1"
+	"k8s.io/api/core/v1"
 )
 
 // RefManager manages the references for the containers.
@@ -38,7 +38,6 @@ func NewRefManager() *RefManager {
 }
 
 // SetRef stores a reference to a pod's container, associating it with the given container ID.
-// TODO: move this to client-go v1.ObjectReference
 func (c *RefManager) SetRef(id ContainerID, ref *v1.ObjectReference) {
 	c.Lock()
 	defer c.Unlock()
@@ -53,7 +52,6 @@ func (c *RefManager) ClearRef(id ContainerID) {
 }
 
 // GetRef returns the container reference of the given ID, or (nil, false) if none is stored.
-// TODO: move this to client-go v1.ObjectReference
 func (c *RefManager) GetRef(id ContainerID) (ref *v1.ObjectReference, ok bool) {
 	c.RLock()
 	defer c.RUnlock()

vendor/k8s.io/kubernetes/pkg/kubelet/container/helpers.go

@@ -26,14 +26,12 @@ import (
 
 	"github.com/golang/glog"
 
+	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
-	clientv1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/record"
-	"k8s.io/kubernetes/pkg/api/v1"
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
-	"k8s.io/kubernetes/pkg/kubelet/events"
 	"k8s.io/kubernetes/pkg/kubelet/util/format"
 	"k8s.io/kubernetes/pkg/kubelet/util/ioutils"
 	hashutil "k8s.io/kubernetes/pkg/util/hash"
@@ -176,19 +174,13 @@ type innerEventRecorder struct {
 	recorder record.EventRecorder
 }
 
-func (irecorder *innerEventRecorder) shouldRecordEvent(object runtime.Object) (*clientv1.ObjectReference, bool) {
+func (irecorder *innerEventRecorder) shouldRecordEvent(object runtime.Object) (*v1.ObjectReference, bool) {
 	if object == nil {
 		return nil, false
 	}
-	if ref, ok := object.(*clientv1.ObjectReference); ok {
-		if !strings.HasPrefix(ref.FieldPath, ImplicitContainerPrefix) {
-			return ref, true
-		}
-	}
-	// just in case we miss a spot, be sure that we still log something
 	if ref, ok := object.(*v1.ObjectReference); ok {
 		if !strings.HasPrefix(ref.FieldPath, ImplicitContainerPrefix) {
-			return events.ToObjectReference(ref), true
+			return ref, true
 		}
 	}
 	return nil, false

vendor/k8s.io/kubernetes/pkg/kubelet/container/ref.go

@@ -19,9 +19,9 @@ package container
 import (
 	"fmt"
 
+	"k8s.io/api/core/v1"
+	ref "k8s.io/client-go/tools/reference"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/api/v1/ref"
 )
 
 var ImplicitContainerPrefix string = "implicitly required container "

vendor/k8s.io/kubernetes/pkg/kubelet/container/runtime.go

@@ -25,10 +25,10 @@ import (
 	"time"
 
 	"github.com/golang/glog"
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/remotecommand"
 	"k8s.io/client-go/util/flowcontrol"
-	"k8s.io/kubernetes/pkg/api/v1"
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 	"k8s.io/kubernetes/pkg/volume"
 )
@@ -389,6 +389,8 @@ type Mount struct {
 	ReadOnly bool
 	// Whether the mount needs SELinux relabeling
 	SELinuxRelabel bool
+	// Requested propagation mode
+	Propagation runtimeapi.MountPropagation
 }
 
 type PortMapping struct {

vendor/k8s.io/kubernetes/pkg/kubelet/events/event.go

@@ -1,104 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package events
-
-import (
-	clientv1 "k8s.io/client-go/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/api/v1"
-)
-
-const (
-	// Container event reason list
-	CreatedContainer        = "Created"
-	StartedContainer        = "Started"
-	FailedToCreateContainer = "Failed"
-	FailedToStartContainer  = "Failed"
-	KillingContainer        = "Killing"
-	PreemptContainer        = "Preempting"
-	BackOffStartContainer   = "BackOff"
-	ExceededGracePeriod     = "ExceededGracePeriod"
-
-	// Image event reason list
-	PullingImage            = "Pulling"
-	PulledImage             = "Pulled"
-	FailedToPullImage       = "Failed"
-	FailedToInspectImage    = "InspectFailed"
-	ErrImageNeverPullPolicy = "ErrImageNeverPull"
-	BackOffPullImage        = "BackOff"
-
-	// kubelet event reason list
-	NodeReady                            = "NodeReady"
-	NodeNotReady                         = "NodeNotReady"
-	NodeSchedulable                      = "NodeSchedulable"
-	NodeNotSchedulable                   = "NodeNotSchedulable"
-	StartingKubelet                      = "Starting"
-	KubeletSetupFailed                   = "KubeletSetupFailed"
-	FailedAttachVolume                   = "FailedAttachVolume"
-	FailedDetachVolume                   = "FailedDetachVolume"
-	FailedMountVolume                    = "FailedMount"
-	FailedUnMountVolume                  = "FailedUnMount"
-	SuccessfulDetachVolume               = "SuccessfulDetachVolume"
-	SuccessfulMountVolume                = "SuccessfulMountVolume"
-	SuccessfulUnMountVolume              = "SuccessfulUnMountVolume"
-	HostPortConflict                     = "HostPortConflict"
-	NodeSelectorMismatching              = "NodeSelectorMismatching"
-	InsufficientFreeCPU                  = "InsufficientFreeCPU"
-	InsufficientFreeMemory               = "InsufficientFreeMemory"
-	OutOfDisk                            = "OutOfDisk"
-	HostNetworkNotSupported              = "HostNetworkNotSupported"
-	UndefinedShaper                      = "NilShaper"
-	NodeRebooted                         = "Rebooted"
-	ContainerGCFailed                    = "ContainerGCFailed"
-	ImageGCFailed                        = "ImageGCFailed"
-	FailedNodeAllocatableEnforcement     = "FailedNodeAllocatableEnforcement"
-	SuccessfulNodeAllocatableEnforcement = "NodeAllocatableEnforced"
-	UnsupportedMountOption               = "UnsupportedMountOption"
-
-	// Image manager event reason list
-	InvalidDiskCapacity = "InvalidDiskCapacity"
-	FreeDiskSpaceFailed = "FreeDiskSpaceFailed"
-
-	// Probe event reason list
-	ContainerUnhealthy = "Unhealthy"
-
-	// Pod worker event reason list
-	FailedSync = "FailedSync"
-
-	// Config event reason list
-	FailedValidation = "FailedValidation"
-
-	// Lifecycle hooks
-	FailedPostStartHook   = "FailedPostStartHook"
-	FailedPreStopHook     = "FailedPreStopHook"
-	UnfinishedPreStopHook = "UnfinishedPreStopHook"
-)
-
-// ToObjectReference takes an old style object reference and converts it to a client-go one
-func ToObjectReference(ref *v1.ObjectReference) *clientv1.ObjectReference {
-	if ref == nil {
-		return nil
-	}
-	return &clientv1.ObjectReference{
-		Kind:            ref.Kind,
-		Namespace:       ref.Namespace,
-		Name:            ref.Name,
-		UID:             ref.UID,
-		APIVersion:      ref.APIVersion,
-		ResourceVersion: ref.ResourceVersion,
-		FieldPath:       ref.FieldPath,
-	}
-}

vendor/k8s.io/kubernetes/pkg/kubelet/network/hostport/hostport.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/golang/glog"
 
-	"k8s.io/kubernetes/pkg/api/v1"
+	"k8s.io/api/core/v1"
 	utiliptables "k8s.io/kubernetes/pkg/util/iptables"
 )
 

vendor/k8s.io/kubernetes/pkg/kubelet/network/hostport/hostport_manager.go

@@ -27,8 +27,6 @@ import (
 	"github.com/golang/glog"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	iptablesproxy "k8s.io/kubernetes/pkg/proxy/iptables"
-	utildbus "k8s.io/kubernetes/pkg/util/dbus"
-	utilexec "k8s.io/kubernetes/pkg/util/exec"
 	utiliptables "k8s.io/kubernetes/pkg/util/iptables"
 )
 
@@ -51,11 +49,10 @@ type hostportManager struct {
 	mu          sync.Mutex
 }
 
-func NewHostportManager() HostPortManager {
-	iptInterface := utiliptables.New(utilexec.New(), utildbus.New(), utiliptables.ProtocolIpv4)
+func NewHostportManager(iptables utiliptables.Interface) HostPortManager {
 	return &hostportManager{
 		hostPortMap: make(map[hostport]closeable),
-		iptables:    iptInterface,
+		iptables:    iptables,
 		portOpener:  openLocalPort,
 	}
 }

vendor/k8s.io/kubernetes/pkg/kubelet/network/hostport/hostport_syncer.go

@@ -27,8 +27,6 @@ import (
 	"github.com/golang/glog"
 
 	iptablesproxy "k8s.io/kubernetes/pkg/proxy/iptables"
-	utildbus "k8s.io/kubernetes/pkg/util/dbus"
-	utilexec "k8s.io/kubernetes/pkg/util/exec"
 	utiliptables "k8s.io/kubernetes/pkg/util/iptables"
 )
 
@@ -49,11 +47,10 @@ type hostportSyncer struct {
 	portOpener  hostportOpener
 }
 
-func NewHostportSyncer() HostportSyncer {
-	iptInterface := utiliptables.New(utilexec.New(), utildbus.New(), utiliptables.ProtocolIpv4)
+func NewHostportSyncer(iptables utiliptables.Interface) HostportSyncer {
 	return &hostportSyncer{
 		hostPortMap: make(map[hostport]closeable),
-		iptables:    iptInterface,
+		iptables:    iptables,
 		portOpener:  openLocalPort,
 	}
 }

vendor/k8s.io/kubernetes/pkg/kubelet/server/portforward/websocket.go

@@ -158,7 +158,6 @@ type websocketStreamPair struct {
 // request over a websocket connection
 type websocketStreamHandler struct {
 	conn        *wsstream.Conn
-	ports       []int32
 	streamPairs []*websocketStreamPair
 	pod         string
 	uid         types.UID

vendor/k8s.io/kubernetes/pkg/kubelet/server/remotecommand/exec.go

@@ -28,7 +28,7 @@ import (
 	remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand"
 	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/tools/remotecommand"
-	utilexec "k8s.io/kubernetes/pkg/util/exec"
+	utilexec "k8s.io/utils/exec"
 )
 
 // Executor knows how to execute a command in a container in a pod.

vendor/k8s.io/kubernetes/pkg/kubelet/server/remotecommand/httpstream.go

@@ -423,7 +423,7 @@ func handleResizeEvents(stream io.Reader, channel chan<- remotecommand.TerminalS
 	}
 }
 
-func v1WriteStatusFunc(stream io.WriteCloser) func(status *apierrors.StatusError) error {
+func v1WriteStatusFunc(stream io.Writer) func(status *apierrors.StatusError) error {
 	return func(status *apierrors.StatusError) error {
 		if status.Status().Status == metav1.StatusSuccess {
 			return nil // send error messages
@@ -435,7 +435,7 @@ func v1WriteStatusFunc(stream io.WriteCloser) func(status *apierrors.StatusError
 
 // v4WriteStatusFunc returns a WriteStatusFunc that marshals a given api Status
 // as json in the error channel.
-func v4WriteStatusFunc(stream io.WriteCloser) func(status *apierrors.StatusError) error {
+func v4WriteStatusFunc(stream io.Writer) func(status *apierrors.StatusError) error {
 	return func(status *apierrors.StatusError) error {
 		bs, err := json.Marshal(status.Status())
 		if err != nil {

vendor/k8s.io/kubernetes/pkg/kubelet/server/streaming/server.go

@@ -101,7 +101,7 @@ var DefaultConfig = Config{
 	SupportedPortForwardProtocols:   portforward.SupportedProtocols,
 }
 
-// TODO(timstclair): Add auth(n/z) interface & handling.
+// TODO(tallclair): Add auth(n/z) interface & handling.
 func NewServer(config Config, runtime Runtime) (Server, error) {
 	s := &server{
 		config:  config,
@@ -141,6 +141,11 @@ func NewServer(config Config, runtime Runtime) (Server, error) {
 	handler := restful.NewContainer()
 	handler.Add(ws)
 	s.handler = handler
+	s.server = &http.Server{
+		Addr:      s.config.Addr,
+		Handler:   s.handler,
+		TLSConfig: s.config.TLSConfig,
+	}
 
 	return s, nil
 }
@@ -150,6 +155,7 @@ type server struct {
 	runtime *criAdapter
 	handler http.Handler
 	cache   *requestCache
+	server  *http.Server
 }
 
 func (s *server) GetExec(req *runtimeapi.ExecRequest) (*runtimeapi.ExecResponse, error) {
@@ -193,25 +199,19 @@ func (s *server) GetPortForward(req *runtimeapi.PortForwardRequest) (*runtimeapi
 
 func (s *server) Start(stayUp bool) error {
 	if !stayUp {
-		// TODO(timstclair): Implement this.
+		// TODO(tallclair): Implement this.
 		return errors.New("stayUp=false is not yet implemented")
 	}
 
-	server := &http.Server{
-		Addr:      s.config.Addr,
-		Handler:   s.handler,
-		TLSConfig: s.config.TLSConfig,
-	}
 	if s.config.TLSConfig != nil {
-		return server.ListenAndServeTLS("", "") // Use certs from TLSConfig.
+		return s.server.ListenAndServeTLS("", "") // Use certs from TLSConfig.
 	} else {
-		return server.ListenAndServe()
+		return s.server.ListenAndServe()
 	}
 }
 
 func (s *server) Stop() error {
-	// TODO(timstclair): Implement this.
-	return errors.New("not yet implemented")
+	return s.server.Close()
 }
 
 func (s *server) ServeHTTP(w http.ResponseWriter, r *http.Request) {

vendor/k8s.io/kubernetes/pkg/kubelet/types/constants.go

@@ -19,4 +19,9 @@ package types
 const (
 	// system default DNS resolver configuration
 	ResolvConfDefault = "/etc/resolv.conf"
+
+	// different container runtimes
+	DockerContainerRuntime = "docker"
+	RktContainerRuntime    = "rkt"
+	RemoteContainerRuntime = "remote"
 )

vendor/k8s.io/kubernetes/pkg/kubelet/types/pod_update.go

@@ -19,9 +19,9 @@ package types
 import (
 	"fmt"
 
+	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubeapi "k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/api/v1"
 )
 
 const (
@@ -141,11 +141,17 @@ func (sp SyncPodType) String() string {
 // key. Both the rescheduler and the kubelet use this key to make admission
 // and scheduling decisions.
 func IsCriticalPod(pod *v1.Pod) bool {
+	return IsCritical(pod.Namespace, pod.Annotations)
+}
+
+// IsCritical returns true if parameters bear the critical pod annotation
+// key. The DaemonSetController use this key directly to make scheduling decisions.
+func IsCritical(ns string, annotations map[string]string) bool {
 	// Critical pods are restricted to "kube-system" namespace as of now.
-	if pod.Namespace != kubeapi.NamespaceSystem {
+	if ns != kubeapi.NamespaceSystem {
 		return false
 	}
-	val, ok := pod.Annotations[CriticalPodAnnotationKey]
+	val, ok := annotations[CriticalPodAnnotationKey]
 	if ok && val == "" {
 		return true
 	}

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

@@ -20,7 +20,8 @@ import (
 	"net/http"
 	"time"
 
-	"k8s.io/kubernetes/pkg/api/v1"
+	"k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/types"
 )
 
 // TODO: Reconcile custom types in kubelet/types and this subpackage
@@ -91,3 +92,9 @@ type Reservation struct {
 	// Kubernetes represents resources reserved for kubernetes system components.
 	Kubernetes v1.ResourceList
 }
+
+// A pod UID which has been translated/resolved to the representation known to kubelets.
+type ResolvedPodUID types.UID
+
+// A pod UID for a mirror pod.
+type MirrorPodUID types.UID

vendor/k8s.io/kubernetes/pkg/kubelet/util/format/pod.go

@@ -21,8 +21,8 @@ import (
 	"strings"
 	"time"
 
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/kubernetes/pkg/api/v1"
 )
 
 type podHandler func(*v1.Pod) string

vendor/k8s.io/kubernetes/pkg/kubelet/util/format/resources.go

@@ -21,7 +21,7 @@ import (
 	"sort"
 	"strings"
 
-	"k8s.io/kubernetes/pkg/api/v1"
+	"k8s.io/api/core/v1"
 )
 
 // ResourceList returns a string representation of a resource list in a human readable format.