Skip to content

Commit

Permalink
Update dependencies to use external-snapshotter v1.0.0-rc4
Browse files Browse the repository at this point in the history
This PR updates dependencies to use external-snapshotter v1.0.0-rc4.
It also updates the controller code to use the new ReadyToUse field
in VolumeSnapshot status.
  • Loading branch information
xing-yang committed Nov 29, 2018
1 parent 6daf92f commit bce61e0
Show file tree
Hide file tree
Showing 20 changed files with 497 additions and 146 deletions.
7 changes: 4 additions & 3 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

[[constraint]]
name = "github.com/kubernetes-csi/external-snapshotter"
version = "1.0.0-rc3"
version = "1.0.0-rc4"

[[constraint]]
name = "github.com/kubernetes-sigs/sig-storage-lib-external-provisioner"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ func (p *csiProvisioner) getVolumeContentSource(options controller.VolumeOptions
if err != nil {
return nil, fmt.Errorf("error getting snapshot %s from api server: %v", options.PVC.Spec.DataSource.Name, err)
}
if snapshotObj.Status.Ready == false {
if snapshotObj.Status.ReadyToUse == false {
return nil, fmt.Errorf("snapshot %s is not Ready", options.PVC.Spec.DataSource.Name)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,7 @@ func newSnapshot(name, className, boundToContent, snapshotUID, claimName string,
},
Status: crdv1.VolumeSnapshotStatus{
CreationTime: creationTime,
Ready: ready,
ReadyToUse: ready,
Error: err,
RestoreSize: size,
},
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit bce61e0

Please sign in to comment.