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.

Sign up for GitHub

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

Jump to bottom

merge csiv1.0 branch to master #297

Merged
merged 285 commits into from
Apr 3, 2019
Merged

merge csiv1.0 branch to master #297

merged 285 commits into from
Apr 3, 2019

Conversation

Madhu-1
Copy link
Collaborator

@Madhu-1 Madhu-1 commented Apr 2, 2019

No description provided.

mickymiek and others added 30 commits January 14, 2019 20:15
@rootfs
added vendors
3556130
@rootfs
modified cephfs deployment
d64dc3a
@rootfs
gofmt
32cb974
@rootfs
edit cephfs docs
c055b1d
@rootfs
remove useless comment
b387daa
@rootfs
add POD_NAMESPACE doc
ea2b1cd
@rootfs
make k8s_configmap default metadatastorage for k8s deployments
7d47bb0
@plnordquist @rootfs
Added docs for deploying rbd driver with Helm
7bc3df2 
Signed-off-by: Peter Nordquist <peter.nordquist@pnnl.gov>
@rootfs
fix rbac rules for configmaps
b23ee70
@rootfs
Merge branch 'master' into master-to-1.0
85b8415
@rootfs
reconcile merge
e46099a 
Signed-off-by: Huamin Chen <hchen@redhat.com>
@rootfs
upgrade go version
684f753 
Signed-off-by: Huamin Chen <hchen@redhat.com>
@rootfs
fix merge leftovers; use canary driver-registrar image, as v1.0.0 is …
aed7506 
…not hosted in quay.io

Signed-off-by: Huamin Chen <hchen@redhat.com>
@rootfs
Merge pull request ceph#123 from rootfs/master-to-1.0
661818b 
Merge master to csi-v1.0 branch
@Madhu-1
Vendor cleanup
0f836c6 
Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>
@Madhu-1
use dep ensure -vendor-only
8cae0b6 
Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>
@Madhu-1
update make clean
1552df6 
Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>
@Madhu-1
reject block volume creation in cephfs
9ddc265 
Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>
@Madhu-1
Fix golint issues
20af5af 
Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>
@Madhu-1
use Errorf is error formatting is required
17f5c0a 
Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>
@Madhu-1
user errors.New if error formatting is not required
e42e66f 
Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>
@rootfs
Merge pull request ceph#131 from Madhu-1/csi-v1.0-cleanup
1ac0757 
Csi v1.0 cleanup
@mkimuram @rootfs
Add block supports to rbd driver
165b82a
@mkimuram @rootfs
Change csi rbd to create/delete targetPath for publish/unpublish
5867d49
@mkimuram @rootfs
Fix pv deletion issue caused by not dettaching due to wrong mount count
ea75a9d
@mkimuram @rootfs
Move resolving bind mount logic from k8s
0e60dab
@rootfs
enable csi block; use canary external-provisioner image to pick up bl…
263c45b 
…ock volume provisioning

Signed-off-by: Huamin Chen <hchen@redhat.com>
@rootfs
add csi volume device mount path to csi plugin
48407e2 
Signed-off-by: Huamin Chen <hchen@redhat.com>
@rootfs
Merge pull request ceph#132 from rootfs/v1-block
af00847 
support block volume
@rootfs
allow ceph mon stored in secret so when mon changes, cephfs driver ca…
db463ed 
…n get latest mons and override old ones

Signed-off-by: Huamin Chen <hchen@redhat.com>
王怀宗 and others added 12 commits March 29, 2019 16:11
add cephfs driver **--mountcachedir** parameter document
dfdefe4
cephfs driver deploy support remount volume
1ccbb5b
mount info cache dir support multi cephfsdriver
f3e5f83
@Madhu-1
update travis.yml and deploy.sh
205be90 
update travis.yaml and deploy.sh
to build v0.3.0 images from csi-v0.3
branch instead of master.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
code style
6de862d
code style
1f1d5f4
@mergify
csi-provisioner rbac add resources nodes get, list, watch ceph#293
bb6754f
@mergify
rbd deploy csi-provisioner rbac add resources nodes get, list, watch
4228ceb 
ceph#293
@mergify
bump up the chart version
acdc759
@gman0
Merge pull request ceph#282 from huaizong/improve-remount-pv-path-whe…
d0d5da8 
…n-exit-v2

remount old mount point when csi plugin unexpect exit
@gman0
Merge pull request ceph#283 from Madhu-1/CI-for-v0.3
7b4bdd8 
update travis.yml and deploy.sh
@Madhu-1
Merge branch 'master' into csi-v1.0
a5d2abb
@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Apr 2, 2019

@rootfs @ShyamsundarR @gman0 @j-griffith @humblec PTAL,

This PR makes csiv1.0 branch as master with preserving git history from csiv1.0 branch

@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Apr 2, 2019

updates issue #266

@humblec
Copy link
Collaborator

humblec commented Apr 2, 2019

@Madhu-1 will be on this soon.

@ShyamsundarR
Copy link
Contributor

An clarification question, instead of the merge can we not delete and rename csi-v1.0 branch as the master? Or, do we intend to leave the csi-v1.0 branch as is and never delete that branch?

@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Apr 2, 2019

An clarification question, instead of the merge can we not delete and rename csi-v1.0 branch as the master? Or, do we intend to leave the csi-v1.0 branch as is and never delete that branch?

@ShyamsundarR I thought of doing only if I face any issue in merging csi-v1.0 into master and also I felt deleting a branch is kind of risky for me.

so the current plan is to merge the csi-v1.0 changes to the master and delete csi-v1.0 branch(make master as the default branch) any comments on this approach?

@humblec
Copy link
Collaborator

humblec commented Apr 2, 2019

One option would be, branchoff from current v1.0 branch and create v1.0-backup. Then delete and rename v1.0 as the master. Then rename v1.0-backup to v1.0. No PR Merges in between this process. I think that would be better than merging .

Any thoughts @gman0 @ShyamsundarR @j-griffith @Madhu-1 ?

@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Apr 2, 2019 •
edited
Loading

One option would be, branchoff from current v1.0 branch and create v1.0-backup. Then delete and rename v1.0 as the master. Then rename v1.0-backup to v1.0. No PR Merges in between this process. I think that would be better than merging .

Any thoughts @gman0 @ShyamsundarR @j-griffith @Madhu-1 ?

whats the intention of keeping v1.0 branch? are we going to merge PR to csiv1.0 branch and do a release from it?

if we come to an agreement soon enough so that we can have a master branch with v1.0.0.

@ShyamsundarR
Copy link
Contributor

Just checked a branch diff between this PR and csi-v1.0 branch it is clean. I would vote to not prolong this, by taking other alternatives (like delete/rename), as the bulk of the work is done. I cannot say if commits will bisect well or not (I think our merge strategy also defeats the bisection unless PR owners ensure their commits are bisect-able (individually work)).

I was more curious as to why this option/route was taken to ensure we have master caught up with the current 1.0 branch.

BUT, I do want to discuss what we do with csi-v1.0 branch post this merge, IMO,

  • We need to delete csi-v1.0 branch, till we are ready to make a 1.0 release from the master branch
  • Start releasing 'canary' images for every PR merge from master as 1.0 till we are ready branch and release 1.0

j-griffith
j-griffith approved these changes Apr 2, 2019
View reviewed changes
Copy link
Contributor

@j-griffith j-griffith left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work @Madhu-1

@humblec
Copy link
Collaborator

humblec commented Apr 2, 2019

lgtm.
@gman0 can you take a look at this PR and do the needful ? :)

This was referenced Apr 3, 2019
Merged
Merged
Closed
@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Apr 3, 2019

@gman0 @rootfs can we merge this one on top priority?

@mergify mergify bot merged commit 426bf67 into ceph:master Apr 3, 2019
wilmardo pushed a commit to wilmardo/ceph-csi that referenced this pull request Jul 29, 2019
@mergify
Merge pull request ceph#297 from Madhu-1/master
9745d7b 
merge csiv1.0 branch to master
Madhu-1 pushed a commit to Madhu-1/ceph-csi that referenced this pull request Jun 20, 2024
@openshift-merge-bot
Merge pull request ceph#297 from red-hat-storage/sync_us--devel
da063f1 
Syncing latest changes from upstream devel for ceph-csi
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rootfs rootfs rootfs approved these changes

@j-griffith j-griffith j-griffith approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.