diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index 8d055577812..f2908b1b2db 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -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)), ) diff --git a/build/rpms/BUILD b/build/rpms/BUILD index b9a6a9e26c0..8a5017212b0 100644 --- a/build/rpms/BUILD +++ b/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( diff --git a/build/rpms/cri-tools.spec b/build/rpms/cri-tools.spec index c82b8232cff..6a6f3f8f1a8 100644 --- a/build/rpms/cri-tools.spec +++ b/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.11.0-linux-amd64.tar.gz} %install install -m 755 -d %{buildroot}%{_bindir} diff --git a/build/workspace.bzl b/build/workspace.bzl index f2dd5ddee1e..d55d8c11cac 100644 --- a/build/workspace.bzl +++ b/build/workspace.bzl @@ -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"