Merge pull request kubernetes-sigs#11 from roberthbailey/clusterctl-crds

Minor fixes to make clusterctl work with CRDs.

Author: Phillip Wittrock

cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go

@@ -407,7 +407,7 @@ func (c *client) UpdateClusterObjectEndpoint(masterIP, clusterName, namespace st
 			Host: masterIP,
 			Port: apiServerPort,
 		})
-	_, err = c.clientSet.ClusterV1alpha1().Clusters(namespace).UpdateStatus(cluster)
+	_, err = c.clientSet.ClusterV1alpha1().Clusters(namespace).Update(cluster)
 	return err
 }
 

config/default/manager_image_patch.yaml

@@ -7,6 +7,5 @@ spec:
   template:
     spec:
       containers:
-      # Change the value of image field below to your controller image URL
-      - image: IMAGE_URL
+      - image: gcr.io/k8s-cluster-api/cluster-api-controller:latest
         name: manager

config/manager/manager.yaml

@@ -40,6 +40,17 @@ spec:
         control-plane: controller-manager
         controller-tools.k8s.io: "1.0"
     spec:
+      tolerations:
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/master
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoExecute
+        key: node.alpha.kubernetes.io/notReady
+        operator: Exists
+      - effect: NoExecute
+        key: node.alpha.kubernetes.io/unreachable
+        operator: Exists
       containers:
       - command:
         - /root/manager