vendor updates

vendor/k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint/BUILD

@@ -13,12 +13,11 @@ go_test(
         "configmap_test.go",
         "download_test.go",
     ],
-    importpath = "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint",
-    library = ":go_default_library",
+    embed = [":go_default_library"],
     deps = [
         "//pkg/kubelet/apis/kubeletconfig:go_default_library",
         "//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library",
-        "//pkg/kubelet/apis/kubeletconfig/v1alpha1:go_default_library",
+        "//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library",
         "//pkg/kubelet/kubeletconfig/util/codec:go_default_library",
         "//pkg/kubelet/kubeletconfig/util/test:go_default_library",
         "//vendor/github.com/davecgh/go-spew/spew:go_default_library",

vendor/k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint/configmap.go

@@ -65,7 +65,6 @@ func (c *configMapCheckpoint) Parse() (*kubeletconfig.KubeletConfiguration, erro
 		return nil, fmt.Errorf(emptyCfgErr)
 	}
 
-	// TODO(mtaufen): Once the KubeletConfiguration type is decomposed, extend this to a key for each sub-object
 	config, ok := c.configMap.Data[configMapConfigKey]
 	if !ok {
 		return nil, fmt.Errorf("key %q not found in ConfigMap", configMapConfigKey)

vendor/k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint/configmap_test.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig"
 	kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme"
-	kubeletconfigv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1alpha1"
+	kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1"
 	utiltest "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/test"
 )
 
@@ -94,7 +94,7 @@ func TestConfigMapCheckpointParse(t *testing.T) {
 	}
 
 	// get the built-in default configuration
-	external := &kubeletconfigv1alpha1.KubeletConfiguration{}
+	external := &kubeletconfigv1beta1.KubeletConfiguration{}
 	kubeletScheme.Default(external)
 	defaultConfig := &kubeletconfig.KubeletConfiguration{}
 	err = kubeletScheme.Convert(external, defaultConfig, nil)
@@ -119,19 +119,19 @@ func TestConfigMapCheckpointParse(t *testing.T) {
 			"kubelet": "{*"}}, nil, "failed to decode"},
 		// invalid object
 		{"missing kind", &apiv1.ConfigMap{Data: map[string]string{
-			"kubelet": `{"apiVersion":"kubeletconfig/v1alpha1"}`}}, nil, "failed to decode"},
+			"kubelet": `{"apiVersion":"kubelet.config.k8s.io/v1beta1"}`}}, nil, "failed to decode"},
 		{"missing version", &apiv1.ConfigMap{Data: map[string]string{
 			"kubelet": `{"kind":"KubeletConfiguration"}`}}, nil, "failed to decode"},
 		{"unregistered kind", &apiv1.ConfigMap{Data: map[string]string{
-			"kubelet": `{"kind":"BogusKind","apiVersion":"kubeletconfig/v1alpha1"}`}}, nil, "failed to decode"},
+			"kubelet": `{"kind":"BogusKind","apiVersion":"kubelet.config.k8s.io/v1beta1"}`}}, nil, "failed to decode"},
 		{"unregistered version", &apiv1.ConfigMap{Data: map[string]string{
 			"kubelet": `{"kind":"KubeletConfiguration","apiVersion":"bogusversion"}`}}, nil, "failed to decode"},
 		// empty object with correct kind and version should result in the defaults for that kind and version
 		{"default from yaml", &apiv1.ConfigMap{Data: map[string]string{
 			"kubelet": `kind: KubeletConfiguration
-apiVersion: kubeletconfig/v1alpha1`}}, defaultConfig, ""},
+apiVersion: kubelet.config.k8s.io/v1beta1`}}, defaultConfig, ""},
 		{"default from json", &apiv1.ConfigMap{Data: map[string]string{
-			"kubelet": `{"kind":"KubeletConfiguration","apiVersion":"kubeletconfig/v1alpha1"}`}}, defaultConfig, ""},
+			"kubelet": `{"kind":"KubeletConfiguration","apiVersion":"kubelet.config.k8s.io/v1beta1"}`}}, defaultConfig, ""},
 	}
 	for _, c := range cases {
 		cpt := &configMapCheckpoint{kubeletCodecs, c.cm}

vendor/k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint/download.go

@@ -34,6 +34,8 @@ import (
 type RemoteConfigSource interface {
 	// UID returns the UID of the remote config source object
 	UID() string
+	// APIPath returns the API path to the remote resource, e.g. its SelfLink
+	APIPath() string
 	// Download downloads the remote config source object returns a Checkpoint backed by the object,
 	// or a sanitized failure reason and error if the download fails
 	Download(client clientset.Interface) (Checkpoint, string, error)
@@ -110,6 +112,13 @@ func (r *remoteConfigMap) UID() string {
 	return string(r.source.ConfigMapRef.UID)
 }
 
+const configMapAPIPathFmt = "/api/v1/namespaces/%s/configmaps/%s"
+
+func (r *remoteConfigMap) APIPath() string {
+	ref := r.source.ConfigMapRef
+	return fmt.Sprintf(configMapAPIPathFmt, ref.Namespace, ref.Name)
+}
+
 func (r *remoteConfigMap) Download(client clientset.Interface) (Checkpoint, string, error) {
 	var reason string
 	uid := string(r.source.ConfigMapRef.UID)
@@ -119,13 +128,13 @@ func (r *remoteConfigMap) Download(client clientset.Interface) (Checkpoint, stri
 	// get the ConfigMap via namespace/name, there doesn't seem to be a way to get it by UID
 	cm, err := client.CoreV1().ConfigMaps(r.source.ConfigMapRef.Namespace).Get(r.source.ConfigMapRef.Name, metav1.GetOptions{})
 	if err != nil {
-		reason = fmt.Sprintf(status.FailSyncReasonDownloadFmt, r.source.ConfigMapRef.Name, r.source.ConfigMapRef.Namespace)
+		reason = fmt.Sprintf(status.FailSyncReasonDownloadFmt, r.APIPath())
 		return nil, reason, fmt.Errorf("%s, error: %v", reason, err)
 	}
 
 	// ensure that UID matches the UID on the reference, the ObjectReference must be unambiguous
 	if r.source.ConfigMapRef.UID != cm.UID {
-		reason = fmt.Sprintf(status.FailSyncReasonUIDMismatchFmt, r.source.ConfigMapRef.UID, cm.UID)
+		reason = fmt.Sprintf(status.FailSyncReasonUIDMismatchFmt, r.source.ConfigMapRef.UID, r.APIPath(), cm.UID)
 		return nil, reason, fmt.Errorf(reason)
 	}
 

vendor/k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint/download_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package checkpoint
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
@@ -92,6 +93,20 @@ func TestRemoteConfigMapUID(t *testing.T) {
 	}
 }
 
+func TestRemoteConfigMapAPIPath(t *testing.T) {
+	name := "name"
+	namespace := "namespace"
+	cpt := &remoteConfigMap{
+		&apiv1.NodeConfigSource{ConfigMapRef: &apiv1.ObjectReference{Name: name, Namespace: namespace, UID: ""}},
+	}
+	expect := fmt.Sprintf(configMapAPIPathFmt, cpt.source.ConfigMapRef.Namespace, cpt.source.ConfigMapRef.Name)
+	// APIPath() method should return the correct path to the referenced resource
+	path := cpt.APIPath()
+	if expect != path {
+		t.Errorf("expect APIPath() to return %q, but got %q", expect, namespace)
+	}
+}
+
 func TestRemoteConfigMapDownload(t *testing.T) {
 	_, kubeletCodecs, err := kubeletscheme.NewSchemeAndCodecs()
 	if err != nil {
@@ -116,11 +131,11 @@ func TestRemoteConfigMapDownload(t *testing.T) {
 		// object doesn't exist
 		{"object doesn't exist",
 			&remoteConfigMap{&apiv1.NodeConfigSource{ConfigMapRef: &apiv1.ObjectReference{Name: "bogus", Namespace: "namespace", UID: "bogus"}}},
-			nil, "failed to download ConfigMap"},
+			nil, "not found"},
 		// UID of downloaded object doesn't match UID of referent found via namespace/name
 		{"UID is incorrect for namespace/name",
 			&remoteConfigMap{&apiv1.NodeConfigSource{ConfigMapRef: &apiv1.ObjectReference{Name: "name", Namespace: "namespace", UID: "bogus"}}},
-			nil, "does not match UID"},
+			nil, "does not match"},
 		// successful download
 		{"object exists and reference is correct",
 			&remoteConfigMap{&apiv1.NodeConfigSource{ConfigMapRef: &apiv1.ObjectReference{Name: "name", Namespace: "namespace", UID: "uid"}}},

vendor/k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint/store/BUILD

@@ -12,8 +12,7 @@ go_test(
         "fsstore_test.go",
         "store_test.go",
     ],
-    importpath = "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint/store",
-    library = ":go_default_library",
+    embed = [":go_default_library"],
     deps = [
         "//pkg/kubelet/kubeletconfig/checkpoint:go_default_library",
         "//pkg/kubelet/kubeletconfig/util/files:go_default_library",