Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
195 changes: 161 additions & 34 deletions Gopkg.lock

Large diffs are not rendered by default.

21 changes: 12 additions & 9 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,26 @@
name = "github.com/json-iterator/go"
version = "1.1.4"

# TODO: use [[constraint]] when kubernetes-csi/kubernetes-csi-migration-library uses 1.13 code
[[override]]
[[constraint]]
name = "k8s.io/api"
version = "kubernetes-1.13.0-beta.2"
version = "kubernetes-1.13.2"

[[override]]
[[constraint]]
name = "k8s.io/csi-translation-lib"
branch = "master"

[[constraint]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.13.0-beta.2"
version = "kubernetes-1.13.2"

[[override]]
[[constraint]]
name = "k8s.io/client-go"
version = "kubernetes-1.13.0-beta.2"
version = "kubernetes-1.13.2"


[[override]]
[[constraint]]
name = "k8s.io/csi-api"
version = "kubernetes-1.13.0-beta.2"
version = "kubernetes-1.13.2"

[[constraint]]
name = "github.com/kubernetes-csi/csi-lib-utils"
Expand Down
6 changes: 3 additions & 3 deletions pkg/controller/csi_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (

"github.com/kubernetes-csi/external-attacher/pkg/connection"

csiMigration "github.com/kubernetes-csi/kubernetes-csi-migration-library"
"k8s.io/api/core/v1"
storage "k8s.io/api/storage/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -36,6 +35,7 @@ import (
"k8s.io/client-go/util/workqueue"
csiclient "k8s.io/csi-api/pkg/client/clientset/versioned"
csilisters "k8s.io/csi-api/pkg/client/listers/csi/v1alpha1"
csitranslationlib "k8s.io/csi-translation-lib"
)

// csiHandler is a handler that calls CSI to attach/detach volume.
Expand Down Expand Up @@ -245,8 +245,8 @@ func getCSISource(pv *v1.PersistentVolume) (*v1.CSIPersistentVolumeSource, error
}
if pv.Spec.CSI != nil {
return pv.Spec.CSI, nil
} else if csiMigration.IsPVMigrated(pv) {
csiPV, err := csiMigration.TranslateInTreePVToCSI(pv)
} else if csitranslationlib.IsPVMigratable(pv) {
csiPV, err := csitranslationlib.TranslateInTreePVToCSI(pv)
if err != nil {
return nil, fmt.Errorf("failed to translate in tree pv to CSI: %v", err)
}
Expand Down
26 changes: 16 additions & 10 deletions vendor/k8s.io/client-go/rest/config.go

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

7 changes: 4 additions & 3 deletions vendor/k8s.io/client-go/tools/clientcmd/client_config.go

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

7 changes: 6 additions & 1 deletion vendor/k8s.io/client-go/transport/config.go

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

39 changes: 36 additions & 3 deletions vendor/k8s.io/client-go/transport/round_trippers.go

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