Merge pull request #26638 from mikedanese/death_to_podmaster

remove podmaster from high availability example configs

docs/admin/high-availability/kube-controller-manager.yaml

@@ -9,7 +9,7 @@ spec:
     - -c
     - /usr/local/bin/kube-controller-manager --master=127.0.0.1:8080 --cluster-name=e2e-test-bburns
       --cluster-cidr=10.245.0.0/16 --allocate-node-cidrs=true --cloud-provider=gce  --service-account-private-key-file=/srv/kubernetes/server.key
-      --v=2 1>>/var/log/kube-controller-manager.log 2>&1
+      --v=2 1>>/var/log/kube-controller-manager.log --leader-elect 2>&1
     image: gcr.io/google_containers/kube-controller-manager:fda24638d51a48baa13c35337fcd4793
     livenessProbe:
       httpGet:

docs/admin/high-availability/kube-scheduler.yaml

@@ -10,7 +10,7 @@ spec:
     command:
     - /bin/sh
     - -c
-    - /usr/local/bin/kube-scheduler --master=127.0.0.1:8080 --v=2 1>>/var/log/kube-scheduler.log
+    - /usr/local/bin/kube-scheduler --master=127.0.0.1:8080 --v=2 --leader-elect 1>>/var/log/kube-scheduler.log
       2>&1
     livenessProbe:
       httpGet:

docs/admin/high-availability/podmaster.yaml

@@ -1,43 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: scheduler-master
-spec:
-  hostNetwork: true
-  containers:
-  - name: scheduler-elector
-    image: gcr.io/google_containers/podmaster:1.1
-    command:
-    - /podmaster
-    - --etcd-servers=http://127.0.0.1:4001
-    - --key=scheduler
-    - --source-file=/kubernetes/kube-scheduler.manifest
-    - --dest-file=/manifests/kube-scheduler.manifest
-    volumeMounts:
-    - mountPath: /kubernetes
-      name: k8s
-      readOnly: true
-    - mountPath: /manifests
-      name: manifests
-  - name: controller-manager-elector
-    image: gcr.io/google_containers/podmaster:1.1
-    command:
-    - /podmaster
-    - --etcd-servers=http://127.0.0.1:4001
-    - --key=controller
-    - --source-file=/kubernetes/kube-controller-manager.manifest
-    - --dest-file=/manifests/kube-controller-manager.manifest
-    terminationMessagePath: /dev/termination-log
-    volumeMounts:
-    - mountPath: /kubernetes
-      name: k8s
-      readOnly: true
-    - mountPath: /manifests
-      name: manifests
-  volumes:
-  - hostPath:
-      path: /srv/kubernetes
-    name: k8s
-  - hostPath:
-      path: /etc/kubernetes/manifests
-    name: manifests