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

Ignore non-migrated in-tree PVC when provisioning #345

Merged
merged 2 commits into from
Oct 1, 2019

Conversation

davidz627
Copy link
Contributor

Cherry-pick of: #341

/kind bug
/assign @jsafrane @msau42
/cc @ddebroy @leakingtapan

Fixes issue where provisioner provisions volumes for in-tree PVC's which have not been migrated

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. labels Sep 13, 2019
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 13, 2019
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 13, 2019
@msau42
Copy link
Collaborator

msau42 commented Sep 13, 2019

@pohly do you know why test-subtree is failing in travis but not prow?

I'm inclined to just disable travis PR on all our repos. prow unit job should have all the same functionality right?

@jsafrane
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 19, 2019
@jsafrane
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: davidz627, jsafrane

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 Sep 19, 2019
@davidz627
Copy link
Contributor Author

/retest

1 similar comment
@davidz627
Copy link
Contributor Author

/retest

@msau42
Copy link
Collaborator

msau42 commented Sep 20, 2019

I disabled travis PR testing, but we may have to manually merge this one

@pohly
Copy link
Contributor

pohly commented Sep 20, 2019

@pohly do you know why test-subtree is failing in travis but not prow?

That was fun to investigate. I couldn't reproduce it initially, even after compiling the same git version that TravisCI uses. But then the grafted comment in the git log output made me suspicious: that commit is a normal merge, not a graft commit. After cloning with --depth=50 I could reproduce the problem.

Shallow clones are problematic. For example, git describe --tags also can fail because the relevant tag is too far in the past and wasn't pulled.

We can:

  • disable PR testing with TravisCI (but then building the branch and thus pushing images may still fail?)
  • do full git clones in TravisCI (https://docs.travis-ci.com/user/customizing-the-build/#git-clone-depth)
  • replace --no-merges with --max-parents=1 --min-parents=1, which will then ignore both merge commits and this incomplete commit
  • add one more fake commit to the branch that gets merged when we hit the problem: I think it only triggers if a merge commit is exactly at depth=50 from the root.

The last option would be the fastest and doesn't depend on updating csi-release-tools.

@msau42
Copy link
Collaborator

msau42 commented Sep 20, 2019

Hmm having image tag build potentially fail is not great either. I'm going to re-enable travis and let's try the method to add one more commit to this pr?

@msau42
Copy link
Collaborator

msau42 commented Sep 20, 2019

Once we are able to migrate image releasing to prow, then we can disable travis altogether

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 30, 2019
@davidz627
Copy link
Contributor Author

@msau42 @jsafrane fixed travis with a dummy commit

@msau42
Copy link
Collaborator

msau42 commented Oct 1, 2019

/lgtm
I can't believe that worked

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 1, 2019
@k8s-ci-robot k8s-ci-robot merged commit f7be776 into kubernetes-csi:release-1.2 Oct 1, 2019
@davidz627 davidz627 deleted the 12 branch October 1, 2019 00:55
kbsonlong pushed a commit to kbsonlong/external-provisioner that referenced this pull request Dec 29, 2023
…te_OWNERS_files_-_remove_sections_about_emeritus_reviewers

Validate OWNERS files - remove sections about emeritus reviewers
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. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants