Merge pull request #63315 from ixdy/bazel-0.13-rpms

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix pkg_rpm rules for bazel 0.13+

**What this PR does / why we need it**: next step in addressing https://github.com/kubernetes/kubernetes/issues/63108; we can use the substitutions supported by bazel 0.13+ to get the `pkg_rpm` rules to work properly again.

I've also added a filegroup to allow building all of the RPMs easily with `bazel build //build/rpms`. Note that since these are manual, `bazel build //...` will still skip building them. 

**Release note**:

```release-note
NONE
```

/assign @BenTheElder 
cc @sigma
This commit is contained in:
Kubernetes Submit Queue 2018-05-04 12:32:47 -07:00 committed by GitHub
commit 01ebccb07a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 8 deletions

View File

@ -39,7 +39,7 @@ http_archive(
load("@bazel_skylib//:lib.bzl", "versions")
versions.check(minimum_bazel_version = "0.10.0")
versions.check(minimum_bazel_version = "0.13.0")
load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains", "go_download_sdk")
load("@io_bazel_rules_docker//docker:docker.bzl", "docker_repositories", "docker_pull")
@ -83,4 +83,5 @@ docker_pull(
)
load("//build:workspace_mirror.bzl", "export_urls")
export_urls("workspace_urls")

View File

@ -2,6 +2,18 @@ package(default_visibility = ["//visibility:public"])
load("@bazel_tools//tools/build_defs/pkg:rpm.bzl", "pkg_rpm")
filegroup(
name = "rpms",
srcs = [
":kubeadm",
":kubectl",
":kubelet",
":kubernetes-cni",
],
tags = ["manual"],
visibility = ["//visibility:public"],
)
pkg_rpm(
name = "kubectl",
architecture = "x86_64",

View File

@ -17,9 +17,9 @@ 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 -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 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

View File

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

View File

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

View File

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