github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #49892 from mikedanese/rpms

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2017-08-01 19:53:04 -07:00 committed by GitHub
commit 55d314a84e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/rpms/10-kubeadm.conf
View File

@ -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"