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

Add support for attachment of inline volumes migrated to CSI #154

Merged
merged 2 commits into from
Jun 12, 2019
Merged

Add support for attachment of inline volumes migrated to CSI #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e29c74
Update vendor of k8s.io/api to 1.15 for volumeattachment API updates
ddebroy Jun 8, 2019
16260ee
Add support for attachment of inline volumes migrated to CSI
ddebroy Jun 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Gopkg.lock
View file
Open in desktop

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

21 changes: 2 additions & 19 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,11 @@
name = "github.com/json-iterator/go"
version = "1.1.4"

[[constraint]]
[[override]]
name = "k8s.io/api"
version = "kubernetes-1.14.0"

[[constraint]]
name = "k8s.io/csi-translation-lib"
version = "kubernetes-1.14.0"

[[constraint]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.14.0"

[[constraint]]
name = "k8s.io/client-go"
version = "kubernetes-1.14.0"

[[constraint]]
name = "github.com/kubernetes-csi/csi-lib-utils"
version = ">=0.6.1"
branch = "release-1.15"

[prune]
non-go = true
go-tests = true
unused-packages = true

87 changes: 56 additions & 31 deletions pkg/controller/csi_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package controller

import (
"context"
"errors"
"fmt"
"time"

Expand Down Expand Up @@ -256,26 +257,41 @@ func (h *csiHandler) csiAttach(va *storage.VolumeAttachment) (*storage.VolumeAtt
// Check as much as possible before adding VA finalizer - it would block
// deletion of VA on error.

if va.Spec.Source.PersistentVolumeName == nil {
return va, nil, fmt.Errorf("VolumeAttachment.spec.persistentVolumeName is empty")
}
var csiSource *v1.CSIPersistentVolumeSource
var pvSpec *v1.PersistentVolumeSpec
if va.Spec.Source.PersistentVolumeName != nil {
if va.Spec.Source.InlineVolumeSpec != nil {
return va, nil, errors.New("both InlineCSIVolumeSource and PersistentVolumeName specified in VA source")
}
pv, err := h.pvLister.Get(*va.Spec.Source.PersistentVolumeName)
if err != nil {
return va, nil, err
}
// Refuse to attach volumes that are marked for deletion.
if pv.DeletionTimestamp != nil {
return va, nil, fmt.Errorf("PersistentVolume %q is marked for deletion", pv.Name)
}
pv, err = h.addPVFinalizer(pv)
if err != nil {
return va, nil, fmt.Errorf("could not add PersistentVolume finalizer: %s", err)
}

pv, err := h.pvLister.Get(*va.Spec.Source.PersistentVolumeName)
if err != nil {
return va, nil, err
}
// Refuse to attach volumes that are marked for deletion.
if pv.DeletionTimestamp != nil {
return va, nil, fmt.Errorf("PersistentVolume %q is marked for deletion", pv.Name)
}
pv, err = h.addPVFinalizer(pv)
if err != nil {
return va, nil, fmt.Errorf("could not add PersistentVolume finalizer: %s", err)
}
csiSource, err = getCSISource(pv)
if err != nil {
return va, nil, err
}

csiSource, err := getCSISource(pv)
if err != nil {
return va, nil, err
pvSpec = &pv.Spec
} else if va.Spec.Source.InlineVolumeSpec != nil {
if va.Spec.Source.InlineVolumeSpec.CSI != nil {
csiSource = va.Spec.Source.InlineVolumeSpec.CSI
} else {
return va, nil, errors.New("inline volume spec contains nil CSI source")
}

pvSpec = va.Spec.Source.InlineVolumeSpec
} else {
return va, nil, errors.New("neither InlineCSIVolumeSource nor PersistentVolumeName specified in VA source")
}

attributes, err := GetVolumeAttributes(csiSource)
Expand All @@ -293,7 +309,7 @@ func (h *csiHandler) csiAttach(va *storage.VolumeAttachment) (*storage.VolumeAtt
readOnly = false
}

volumeCapabilities, err := GetVolumeCapabilities(pv, csiSource)
volumeCapabilities, err := GetVolumeCapabilities(pvSpec, csiSource)
if err != nil {
return va, nil, err
}
Expand Down Expand Up @@ -330,18 +346,27 @@ func (h *csiHandler) csiAttach(va *storage.VolumeAttachment) (*storage.VolumeAtt
}

func (h *csiHandler) csiDetach(va *storage.VolumeAttachment) (*storage.VolumeAttachment, error) {
if va.Spec.Source.PersistentVolumeName == nil {
return va, fmt.Errorf("VolumeAttachment.spec.persistentVolumeName is empty")
}

pv, err := h.pvLister.Get(*va.Spec.Source.PersistentVolumeName)
if err != nil {
return va, err
}

csiSource, err := getCSISource(pv)
if err != nil {
return va, err
var csiSource *v1.CSIPersistentVolumeSource
if va.Spec.Source.PersistentVolumeName != nil {
if va.Spec.Source.InlineVolumeSpec != nil {
return va, errors.New("both InlineCSIVolumeSource and PersistentVolumeName specified in VA source")
}
pv, err := h.pvLister.Get(*va.Spec.Source.PersistentVolumeName)
if err != nil {
return va, err
}
csiSource, err = getCSISource(pv)
if err != nil {
return va, err
}
} else if va.Spec.Source.InlineVolumeSpec != nil {
if va.Spec.Source.InlineVolumeSpec.CSI != nil {
csiSource = va.Spec.Source.InlineVolumeSpec.CSI
} else {
return va, errors.New("inline volume spec contains nil CSI source")
}
} else {
return va, errors.New("neither InlineCSIVolumeSource nor PersistentVolumeName specified in VA source")
}

volumeHandle, _, err := GetVolumeHandle(csiSource)
Expand Down
Loading