Skip to content

Commit

Permalink
fix(vendor) : changing CRD name and updating maya packages accordingly (
Browse files Browse the repository at this point in the history
#10) (#13)

Signed-off-by: mayank <mayank.patel@cloudbyte.com>
  • Loading branch information
mynktl authored and vishnuitta committed May 16, 2019
1 parent 568c51d commit 0ff4e68
Show file tree
Hide file tree
Showing 8 changed files with 179 additions and 164 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,7 @@ ark restore create --from-backup sched-20190513104034 --restore-volumes=true

| Image | Codebase | Heptio Ark v0.10.0 |
| --------------- | ------------- | ---------------- |
| ark-plugin:0.9.0 | 0.9.0 ||
| ark-plugin:0.9.0-RC2 | v0.9.x ||
| ark-plugin:ci | master ||

Plugin images are available at quay.io and hub.docker.com.
10 changes: 5 additions & 5 deletions pkg/cstor/cstor.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ type Volume struct {
backupName string

//backupStatus is backup progress status for given volume
backupStatus v1alpha1.BackupCStorStatus
backupStatus v1alpha1.CStorBackupStatus

//restoreStatus is restore progress status for given volume
restoreStatus v1alpha1.CStorRestoreStatus
Expand Down Expand Up @@ -324,14 +324,14 @@ func (p *Plugin) CreateSnapshot(volumeID, volumeAZ string, tags map[string]strin
return "", errors.New("No bkpname")
}

bkpSpec := &v1alpha1.BackupCStorSpec{
bkpSpec := &v1alpha1.CStorBackupSpec{
BackupName: bname,
VolumeName: volumeID,
SnapName: bkpname,
BackupDest: p.cstorServerAddr,
}

bkp := &v1alpha1.BackupCStor{
bkp := &v1alpha1.CStorBackup{
ObjectMeta: metav1.ObjectMeta{
Namespace: vol.namespace,
},
Expand Down Expand Up @@ -630,7 +630,7 @@ func (p *Plugin) getVolumeFromPVC(pvc v1.PersistentVolumeClaim) (*Volume, error)

// checkBackupStatus queries MayaAPI server for given backup status
// and wait until backup completes
func (p *Plugin) checkBackupStatus(bkp *v1alpha1.BackupCStor) {
func (p *Plugin) checkBackupStatus(bkp *v1alpha1.CStorBackup) {
var bkpdone bool
url := p.mayaAddr + backupEndpoint
bkpvolume, exists := p.volumes[bkp.Spec.VolumeName]
Expand All @@ -648,7 +648,7 @@ func (p *Plugin) checkBackupStatus(bkp *v1alpha1.BackupCStor) {

for !bkpdone {
time.Sleep(backupStatusInterval * time.Second)
var bs v1alpha1.BackupCStor
var bs v1alpha1.CStorBackup

resp, err := p.httpRestCall(url, "GET", bkpData)
if err != nil {
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.

Loading

0 comments on commit 0ff4e68

Please sign in to comment.