Merge pull request kubernetes#285 from luxas/bump_kubeadm_v16

Secure the kubelet API for all versions, bump to using v1.6 for all packages

debian/build.go

@@ -342,10 +342,10 @@ func main() {
 			Distros: serverDistros,
 			Versions: []version{
 				{
-					Version:          "1.6.0-alpha.0.2074-a092d8e0f95f52",
+					Version:          getStableKubeVersion,
 					Revision:         "00",
 					Channel:          ChannelStable,
-					DownloadLinkBase: "https://dl.k8s.io/ci-cross/v1.6.0-alpha.0.2074+a092d8e0f95f52",
+					DownloadLinkBase: getReleaseDownloadLinkBase,
 				},
 				{
 					GetVersion:          getLatestKubeVersion,

debian/xenial/kubeadm/channel/nightly/etc/systemd/system/kubelet.service.d/10-kubeadm.conf

@@ -1 +1 @@
-../../../../../unstable/etc/systemd/system/kubelet.service.d/10-kubeadm.conf
+../../../../../stable/etc/systemd/system/kubelet.service.d/10-kubeadm.conf

debian/xenial/kubeadm/channel/stable/etc/systemd/system/kubelet.service.d/10-kubeadm.conf

@@ -3,5 +3,6 @@ Environment="KUBELET_KUBECONFIG_ARGS=--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"
+Environment="KUBELET_AUTHZ_ARGS=--authorization-mode=Webhook --client-ca-file=/etc/kubernetes/pki/ca.crt"
 ExecStart=
-ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_NETWORK_ARGS $KUBELET_DNS_ARGS $KUBELET_EXTRA_ARGS
+ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_NETWORK_ARGS $KUBELET_DNS_ARGS $KUBELET_AUTHZ_ARGS $KUBELET_EXTRA_ARGS

debian/xenial/kubeadm/channel/unstable/etc/systemd/system/kubelet.service.d/10-kubeadm.conf

@@ -0,0 +1 @@
+../../../../../stable/etc/systemd/system/kubelet.service.d/10-kubeadm.conf

debian/xenial/kubeadm/debian/control

@@ -10,6 +10,6 @@ Vcs-Browser: https://github.com/kubernetes/kubernetes
 
 Package: kubeadm
 Architecture: {{ .DebArch }}
-Depends: kubelet (>= 1.4.0), kubectl (>= 1.4.0), ${misc:Depends}
+Depends: kubelet (>= 1.6.0), kubectl (>= 1.6.0), ${misc:Depends}
 Description: Kubernetes Cluster Bootstrapping Tool
  The Kubernetes command line tool for bootstrapping a Kubernetes cluster.

debian/xenial/kubelet/debian/postinst

@@ -34,13 +34,6 @@ esac
 
 mkdir -p /etc/kubernetes/manifests
 
-arch=$(uname -m);
-# kubelet is linked against /lib/ld-linux.so.3. On some systems, this symlink has to be present
-# ${arch#*arm} != ${arch} will be true if the $arch string contains the word arm, i.e. if it is an arm device
-if [ "${arch#*arm}" != "${arch}" ] && [ ! -f /lib/ld-linux.so.3 ] && [ -f /lib/ld-linux-armhf.so.3 ]; then
-	ln -s /lib/ld-linux-armhf.so.3 /lib/ld-linux.so.3
-fi
-
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 

rpm/10-kubeadm.conf

@@ -3,9 +3,6 @@ Environment="KUBELET_KUBECONFIG_ARGS=--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"
+Environment="KUBELET_AUTHZ_ARGS=--authorization-mode=Webhook --client-ca-file=/etc/kubernetes/pki/ca.crt"
 ExecStart=
-ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_NETWORK_ARGS $KUBELET_DNS_ARGS $KUBELET_EXTRA_ARGS
-
-# TODO: Should add
-# Environment="KUBELET_AUTHZ_ARGS=--authorization-mode=Webhook --client-ca-file=/etc/kubernetes/pki/ca.crt"
-# in v1.6
+ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_NETWORK_ARGS $KUBELET_DNS_ARGS $KUBELET_AUTHZ_ARGS $KUBELET_EXTRA_ARGS

rpm/kubelet.spec

@@ -1,5 +1,4 @@
-%global KUBE_VERSION 1.5.4
-%global KUBEADM_VERSION 1.6.0-alpha.0.2074+a092d8e0f95f52
+%global KUBE_VERSION 1.6.0
 %global CNI_RELEASE 07a8a28637e97b22eb8dfe710eeae1344f69d16e
 %global RPM_RELEASE 0
 
@@ -13,7 +12,7 @@ URL: https://kubernetes.io
 Source0: https://dl.k8s.io/v%{KUBE_VERSION}/bin/linux/amd64/kubelet
 Source1: kubelet.service
 Source2: https://dl.k8s.io/v%{KUBE_VERSION}/bin/linux/amd64/kubectl
-Source3: https://dl.k8s.io/ci-cross/v%{KUBEADM_VERSION}/bin/linux/amd64/kubeadm
+Source3: https://dl.k8s.io/v%{KUBE_VERSION}/bin/linux/amd64/kubeadm
 Source4: 10-kubeadm.conf
 Source5: https://dl.k8s.io/network-plugins/cni-amd64-%{CNI_RELEASE}.tar.gz
 
@@ -52,11 +51,11 @@ Command-line utility for interacting with a Kubernetes cluster.
 
 %package -n kubeadm
 
-Version: 1.6.0
-Release: %{RPM_RELEASE}.alpha.0.2074.a092d8e0f95f52
-Summary: Command-line utility for administering a Kubernetes cluster. (ALPHA)
-Requires: kubelet >= 1.4.0
-Requires: kubectl >= 1.4.0
+Version: %{KUBE_VERSION}
+Release: %{RPM_RELEASE}
+Summary: Command-line utility for administering a Kubernetes cluster.
+Requires: kubelet >= 1.6.0
+Requires: kubectl >= 1.6.0
 Requires: kubernetes-cni
 
 %description -n kubeadm
@@ -121,6 +120,9 @@ mv bin/ %{buildroot}/opt/cni/
 
 
 %changelog
+* Wed Mar 15 2017 Lucas Käldström <lucas.kaldstrom@hotmail.co.uk> - 1.6.0
+- Bump version of kubelet, kubectl and kubeadm to v1.6.0.
+
 * Tue Dec 13 2016 Mike Danese <mikedanese@google.com> - 1.5.4
 - Bump version of kubelet and kubectl to v1.5.4.