From a8da3cef0b3b1356a755baf17590be65b973fc58 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Apr 26 2018 06:57:00 +0000 Subject: - systemd dropin needs --bootstrap-kubeconfig resolves: #1542476 --- diff --git a/kubeadm.conf b/kubeadm.conf index 80b3e30..27e2144 100644 --- a/kubeadm.conf +++ b/kubeadm.conf @@ -1,5 +1,5 @@ [Service] -Environment="KUBELET_KUBECONFIG_ARGS=--kubeconfig=/etc/kubernetes/kubelet.conf --fail-swap-on=false" +Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf --fail-swap-on=false" 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=/usr/libexec/cni" Environment="KUBELET_DNS_ARGS=--cluster-dns=10.96.0.10 --cluster-domain=cluster.local" diff --git a/kubernetes.spec b/kubernetes.spec index f75412e..93967e0 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -45,7 +45,7 @@ ############################################## Name: kubernetes Version: %{kube_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Container cluster management License: ASL 2.0 URL: https://%{import_path} @@ -1142,6 +1142,10 @@ fi ############################################ %changelog +* Thu Apr 26 2018 Jan Chaloupka - 1.9.6-3 +- systemd dropin needs --bootstrap-kubeconfig + resolves: #1542476 + * Thu Apr 12 2018 Jan Chaloupka - 1.9.6-2 - Enable arm architecture resolves: #1566210