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

vendor check #259

Merged
merged 4 commits into from
Apr 3, 2019
Merged

vendor check #259

merged 4 commits into from
Apr 3, 2019

Conversation

pohly
Copy link
Contributor

@pohly pohly commented Mar 27, 2019

No description provided.

pohly and others added 4 commits March 6, 2019 17:23
If for whatever reasons a repo already had a `release-tools` directory
before doing a clean import of it with `git subtree`, the check used
to fail because it found those old commits.

This can be fixed by telling `git log` to stop when the directory
disappears from the repo. There has to be a commit with removes the
old content, because otherwise `git subtree add` doesn't work.

Fixes: kubernetes-csi/external-resizer#21
verify-subtree.sh: relax check and ignore old content
This runs "dep check" to verify that the vendor directory is
up-to-date and meets expectations (= done with dep >= 0.5.0).
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 27, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pohly

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 requested review from msau42 and saad-ali March 27, 2019 16:50
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 27, 2019
@pohly
Copy link
Contributor Author

pohly commented Mar 27, 2019

/hold this depends on kubernetes-csi/csi-release-tools#10 getting merged unchanged.

@pohly
Copy link
Contributor Author

pohly commented Mar 27, 2019

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 27, 2019
@pohly
Copy link
Contributor Author

pohly commented Mar 27, 2019

https://travis-ci.org/kubernetes-csi/external-provisioner/builds/512121380#L520:

### test-vendor:
# Gopkg.lock is out of sync:
github.com/container-storage-interface/spec/lib/go/csi: imported or required, but missing from Gopkg.lock's input-imports
github.com/golang/mock/gomock: imported or required, but missing from Gopkg.lock's input-imports
...
sigs.k8s.io/yaml: no digest in Gopkg.lock to compare against hash of vendored tree
make: *** [test-vendor] Error 1

It works. Vendoring in this repo is currently hosed and the check detects that. Obviously we can't merge until the repo is fixed.

@pohly
Copy link
Contributor Author

pohly commented Mar 27, 2019

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 27, 2019
@msau42
Copy link
Collaborator

msau42 commented Apr 3, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 3, 2019
@k8s-ci-robot k8s-ci-robot merged commit 5f88ece into kubernetes-csi:master Apr 3, 2019
TerryHowe added a commit to TerryHowe/external-provisioner that referenced this pull request Dec 9, 2024
98f23071d Merge pull request kubernetes-csi#260 from TerryHowe/update-csi-driver-version
e9d8712d0 Merge pull request kubernetes-csi#259 from stmcginnis/deprecated-kind-kube-root
faf79ff66 Remove --kube-root deprecated kind argument
734c2b950 Merge pull request kubernetes-csi#265 from Rakshith-R/consider-main-branch
f95c855be Merge pull request kubernetes-csi#262 from huww98/golang-toolchain
3c8d966fe Treat main branch as equivalent to master branch
e31de525b Merge pull request kubernetes-csi#261 from huww98/golang
fd153a9e2 Bump golang to 1.23.1
a8b3d0504 pull-test.sh: fix "git subtree pull" errors
6b05f0fcc use new GOTOOLCHAIN env to manage go version
18b6ac6d2 chore: update CSI driver version to 1.15

git-subtree-dir: release-tools
git-subtree-split: 98f23071d946dd3de3188a7e1f84679067003162
avorima added a commit to avorima/external-provisioner that referenced this pull request Dec 11, 2024
406a79acf Merge pull request kubernetes-csi#267 from huww98/gomodcache
9cec273d8 Set GOMODCACHE to avoid re-download toolchain
98f23071d Merge pull request kubernetes-csi#260 from TerryHowe/update-csi-driver-version
e9d8712d0 Merge pull request kubernetes-csi#259 from stmcginnis/deprecated-kind-kube-root
faf79ff66 Remove --kube-root deprecated kind argument
18b6ac6d2 chore: update CSI driver version to 1.15

git-subtree-dir: release-tools
git-subtree-split: 406a79acf021b5564108afebeea7d0ed44648d3f
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants