Merge pull request #49892 from mikedanese/rpms

Automatic merge from submit-queue (batch tested with PRs 49870, 49416, 49872, 49892, 49908) kubeadm: make rpm use --bootstrap-kubeconfig Missed this in https://github.com/kubernetes/kubernetes/pull/49681

Merge pull request #49892 from mikedanese/rpms
55d314a8 · Kubernetes Submit Queue · GitHub · 58e8c3e2 · a6fe42f7 · 55d314a8
Commit 55d314a8 authored Aug 01, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

10-kubeadm.conf build/rpms/10-kubeadm.conf +1 -1

No files found.
--- a/build/rpms/10-kubeadm.conf
+++ b/build/rpms/10-kubeadm.conf
 [Service]
-Environment="KUBELET_KUBECONFIG_ARGS=--kubeconfig=/etc/kubernetes/kubelet.conf"
+Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf"
 Environment="KUBELET_SYSTEM_PODS_ARGS=--pod-manifest-path=/etc/kubernetes/manifests --allow-privileged=true"
 Environment="KUBELET_NETWORK_ARGS=--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin"
 Environment="KUBELET_DNS_ARGS=--cluster-dns=10.96.0.10 --cluster-domain=cluster.local"