github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #66152 from Random-Liu/update-crictl

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 66152, 66406, 66218, 66278, 65660). 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>.

Update crictl to v1.11.1.

Update `crictl` to v1.11.1 to fix several bugs. Release note: https://github.com/kubernetes-incubator/cri-tools/releases/tag/v1.11.1

@kubernetes/sig-node-pr-reviews @kubernetes/sig-cluster-lifecycle-pr-reviews 
@kubernetes/sig-gcp-pr-reviews 
Signed-off-by: Lantao Liu <lantaol@google.com>

```release-note
Update crictl to v1.11.1.
```
This commit is contained in:
Kubernetes Submit Queue 2018-07-20 12:12:09 -07:00 committed by GitHub
commit 25df60bf6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/root/WORKSPACE
View File

@ -61,7 +61,7 @@ http_file(
http_file(
name = "cri_tools",
sha256 = "672cdc7670003949bb247fb2e3e0dccab74de0075fc283d6579e88a6c1ab3256",
sha256 = "ccf83574556793ceb01717dc91c66b70f183c60c2bbec70283939aae8fdef768",
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)),
)

2
build/rpms/cri-tools.spec
View File

@ -11,7 +11,7 @@ Binaries to interface with the container runtime.
%prep
# 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}
tar -xzf {crictl-v1.11.1-linux-amd64.tar.gz}
%install
install -m 755 -d %{buildroot}%{_bindir}

2
build/workspace.bzl
View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
CRI_TOOLS_VERSION = "1.11.0"
CRI_TOOLS_VERSION = "1.11.1"

4
cluster/gce/gci/configure.sh
View File

@ -28,8 +28,8 @@ DEFAULT_CNI_VERSION="v0.6.0"
DEFAULT_CNI_SHA1="d595d3ded6499a64e8dac02466e2f5f2ce257c9f"
DEFAULT_NPD_VERSION="v0.5.0"
DEFAULT_NPD_SHA1="650ecfb2ae495175ee43706d0bd862a1ea7f1395"
DEFAULT_CRICTL_VERSION="v1.11.0"
DEFAULT_CRICTL_SHA1="8f5142b985d314cdebb51afd55054d5ec00c442a"
DEFAULT_CRICTL_VERSION="v1.11.1"
DEFAULT_CRICTL_SHA1="527fca5a0ecef6a8e6433e2af9cf83f63aff5694"
DEFAULT_MOUNTER_TAR_SHA="8003b798cf33c7f91320cd6ee5cec4fa22244571"
###