Merge pull request #65230 from chuckha/critools

Automatic merge from submit-queue (batch tested with PRs 65230, 57355, 59174, 63698, 63659). 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>. Bumps cri-tools version to GA in bazel build Fixes kubernetes/kubeadm#903 Signed-off-by: Chuck Ha <ha.chuck@gmail.com> **What this PR does / why we need it**: This PR bumps cri-tools version to appropriate version for k8s 1.11 **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes kubernetes/kubeadm#903 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #65230 from chuckha/critools
f3a153f2 · Kubernetes Submit Queue · GitHub · 24117bb0 · 30181e54 · f3a153f2
Unverified Commit f3a153f2 authored Jun 19, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

WORKSPACE build/root/WORKSPACE +1 -1

BUILD build/rpms/BUILD +1 -2

cri-tools.spec build/rpms/cri-tools.spec +2 -2

workspace.bzl build/workspace.bzl +1 -1

No files found.
--- 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)),
 )


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

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

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