vendor updates

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

@@ -18,13 +18,14 @@ go_library(
     ],
     importpath = "k8s.io/kubernetes/pkg/kubelet/lifecycle",
     deps = [
+        "//pkg/apis/core/v1/helper:go_default_library",
         "//pkg/kubelet/container:go_default_library",
         "//pkg/kubelet/types:go_default_library",
         "//pkg/kubelet/util/format:go_default_library",
+        "//pkg/scheduler/algorithm:go_default_library",
+        "//pkg/scheduler/algorithm/predicates:go_default_library",
+        "//pkg/scheduler/schedulercache:go_default_library",
         "//pkg/security/apparmor:go_default_library",
-        "//plugin/pkg/scheduler/algorithm:go_default_library",
-        "//plugin/pkg/scheduler/algorithm/predicates:go_default_library",
-        "//plugin/pkg/scheduler/schedulercache:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
@@ -34,13 +35,17 @@ go_library(
 
 go_test(
     name = "go_default_test",
-    srcs = ["handlers_test.go"],
-    importpath = "k8s.io/kubernetes/pkg/kubelet/lifecycle",
-    library = ":go_default_library",
+    srcs = [
+        "handlers_test.go",
+        "predicate_test.go",
+    ],
+    embed = [":go_default_library"],
     deps = [
         "//pkg/kubelet/container:go_default_library",
         "//pkg/kubelet/util/format:go_default_library",
+        "//pkg/scheduler/schedulercache:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
     ],
 )

vendor/k8s.io/kubernetes/pkg/kubelet/lifecycle/admission_failure_handler_stub.go

@@ -18,7 +18,7 @@ package lifecycle
 
 import (
 	"k8s.io/api/core/v1"
-	"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
+	"k8s.io/kubernetes/pkg/scheduler/algorithm"
 )
 
 // AdmissionFailureHandlerStub is an AdmissionFailureHandler that does not perform any handling of admission failure.

vendor/k8s.io/kubernetes/pkg/kubelet/lifecycle/predicate.go

@@ -20,11 +20,13 @@ import (
 	"fmt"
 
 	"github.com/golang/glog"
+
 	"k8s.io/api/core/v1"
+	v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
 	"k8s.io/kubernetes/pkg/kubelet/util/format"
-	"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
-	"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates"
-	"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
+	"k8s.io/kubernetes/pkg/scheduler/algorithm"
+	"k8s.io/kubernetes/pkg/scheduler/algorithm/predicates"
+	"k8s.io/kubernetes/pkg/scheduler/schedulercache"
 )
 
 type getNodeAnyWayFuncType func() (*v1.Node, error)
@@ -77,7 +79,18 @@ func (w *predicateAdmitHandler) Admit(attrs *PodAdmitAttributes) PodAdmitResult
 			Message: message,
 		}
 	}
-	fit, reasons, err := predicates.GeneralPredicates(pod, nil, nodeInfo)
+
+	// Remove the requests of the extended resources that are missing in the
+	// node info. This is required to support cluster-level resources, which
+	// are extended resources unknown to nodes.
+	//
+	// Caveat: If a pod was manually bound to a node (e.g., static pod) where a
+	// node-level extended resource it requires is not found, then kubelet will
+	// not fail admission while it should. This issue will be addressed with
+	// the Resource Class API in the future.
+	podWithoutMissingExtendedResources := removeMissingExtendedResources(pod, nodeInfo)
+
+	fit, reasons, err := predicates.GeneralPredicates(podWithoutMissingExtendedResources, nil, nodeInfo)
 	if err != nil {
 		message := fmt.Sprintf("GeneralPredicates failed due to %v, which is unexpected.", err)
 		glog.Warningf("Failed to admit pod %v - %s", format.Pod(pod), message)
@@ -141,3 +154,22 @@ func (w *predicateAdmitHandler) Admit(attrs *PodAdmitAttributes) PodAdmitResult
 		Admit: true,
 	}
 }
+
+func removeMissingExtendedResources(pod *v1.Pod, nodeInfo *schedulercache.NodeInfo) *v1.Pod {
+	podCopy := pod.DeepCopy()
+	for i, c := range pod.Spec.Containers {
+		// We only handle requests in Requests but not Limits because the
+		// PodFitsResources predicate, to which the result pod will be passed,
+		// does not use Limits.
+		podCopy.Spec.Containers[i].Resources.Requests = make(v1.ResourceList)
+		for rName, rQuant := range c.Resources.Requests {
+			if v1helper.IsExtendedResourceName(rName) {
+				if _, found := nodeInfo.AllocatableResource().ScalarResources[rName]; !found {
+					continue
+				}
+			}
+			podCopy.Spec.Containers[i].Resources.Requests[rName] = rQuant
+		}
+	}
+	return podCopy
+}

vendor/k8s.io/kubernetes/pkg/kubelet/lifecycle/predicate_test.go

@@ -0,0 +1,114 @@
+/*
+Copyright 2018 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 lifecycle
+
+import (
+	"reflect"
+	"testing"
+
+	"k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	"k8s.io/kubernetes/pkg/scheduler/schedulercache"
+)
+
+var (
+	quantity              = *resource.NewQuantity(1, resource.DecimalSI)
+	extendedResourceName1 = "example.com/er1"
+	extendedResourceName2 = "example.com/er2"
+)
+
+func TestRemoveMissingExtendedResources(t *testing.T) {
+	for _, test := range []struct {
+		desc string
+		pod  *v1.Pod
+		node *v1.Node
+
+		expectedPod *v1.Pod
+	}{
+		{
+			desc: "requests in Limits should be ignored",
+			pod: makeTestPod(
+				v1.ResourceList{},                        // Requests
+				v1.ResourceList{"foo.com/bar": quantity}, // Limits
+			),
+			node: makeTestNode(
+				v1.ResourceList{"foo.com/baz": quantity}, // Allocatable
+			),
+			expectedPod: makeTestPod(
+				v1.ResourceList{},                        // Requests
+				v1.ResourceList{"foo.com/bar": quantity}, // Limits
+			),
+		},
+		{
+			desc: "requests for resources available in node should not be removed",
+			pod: makeTestPod(
+				v1.ResourceList{"foo.com/bar": quantity}, // Requests
+				v1.ResourceList{},                        // Limits
+			),
+			node: makeTestNode(
+				v1.ResourceList{"foo.com/bar": quantity}, // Allocatable
+			),
+			expectedPod: makeTestPod(
+				v1.ResourceList{"foo.com/bar": quantity}, // Requests
+				v1.ResourceList{}),                       // Limits
+		},
+		{
+			desc: "requests for resources unavailable in node should be removed",
+			pod: makeTestPod(
+				v1.ResourceList{"foo.com/bar": quantity}, // Requests
+				v1.ResourceList{},                        // Limits
+			),
+			node: makeTestNode(
+				v1.ResourceList{"foo.com/baz": quantity}, // Allocatable
+			),
+			expectedPod: makeTestPod(
+				v1.ResourceList{}, // Requests
+				v1.ResourceList{}, // Limits
+			),
+		},
+	} {
+		nodeInfo := schedulercache.NewNodeInfo()
+		nodeInfo.SetNode(test.node)
+		pod := removeMissingExtendedResources(test.pod, nodeInfo)
+		if !reflect.DeepEqual(pod, test.expectedPod) {
+			t.Errorf("%s: Expected pod\n%v\ngot\n%v\n", test.desc, test.expectedPod, pod)
+		}
+	}
+}
+
+func makeTestPod(requests, limits v1.ResourceList) *v1.Pod {
+	return &v1.Pod{
+		Spec: v1.PodSpec{
+			Containers: []v1.Container{
+				{
+					Resources: v1.ResourceRequirements{
+						Requests: requests,
+						Limits:   limits,
+					},
+				},
+			},
+		},
+	}
+}
+
+func makeTestNode(allocatable v1.ResourceList) *v1.Node {
+	return &v1.Node{
+		Status: v1.NodeStatus{
+			Allocatable: allocatable,
+		},
+	}
+}