Fresh dep ensure

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

@@ -0,0 +1,2 @@
+# The file is provided as part of the kubeadm package
+net.ipv4.ip_forward = 1

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

@@ -75,8 +75,7 @@ pkg_rpm(
     ],
     spec_file = "cri-tools.spec",
     tags = ["manual"],
-    # dashes are not allowed in rpm versions
-    version = CRI_TOOLS_VERSION.replace("-", "_"),
+    version = CRI_TOOLS_VERSION,
 )
 
 filegroup(

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

@@ -0,0 +1,13 @@
+reviewers:
+  - luxas
+  - jbeda
+  - mikedanese
+  - pipejakob
+  - chuckha
+  - timothysc
+approvers:
+  - luxas
+  - jbeda
+  - mikedanese
+  - pipejakob
+  - timothysc

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

@@ -10,8 +10,8 @@ URL: https://kubernetes.io
 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}
+# This has to be hard coded because bazel does a path substitution before rpm's %{version} is substituted.
+tar -xzf {crictl-v1.12.0-linux-amd64.tar.gz}
 
 %install
 install -m 755 -d %{buildroot}%{_bindir}

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

@@ -0,0 +1,2 @@
+# Load br_netfilter module at boot
+br_netfilter

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

@@ -6,6 +6,7 @@ Summary: Container Cluster Manager - Kubernetes Cluster Bootstrapping Tool
 Requires: kubelet >= 1.8.0
 Requires: kubectl >= 1.8.0
 Requires: kubernetes-cni >= 0.5.1
+Requires: cri-tools >= 1.11.0
 
 URL: https://kubernetes.io
 
@@ -18,10 +19,17 @@ install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/
 install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/
 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
+install -p -m 644 -t %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/ {10-kubeadm.conf}
+install -p -m 644 -T {kubelet.env} %{buildroot}%{_sysconfdir}/sysconfig/kubelet
+mkdir -p %{buildroot}%{_libexecdir}/modules-load.d
+mkdir -p %{buildroot}%{_sysctldir}
+install -p -m 0644 -t %{buildroot}%{_libexecdir}/modules-load.d/ {kubeadm.conf}
+install -p -m 0644 -t %{buildroot}%{_sysctldir} %{50-kubeadm.conf}
 
 %files
 %{_bindir}/kubeadm
 %{_sysconfdir}/systemd/system/kubelet.service.d/10-kubeadm.conf
 %{_sysconfdir}/sysconfig/kubelet
+%dir %{_libexecdir}/modules-load.d
+%{_libexecdir}/modules-load.d/kubeadm.conf
+%{_sysctldir}/50-kubeadm.conf

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

@@ -23,9 +23,9 @@ 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 644 -t %{buildroot}%{_sysconfdir}/systemd/system/ {kubelet.service}
 
 %files
 %{_bindir}/kubelet
-%{_sysconfdir}/systemd/system/kubelet.service
+%attr(644,-,-) %{_sysconfdir}/systemd/system/kubelet.service
 %{_sysconfdir}/kubernetes/manifests/