vendor update for CSI 0.3.0

vendor/k8s.io/kubernetes/build/rpms/10-kubeadm.conf

@@ -1,13 +1,11 @@
+# Note: This dropin only works with kubeadm and kubelet v1.11+
 [Service]
 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"
-Environment="KUBELET_AUTHZ_ARGS=--authorization-mode=Webhook --client-ca-file=/etc/kubernetes/pki/ca.crt"
-# Value should match Docker daemon settings.
-# Defaults are "cgroupfs" for Debian/Ubuntu/OpenSUSE and "systemd" for Fedora/CentOS/RHEL
-Environment="KUBELET_CGROUP_ARGS=--cgroup-driver=systemd"
-Environment="KUBELET_CADVISOR_ARGS=--cadvisor-port=0"
-Environment="KUBELET_CERTIFICATE_ARGS=--rotate-certificates=true"
+Environment="KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml"
+# This is a file that "kubeadm init" and "kubeadm join" generates at runtime, populating the KUBELET_KUBEADM_ARGS variable dynamically
+EnvironmentFile=-/var/lib/kubelet/kubeadm-flags.env
+# This is a file that the user can use for overrides of the kubelet args as a last resort. Preferably, the user should use
+# the .NodeRegistration.KubeletExtraArgs object in the configuration files instead. KUBELET_EXTRA_ARGS should be sourced from this file.
+EnvironmentFile=-/etc/sysconfig/kubelet
 ExecStart=
-ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_NETWORK_ARGS $KUBELET_DNS_ARGS $KUBELET_AUTHZ_ARGS $KUBELET_CGROUP_ARGS $KUBELET_CADVISOR_ARGS $KUBELET_CERTIFICATE_ARGS $KUBELET_EXTRA_ARGS
+ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_CONFIG_ARGS $KUBELET_KUBEADM_ARGS $KUBELET_EXTRA_ARGS

vendor/k8s.io/kubernetes/build/rpms/BUILD

@@ -1,6 +1,20 @@
 package(default_visibility = ["//visibility:public"])
 
 load("@bazel_tools//tools/build_defs/pkg:rpm.bzl", "pkg_rpm")
+load("//build:workspace.bzl", "CRI_TOOLS_VERSION")
+
+filegroup(
+    name = "rpms",
+    srcs = [
+        ":cri-tools",
+        ":kubeadm",
+        ":kubectl",
+        ":kubelet",
+        ":kubernetes-cni",
+    ],
+    tags = ["manual"],
+    visibility = ["//visibility:public"],
+)
 
 pkg_rpm(
     name = "kubectl",
@@ -10,6 +24,7 @@ pkg_rpm(
         "//cmd/kubectl",
     ],
     spec_file = "kubectl.spec",
+    tags = ["manual"],
     version_file = "//build:os_package_version",
 )
 
@@ -22,6 +37,7 @@ pkg_rpm(
         "//cmd/kubelet",
     ],
     spec_file = "kubelet.spec",
+    tags = ["manual"],
     version_file = "//build:os_package_version",
 )
 
@@ -31,9 +47,11 @@ pkg_rpm(
     changelog = "//:CHANGELOG.md",
     data = [
         "10-kubeadm.conf",
+        "kubelet.env",
         "//cmd/kubeadm",
     ],
     spec_file = "kubeadm.spec",
+    tags = ["manual"],
     version_file = "//build:os_package_version",
 )
 
@@ -45,9 +63,22 @@ pkg_rpm(
         "@kubernetes_cni//file",
     ],
     spec_file = "kubernetes-cni.spec",
+    tags = ["manual"],
     version_file = "//build:cni_package_version",
 )
 
+pkg_rpm(
+    name = "cri-tools",
+    architecture = "x86_64",
+    data = [
+        "@cri_tools//file",
+    ],
+    spec_file = "cri-tools.spec",
+    tags = ["manual"],
+    # dashes are not allowed in rpm versions
+    version = CRI_TOOLS_VERSION.replace("-", "_"),
+)
+
 filegroup(
     name = "package-srcs",
     srcs = glob(["**"]),

vendor/k8s.io/kubernetes/build/rpms/cri-tools.spec

@@ -0,0 +1,21 @@
+Name: cri-tools
+Version: OVERRIDE_THIS
+Release: 00
+License: ASL 2.0
+Summary: Container Runtime Interface tools
+
+URL: https://kubernetes.io
+
+%description
+Binaries to interface with the container runtime.
+
+%prep
+# TODO(chuckha): update this to use %{version} when the dash is removed from the release
+tar -xzf {crictl-v1.0.0-beta.1-linux-amd64.tar.gz}
+
+%install
+install -m 755 -d %{buildroot}%{_bindir}
+install -p -m 755 -t %{buildroot}%{_bindir} crictl
+
+%files
+%{_bindir}/crictl

vendor/k8s.io/kubernetes/build/rpms/kubeadm.spec

@@ -16,9 +16,12 @@ Command-line utility for deploying a Kubernetes cluster.
 install -m 755 -d %{buildroot}%{_bindir}
 install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/
 install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/
-install -p -m 755 -t %{buildroot}%{_bindir} kubeadm
-install -p -m 755 -t %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/ 10-kubeadm.conf
+install -m 755 -d %{buildroot}%{_sysconfdir}/sysconfig/
+install -p -m 755 -t %{buildroot}%{_bindir} {kubeadm}
+install -p -m 755 -t %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/ {10-kubeadm.conf}
+install -p -m 755 -T {kubelet.env} %{buildroot}%{_sysconfdir}/sysconfig/kubelet
 
 %files
 %{_bindir}/kubeadm
 %{_sysconfdir}/systemd/system/kubelet.service.d/10-kubeadm.conf
+%{_sysconfdir}/sysconfig/kubelet

vendor/k8s.io/kubernetes/build/rpms/kubectl.spec

@@ -12,7 +12,7 @@ Command-line utility for interacting with a Kubernetes cluster.
 %install
 
 install -m 755 -d %{buildroot}%{_bindir}
-install -p -m 755 -t %{buildroot}%{_bindir} kubectl
+install -p -m 755 -t %{buildroot}%{_bindir} {kubectl}
 
 %files
 %{_bindir}/kubectl

vendor/k8s.io/kubernetes/build/rpms/kubelet.env

@@ -0,0 +1 @@
+KUBELET_EXTRA_ARGS=

vendor/k8s.io/kubernetes/build/rpms/kubelet.spec

@@ -22,8 +22,8 @@ The node agent of Kubernetes, the container cluster manager.
 install -m 755 -d %{buildroot}%{_bindir}
 install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/
 install -m 755 -d %{buildroot}%{_sysconfdir}/kubernetes/manifests/
-install -p -m 755 -t %{buildroot}%{_bindir} kubelet
-install -p -m 755 -t %{buildroot}%{_sysconfdir}/systemd/system/ kubelet.service
+install -p -m 755 -t %{buildroot}%{_bindir} {kubelet}
+install -p -m 755 -t %{buildroot}%{_sysconfdir}/systemd/system/ {kubelet.service}
 
 %files
 %{_bindir}/kubelet

vendor/k8s.io/kubernetes/build/rpms/kubernetes-cni.spec

@@ -11,7 +11,7 @@ Binaries required to provision container networking.
 
 %prep
 mkdir -p ./bin
-tar -C ./bin -xz -f cni-plugins-amd64-v0.6.0.tgz
+tar -C ./bin -xz -f {cni-plugins-amd64-v0.6.0.tgz}
 
 %install