Skip to content

Commit

Permalink
Merge pull request kubernetes#49892 from mikedanese/rpms
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 49870, 49416, 49872, 49892, 49908)

kubeadm: make rpm use --bootstrap-kubeconfig

Missed this in kubernetes#49681
  • Loading branch information
Kubernetes Submit Queue authored Aug 2, 2017
2 parents 58e8c3e + a6fe42f commit 55d314a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build/rpms/10-kubeadm.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[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"
Expand Down

0 comments on commit 55d314a

Please sign in to comment.