vendor update for CSI 0.3.0

vendor/k8s.io/kubernetes/pkg/kubelet/kubeletconfig/watch.go

@@ -21,13 +21,13 @@ import (
 	"time"
 
 	apiv1 "k8s.io/api/core/v1"
+	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	kuberuntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/cache"
-	utilequal "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/equal"
 	utillog "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/log"
 )
 
@@ -86,6 +86,7 @@ func (cc *Controller) onUpdateNodeEvent(oldObj interface{}, newObj interface{})
 	}
 	if oldObj == nil {
 		// Node was just added, need to sync
+		utillog.Infof("initial Node watch event")
 		cc.pokeConfigSourceWorker()
 		return
 	}
@@ -94,32 +95,60 @@ func (cc *Controller) onUpdateNodeEvent(oldObj interface{}, newObj interface{})
 		utillog.Errorf("failed to cast old object to Node, couldn't handle event")
 		return
 	}
-	if !utilequal.ConfigSourceEq(oldNode.Spec.ConfigSource, newNode.Spec.ConfigSource) {
+	if !apiequality.Semantic.DeepEqual(oldNode.Spec.ConfigSource, newNode.Spec.ConfigSource) {
+		utillog.Infof("Node.Spec.ConfigSource was updated")
 		cc.pokeConfigSourceWorker()
 	}
 }
 
-// onDeleteNodeEvent logs a message if the Node was deleted and may log errors
-// if an unexpected DeletedFinalStateUnknown was received.
+// onDeleteNodeEvent logs a message if the Node was deleted
 // We allow the sync-loop to continue, because it is possible that the Kubelet detected
 // a Node with unexpected externalID and is attempting to delete and re-create the Node
 // (see pkg/kubelet/kubelet_node_status.go), or that someone accidentally deleted the Node
 // (the Kubelet will re-create it).
 func (cc *Controller) onDeleteNodeEvent(deletedObj interface{}) {
-	node, ok := deletedObj.(*apiv1.Node)
+	// For this case, we just log the event.
+	// We don't want to poke the worker, because a temporary deletion isn't worth reporting an error for.
+	// If the Node is deleted because the VM is being deleted, then the Kubelet has nothing to do.
+	utillog.Infof("Node was deleted")
+}
+
+// onAddRemoteConfigSourceEvent calls onUpdateConfigMapEvent with the new object and a nil old object
+func (cc *Controller) onAddRemoteConfigSourceEvent(newObj interface{}) {
+	cc.onUpdateRemoteConfigSourceEvent(nil, newObj)
+}
+
+// onUpdateRemoteConfigSourceEvent checks whether the configSource changed between oldObj and newObj,
+// and pokes the sync worker if there was a change
+func (cc *Controller) onUpdateRemoteConfigSourceEvent(oldObj interface{}, newObj interface{}) {
+	// since ConfigMap is currently the only source type, we handle that here
+	newConfigMap, ok := newObj.(*apiv1.ConfigMap)
 	if !ok {
-		tombstone, ok := deletedObj.(cache.DeletedFinalStateUnknown)
-		if !ok {
-			utillog.Errorf("couldn't cast deleted object to DeletedFinalStateUnknown, object: %+v", deletedObj)
-			return
-		}
-		node, ok = tombstone.Obj.(*apiv1.Node)
-		if !ok {
-			utillog.Errorf("received DeletedFinalStateUnknown object but it did not contain a Node, object: %+v", deletedObj)
-			return
-		}
-		utillog.Infof("Node was deleted (DeletedFinalStateUnknown), sync-loop will continue because the Kubelet might recreate the Node, node: %+v", node)
+		utillog.Errorf("failed to cast new object to ConfigMap, couldn't handle event")
 		return
 	}
-	utillog.Infof("Node was deleted, sync-loop will continue because the Kubelet might recreate the Node, node: %+v", node)
+	if oldObj == nil {
+		// ConfigMap was just added, need to sync
+		utillog.Infof("initial ConfigMap watch event")
+		cc.pokeConfigSourceWorker()
+		return
+	}
+	oldConfigMap, ok := oldObj.(*apiv1.ConfigMap)
+	if !ok {
+		utillog.Errorf("failed to cast old object to ConfigMap, couldn't handle event")
+		return
+	}
+	if !apiequality.Semantic.DeepEqual(oldConfigMap, newConfigMap) {
+		utillog.Infof("assigned ConfigMap was updated")
+		cc.pokeConfigSourceWorker()
+	}
+}
+
+// onDeleteRemoteConfigSourceEvent logs a message if the ConfigMap was deleted and pokes the sync worker
+func (cc *Controller) onDeleteRemoteConfigSourceEvent(deletedObj interface{}) {
+	// If the ConfigMap we're watching is deleted, we log the event and poke the sync worker.
+	// This requires a sync, because if the Node is still configured to use the deleted ConfigMap,
+	// the Kubelet should report a DownloadError.
+	utillog.Infof("assigned ConfigMap was deleted")
+	cc.pokeConfigSourceWorker()
 }