Merge pull request #1 from kubernetes-incubator/master

Follow upstream

roles/kubernetes-apps/registry/README.md

@@ -110,18 +110,18 @@ metadata:
   name: kube-registry-v0
   namespace: kube-system
   labels:
-    k8s-app: kube-registry-upstream
+    k8s-app: registry
     version: v0
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
-    k8s-app: kube-registry-upstream
+    k8s-app: registry
     version: v0
   template:
     metadata:
       labels:
-        k8s-app: kube-registry-upstream
+        k8s-app: registry
         version: v0
         kubernetes.io/cluster-service: "true"
     spec:
@@ -164,12 +164,12 @@ metadata:
   name: kube-registry
   namespace: kube-system
   labels:
-    k8s-app: kube-registry-upstream
+    k8s-app: registry
     kubernetes.io/cluster-service: "true"
     kubernetes.io/name: "KubeRegistry"
 spec:
   selector:
-    k8s-app: kube-registry-upstream
+    k8s-app: registry
   ports:
   - name: registry
     port: 5000
@@ -257,7 +257,7 @@ You can use `kubectl` to set up a port-forward from your local node to a
 running Pod:
 
 ``` console
-$ POD=$(kubectl get pods --namespace kube-system -l k8s-app=kube-registry-upstream \
+$ POD=$(kubectl get pods --namespace kube-system -l k8s-app=registry \
             -o template --template '{{range .items}}{{.metadata.name}} {{.status.phase}}{{"\n"}}{{end}}' \
             | grep Running | head -1 | cut -f1 -d' ')
 

roles/kubernetes/kubeadm/tasks/main.yml

@@ -64,7 +64,7 @@
   shell: >-
     {{ bin_dir }}/kubectl get configmap kube-proxy -n kube-system -o yaml
     | sed 's#server:.*#server:\ {{ kube_apiserver_endpoint }}#g'
-    | kubectl replace -f -
+    | {{ bin_dir }}/kubectl replace -f -
   delegate_to: "{{groups['kube-master']|first}}"
   run_once: true
   when: is_kube_master and kubeadm_discovery_address != kube_apiserver_endpoint
@@ -78,7 +78,7 @@
 # FIXME(mattymo): Reconcile kubelet kubeconfig filename for both deploy modes
 - name: Symlink kubelet kubeconfig for calico/canal
   file:
-    src: "{{ kube_config_dir }}//kubelet.conf"
+    src: "{{ kube_config_dir }}/kubelet.conf"
     dest: "{{ kube_config_dir }}/node-kubeconfig.yaml"
     state: link
     force: yes