Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update containerd hash #13933

Merged
merged 1 commit into from
Apr 10, 2022
Merged

Conversation

afbjorklund
Copy link
Collaborator

@afbjorklund afbjorklund commented Apr 10, 2022

Workaround for Issue #13193

Broke the build in PR #13814

diff -ur containerd-1.5.11.orig/vendor/k8s.io/client-go/pkg/version/base.go containerd-1.5.11/vendor/k8s.io/client-go/pkg/version/base.go
--- containerd-1.5.11.orig/vendor/k8s.io/client-go/pkg/version/base.go	2022-03-24 01:09:42.000000000 +0100
+++ containerd-1.5.11/vendor/k8s.io/client-go/pkg/version/base.go	2022-03-24 01:09:42.000000000 +0100
@@ -55,7 +55,7 @@
 	// NOTE: The $Format strings are replaced during 'git archive' thanks to the
 	// companion .gitattributes file containing 'export-subst' in this same
 	// directory.  See also https://git-scm.com/docs/gitattributes
-	gitVersion   string = "v0.0.0-master+3df54a8523"
+	gitVersion   string = "v0.0.0-master+3df54a85234"
 	gitCommit    string = "3df54a852345ae127d1fa3092b95168e4a88e2f8" // sha1 from git, output of $(git rev-parse HEAD)
 	gitTreeState string = ""            // state of git tree, either "clean" or "dirty"
 

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 10, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afbjorklund

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 10, 2022
@afbjorklund afbjorklund merged commit 6350ab5 into kubernetes:master Apr 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants