Skip to content
This repository has been archived by the owner on Jun 23, 2020. It is now read-only.

Commit

Permalink
Move volume provisioner to oci-go-sdk v1.0.0 (#71)
Browse files Browse the repository at this point in the history
* Move volume provisioner to oci-go-sdk v1.0.0
* Remove file system storage ref
  • Loading branch information
garthy authored and owainlewis committed Mar 23, 2018
1 parent 2da2a6b commit b60b87c
Show file tree
Hide file tree
Showing 655 changed files with 23,944 additions and 36,197 deletions.
11 changes: 6 additions & 5 deletions Gopkg.lock

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

3 changes: 2 additions & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@
name = "k8s.io/kubernetes"

[[constraint]]
branch = "master"
version = "v1.0.0"
name = "github.com/oracle/oci-go-sdk"

2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ The OCI Volume Provisioner enables [dynamic provisioning][1] of storage resource
It uses the [OCI Flexvolume Driver][2] to bind storage resources to Kubernetes nodes. The volume provisioner offers support for

* [Block Volumes][5]
* [File Storage][6]

## Prerequisites

Expand Down Expand Up @@ -167,4 +166,3 @@ See [LICENSE](LICENSE) for more details.
[3]: https://kubernetes.io/docs/admin/authorization/rbac/
[4]: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims
[5]: https://docs.us-phoenix-1.oraclecloud.com/Content/Block/Concepts/overview.htm
[6]: https://docs.us-phoenix-1.oraclecloud.com/Content/File/Concepts/filestorageoverview.htm
17 changes: 0 additions & 17 deletions pkg/oci/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (

"github.com/oracle/oci-go-sdk/common"
"github.com/oracle/oci-go-sdk/core"
"github.com/oracle/oci-go-sdk/ffsw"
"github.com/oracle/oci-go-sdk/identity"
"github.com/oracle/oci-volume-provisioner/pkg/oci/instancemeta"
)
Expand All @@ -41,7 +40,6 @@ type provisionerClient struct {
cfg *Config
blockStorage *core.BlockstorageClient
identity *identity.IdentityClient
ffswClient *ffsw.FileStorageClient
context context.Context
timeout time.Duration
metadata *instancemeta.InstanceMetadata
Expand All @@ -51,7 +49,6 @@ type provisionerClient struct {
type ProvisionerClient interface {
BlockStorage() *core.BlockstorageClient
Identity() *identity.IdentityClient
FileStorage() *ffsw.FileStorageClient
Context() context.Context
Timeout() time.Duration
CompartmentOCID() string
Expand All @@ -66,10 +63,6 @@ func (p *provisionerClient) Identity() *identity.IdentityClient {
return p.identity
}

func (p *provisionerClient) FileStorage() *ffsw.FileStorageClient {
return p.ffswClient
}

func (p *provisionerClient) Context() context.Context {
return p.context
}
Expand Down Expand Up @@ -117,15 +110,6 @@ func FromConfig(cfg *Config) (ProvisionerClient, error) {
return nil, err
}

ffsw, err := ffsw.NewFileStorageClientWithConfigurationProvider(config)
if err != nil {
return nil, err
}
err = configureCustomTransport(&ffsw.BaseClient)
if err != nil {
return nil, err
}

metadata, err := instancemeta.New().Get()
if err != nil {
glog.Fatalf("Unable to retrieve instance metadata: %v", err)
Expand All @@ -136,7 +120,6 @@ func FromConfig(cfg *Config) (ProvisionerClient, error) {
cfg: cfg,
blockStorage: &blockStorage,
identity: &identity,
ffswClient: &ffsw,
timeout: 3 * time.Minute,
context: context.Background(),
metadata: metadata,
Expand Down
2 changes: 0 additions & 2 deletions pkg/provisioner/core/provisioner.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (

"github.com/oracle/oci-volume-provisioner/pkg/oci/client"
"github.com/oracle/oci-volume-provisioner/pkg/provisioner/block"
"github.com/oracle/oci-volume-provisioner/pkg/provisioner/filestorage"
"github.com/oracle/oci-volume-provisioner/pkg/provisioner/plugin"
)

Expand Down Expand Up @@ -82,7 +81,6 @@ func NewOCIProvisioner(kubeClient kubernetes.Interface, nodeInformer informersv1
storageClassProvisioners: map[string]plugin.ProvisionerPlugin{
"oci": blockProvisioner,
"oci-ext3": blockProvisioner,
"ffsw": filestorage.NewFilesystemProvisioner(client),
},
}
}
Expand Down
114 changes: 0 additions & 114 deletions pkg/provisioner/filestorage/filestorage.go

This file was deleted.

15 changes: 15 additions & 0 deletions vendor/github.com/oracle/oci-go-sdk/CHANGELOG.md

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

4 changes: 2 additions & 2 deletions vendor/github.com/oracle/oci-go-sdk/CONTRIBUTING.md

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

6 changes: 3 additions & 3 deletions vendor/github.com/oracle/oci-go-sdk/LICENSE.txt

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

9 changes: 5 additions & 4 deletions vendor/github.com/oracle/oci-go-sdk/Makefile

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

Loading

0 comments on commit b60b87c

Please sign in to comment.