mirror of https://github.com/k3s-io/k3s
Bumps cri-tools version to GA in bazel build
Fixes kubernetes/kubeadm#903 The version in the spec file must be hardcoded because the `{filename}` syntax in the tar command is a substitutaion by bazel which happens before the spec file does its ownt %{} substitutions. Therefore, if we use %{version} bazel will not be able to find {crictl-v%{version}-...} in its list of files so no substituation will take place and the file will not be found. Signed-off-by: Chuck Ha <ha.chuck@gmail.com>pull/8/head
parent
ed95abe72f
commit
30181e542d
|
@ -61,7 +61,7 @@ http_file(
|
|||
|
||||
http_file(
|
||||
name = "cri_tools",
|
||||
sha256 = "bdc838174778223a1af4bdeaaed4bd266120c0e152588f78750fb86221677fb4",
|
||||
sha256 = "672cdc7670003949bb247fb2e3e0dccab74de0075fc283d6579e88a6c1ab3256",
|
||||
urls = mirror("https://github.com/kubernetes-incubator/cri-tools/releases/download/v%s/crictl-v%s-linux-amd64.tar.gz" % (CRI_TOOLS_VERSION, CRI_TOOLS_VERSION)),
|
||||
)
|
||||
|
||||
|
|
|
@ -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(
|
||||
|
|
|
@ -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.11.0-linux-amd64.tar.gz}
|
||||
|
||||
%install
|
||||
install -m 755 -d %{buildroot}%{_bindir}
|
||||
|
|
|
@ -12,4 +12,4 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
CRI_TOOLS_VERSION = "1.0.0-beta.1"
|
||||
CRI_TOOLS_VERSION = "1.11.0"
|
||||
|
|
Loading…
Reference in New Issue