Skip to content

Migrate to OCI SDK #148

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

Merged
merged 4 commits into from
Mar 19, 2018
Merged

Migrate to OCI SDK #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e39d44
Replace bmcs-go-sdk dependency with oci-go-sdk
prydie Mar 6, 2018
6de09a8
Remove legacy integration tests
prydie Mar 19, 2018
f953e5b
OCI SDK wrapper based on oci-go-sdk
prydie Mar 19, 2018
6c2e4f9
Port CloudProvider to use the new SDK
prydie Mar 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 15 additions & 11 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.

8 changes: 4 additions & 4 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
branch = "master"
name = "github.com/golang/glog"

[[constraint]]
branch = "master"
name = "github.com/oracle/bmcs-go-sdk"

[[constraint]]
name = "github.com/spf13/pflag"
version = "1.0.0"
Expand Down Expand Up @@ -68,6 +64,10 @@
name = "github.com/onsi/gomega"
version = "1.3.0"

[[constraint]]
name = "github.com/oracle/oci-go-sdk"
version = "1.0.0"

[prune]
non-go = true

Expand Down
20 changes: 7 additions & 13 deletions pkg/oci/ccm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ import (
"github.com/golang/glog"

utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/informers"
wait "k8s.io/apimachinery/pkg/util/wait"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the package is already called wait so the first part is redundant.

informers "k8s.io/client-go/informers"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/cache"
"k8s.io/kubernetes/pkg/cloudprovider"
"k8s.io/kubernetes/pkg/controller"
listersv1 "k8s.io/client-go/listers/core/v1"
cache "k8s.io/client-go/tools/cache"
cloudprovider "k8s.io/kubernetes/pkg/cloudprovider"
controller "k8s.io/kubernetes/pkg/controller"

"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/util"
listersv1 "k8s.io/client-go/listers/core/v1"
)

// ProviderName uniquely identifies the Oracle Bare Metal Cloud Services (OCI)
Expand All @@ -61,19 +61,13 @@ type CloudProvider struct {
// interface.
var _ cloudprovider.Interface = &CloudProvider{}

// NewCloudProvider creates a new baremetal.CloudProvider.
// NewCloudProvider creates a new oci.CloudProvider.
func NewCloudProvider(cfg *client.Config) (cloudprovider.Interface, error) {
c, err := client.New(cfg)
if err != nil {
return nil, err
}

err = c.Validate()
if err != nil {
glog.Errorf("cloudprovider.Validate() failed to communicate with OCI: %v", err)
return nil, err
}

return &CloudProvider{
client: c,
config: cfg,
Expand Down
Loading