Skip to content

Commit

Permalink
Merge pull request #12 from ncdc/remove-k8s-apiextensions-import
Browse files Browse the repository at this point in the history
Remove k8s.io/apiextensions-apiserver from vendor
  • Loading branch information
skriss authored Aug 7, 2017
2 parents 46cbb87 + e0d2a2d commit 695816a
Show file tree
Hide file tree
Showing 25 changed files with 1 addition and 3,648 deletions.
20 changes: 0 additions & 20 deletions Godeps/Godeps.json

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

10 changes: 1 addition & 9 deletions pkg/cmd/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"github.com/golang/glog"
"github.com/spf13/cobra"

apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
Expand Down Expand Up @@ -79,7 +78,6 @@ func NewCommand() *cobra.Command {

type server struct {
kubeClient kubernetes.Interface
apiExtensionsClient apiextensionsclient.Interface
arkClient clientset.Interface
backupService cloudprovider.BackupService
snapshotService cloudprovider.SnapshotService
Expand All @@ -101,11 +99,6 @@ func newServer(kubeconfig string) (*server, error) {
return nil, err
}

apiExtensionsClient, err := apiextensionsclient.NewForConfig(clientConfig)
if err != nil {
return nil, err
}

arkClient, err := clientset.NewForConfig(clientConfig)
if err != nil {
return nil, err
Expand All @@ -115,9 +108,8 @@ func newServer(kubeconfig string) (*server, error) {

s := &server{
kubeClient: kubeClient,
apiExtensionsClient: apiExtensionsClient,
arkClient: arkClient,
discoveryClient: apiExtensionsClient.Discovery(),
discoveryClient: arkClient.Discovery(),
clientPool: dynamic.NewDynamicClientPool(clientConfig),
sharedInformerFactory: informers.NewSharedInformerFactory(arkClient, 0),
ctx: ctx,
Expand Down
202 changes: 0 additions & 202 deletions vendor/k8s.io/apiextensions-apiserver/LICENSE

This file was deleted.

This file was deleted.

Loading

0 comments on commit 695816a

Please sign in to comment.