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

change crio-bin checksum since it changed upstream #10975

Merged
merged 1 commit into from
Apr 1, 2021

Conversation

sharifelgamal
Copy link
Collaborator

No description provided.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 1, 2021
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 1, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afbjorklund, sharifelgamal

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:
  • OWNERS [afbjorklund,sharifelgamal]

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

@afbjorklund
Copy link
Collaborator

Here is the diff between the old and the new tarball:

diff -ur cri-o-1.20.0.orig/vendor/k8s.io/client-go/pkg/version/base.go cri-o-1.20.0/vendor/k8s.io/client-go/pkg/version/base.go
--- cri-o-1.20.0.orig/vendor/k8s.io/client-go/pkg/version/base.go	2020-12-11 17:08:13.000000000 +0100
+++ cri-o-1.20.0/vendor/k8s.io/client-go/pkg/version/base.go	2020-12-11 17:08:13.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+d388528dbe"
+	gitVersion   string = "v0.0.0-master+d388528dbed"
 	gitCommit    string = "d388528dbed26b93c5bc1c89623607a1e597aa57" // sha1 from git, output of $(git rev-parse HEAD)
 	gitTreeState string = ""            // state of git tree, either "clean" or "dirty"
 
diff -ur cri-o-1.20.0.orig/vendor/k8s.io/component-base/version/base.go cri-o-1.20.0/vendor/k8s.io/component-base/version/base.go
--- cri-o-1.20.0.orig/vendor/k8s.io/component-base/version/base.go	2020-12-11 17:08:13.000000000 +0100
+++ cri-o-1.20.0/vendor/k8s.io/component-base/version/base.go	2020-12-11 17:08:13.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   = "v0.0.0-master+d388528dbe"
+	gitVersion   = "v0.0.0-master+d388528dbed"
 	gitCommit    = "d388528dbed26b93c5bc1c89623607a1e597aa57" // sha1 from git, output of $(git rev-parse HEAD)
 	gitTreeState = ""            // state of git tree, either "clean" or "dirty"
 

Note that the gitVersion and gitCommit is from the wrong repository.

@afbjorklund
Copy link
Collaborator

Same underlying issue as in containers/podman#9355, it is due to the .gitattributes files.

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.

None yet

3 participants