Merge pull request #111 from LukeShu/lukeshu/fix-watch-err

Fix problems with Watcher (typo, Type="ERROR" events)

Author: ericchiang

watch.go

@@ -61,7 +61,17 @@ func (w *watcherJSON) Next(r Resource) (string, error) {
 		return "", fmt.Errorf("decode event: %v", err)
 	}
 	if event.Type == "" {
-		return "", errors.New("wwatch event had no type field")
+		return "", errors.New("watch event had no type field")
+	}
+	if event.Type == EventError {
+		status := &metav1.Status{}
+		if err := json.Unmarshal([]byte(event.Object), status); err != nil {
+			return "", fmt.Errorf("decoding event error: %v", err)
+		}
+		return event.Type, &APIError{
+			Status: status,
+			Code:   int(*status.Code),
+		}
 	}
 	if err := json.Unmarshal([]byte(event.Object), r); err != nil {
 		return "", fmt.Errorf("decode resource: %v", err)
@@ -85,6 +95,16 @@ func (w *watcherPB) Next(r Resource) (string, error) {
 	if event.Type == nil || *event.Type == "" {
 		return "", errors.New("watch event had no type field")
 	}
+	if *event.Type == EventError {
+		status := &metav1.Status{}
+		if err := proto.Unmarshal(unknown.Raw, status); err != nil {
+			return "", fmt.Errorf("decoding event error: %v", err)
+		}
+		return *event.Type, &APIError{
+			Status: status,
+			Code:   int(*status.Code),
+		}
+	}
 	if err := proto.Unmarshal(unknown.Raw, msg); err != nil {
 		return "", err
 	}