merge csiv1.0 branch to master #297

Madhu-1 · 2019-04-02T08:28:12Z

No description provided.

Signed-off-by: Peter Nordquist <peter.nordquist@pnnl.gov>

Signed-off-by: Huamin Chen <hchen@redhat.com>

…not hosted in quay.io Signed-off-by: Huamin Chen <hchen@redhat.com>

Merge master to csi-v1.0 branch

Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>

Csi v1.0 cleanup

…ock volume provisioning Signed-off-by: Huamin Chen <hchen@redhat.com>

Signed-off-by: Huamin Chen <hchen@redhat.com>

support block volume

…n get latest mons and override old ones Signed-off-by: Huamin Chen <hchen@redhat.com>

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>

ceph#293

…n-exit-v2 remount old mount point when csi plugin unexpect exit

update travis.yml and deploy.sh

Madhu-1 · 2019-04-02T08:30:39Z

@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 · 2019-04-02T08:32:45Z

updates issue #266

humblec · 2019-04-02T09:05:58Z

@Madhu-1 will be on this soon.

ShyamsundarR · 2019-04-02T10:24:11Z

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 · 2019-04-02T10:33:11Z

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 · 2019-04-02T11:46:14Z

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 · 2019-04-02T11:52:39Z

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 · 2019-04-02T11:58:44Z

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

Nice work @Madhu-1

humblec · 2019-04-02T14:09:05Z

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

Madhu-1 · 2019-04-03T14:26:18Z

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

merge csiv1.0 branch to master

Syncing latest changes from upstream devel for ceph-csi

mickymiek and others added 30 commits January 14, 2019 20:15

added vendors

3556130

modified cephfs deployment

d64dc3a

gofmt

32cb974

edit cephfs docs

c055b1d

remove useless comment

b387daa

add POD_NAMESPACE doc

ea2b1cd

make k8s_configmap default metadatastorage for k8s deployments

7d47bb0

Added docs for deploying rbd driver with Helm

7bc3df2

Signed-off-by: Peter Nordquist <peter.nordquist@pnnl.gov>

fix rbac rules for configmaps

b23ee70

Merge branch 'master' into master-to-1.0

85b8415

reconcile merge

e46099a

Signed-off-by: Huamin Chen <hchen@redhat.com>

upgrade go version

684f753

Signed-off-by: Huamin Chen <hchen@redhat.com>

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>

Merge pull request ceph#123 from rootfs/master-to-1.0

661818b

Merge master to csi-v1.0 branch

Vendor cleanup

0f836c6

Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>

use dep ensure -vendor-only

8cae0b6

Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>

update make clean

1552df6

Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>

reject block volume creation in cephfs

9ddc265

Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>

Fix golint issues

20af5af

Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>

use Errorf is error formatting is required

17f5c0a

Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>

user errors.New if error formatting is not required

e42e66f

Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>

Merge pull request ceph#131 from Madhu-1/csi-v1.0-cleanup

1ac0757

Csi v1.0 cleanup

Add block supports to rbd driver

165b82a

Change csi rbd to create/delete targetPath for publish/unpublish

5867d49

Fix pv deletion issue caused by not dettaching due to wrong mount count

ea75a9d

Move resolving bind mount logic from k8s

0e60dab

enable csi block; use canary external-provisioner image to pick up bl…

263c45b

…ock volume provisioning Signed-off-by: Huamin Chen <hchen@redhat.com>

add csi volume device mount path to csi plugin

48407e2

Signed-off-by: Huamin Chen <hchen@redhat.com>

Merge pull request ceph#132 from rootfs/v1-block

af00847

support block volume

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

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

csi-provisioner rbac add resources nodes get, list, watch ceph#293

bb6754f

rbd deploy csi-provisioner rbac add resources nodes get, list, watch

4228ceb

ceph#293

bump up the chart version

acdc759

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

Merge pull request ceph#283 from Madhu-1/CI-for-v0.3

7b4bdd8

update travis.yml and deploy.sh

Merge branch 'master' into csi-v1.0

a5d2abb

j-griffith approved these changes Apr 2, 2019

View reviewed changes

This was referenced Apr 3, 2019

update vendor to latest kubernetes 1.14.0 #299

Merged

Replaces the references to Kubernetes Authors in the copyright #300

Merged

Add support matrix of features supported of Ceph CSI version #298

Closed

rootfs approved these changes Apr 3, 2019

View reviewed changes

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

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

Merge pull request ceph#297 from red-hat-storage/sync_us--devel

da063f1

Syncing latest changes from upstream devel for ceph-csi

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge csiv1.0 branch to master #297

merge csiv1.0 branch to master #297

Madhu-1 commented Apr 2, 2019

Madhu-1 commented Apr 2, 2019

Madhu-1 commented Apr 2, 2019

humblec commented Apr 2, 2019

ShyamsundarR commented Apr 2, 2019

Madhu-1 commented Apr 2, 2019

humblec commented Apr 2, 2019

Madhu-1 commented Apr 2, 2019 •

edited

Loading

ShyamsundarR commented Apr 2, 2019

j-griffith left a comment

humblec commented Apr 2, 2019

Madhu-1 commented Apr 3, 2019

merge csiv1.0 branch to master #297

merge csiv1.0 branch to master #297

Conversation

Madhu-1 commented Apr 2, 2019

Madhu-1 commented Apr 2, 2019

Madhu-1 commented Apr 2, 2019

humblec commented Apr 2, 2019

ShyamsundarR commented Apr 2, 2019

Madhu-1 commented Apr 2, 2019

humblec commented Apr 2, 2019

Madhu-1 commented Apr 2, 2019 • edited Loading

ShyamsundarR commented Apr 2, 2019

j-griffith left a comment

Choose a reason for hiding this comment

humblec commented Apr 2, 2019

Madhu-1 commented Apr 3, 2019

Madhu-1 commented Apr 2, 2019 •

edited

Loading