Skip to content
This repository has been archived by the owner on Dec 15, 2021. It is now read-only.

Update client-go version #873

Merged
merged 2 commits into from
Aug 8, 2018
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
98 changes: 33 additions & 65 deletions Gopkg.lock

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
Original file line number Diff line number Diff line change
Expand Up @@ -102,20 +102,20 @@
name = "golang.org/x/net"

[[constraint]]
version = "kubernetes-1.8.7"
version = "kubernetes-1.10.0"
name = "k8s.io/api"

[[constraint]]
version = "kubernetes-1.8.7"
version = "kubernetes-1.10.0"
name = "k8s.io/apiextensions-apiserver"

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

[[constraint]]
name = "k8s.io/client-go"
version = "v5.0.0"
version = "v7.0.0"

[prune]
go-tests = true
Expand Down
27 changes: 0 additions & 27 deletions pkg/utils/k8sutil_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,47 +5,20 @@ import (
"encoding/json"
"io"
"io/ioutil"
"net/http"
"testing"

v2beta1 "k8s.io/api/autoscaling/v2beta1"
"k8s.io/api/extensions/v1beta1"
extensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
fakeextensionsapi "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
"k8s.io/apimachinery/pkg/apimachinery"
"k8s.io/apimachinery/pkg/apimachinery/registered"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
restFake "k8s.io/client-go/rest/fake"
ktesting "k8s.io/client-go/testing"
)

func fakeRESTClient(f func(req *http.Request) (*http.Response, error)) *restFake.RESTClient {
reg := registered.NewOrDie("v1")
legacySchema := schema.GroupVersion{
Group: "",
Version: "v1",
}
newSchema := schema.GroupVersion{
Group: "k8s.io",
Version: "v1",
}
reg.RegisterGroup(apimachinery.GroupMeta{
GroupVersion: legacySchema,
})
reg.RegisterGroup(apimachinery.GroupMeta{
GroupVersion: newSchema,
})
return &restFake.RESTClient{
APIRegistry: reg,
NegotiatedSerializer: scheme.Codecs,
Client: restFake.CreateHTTPClient(f),
}
}

func objBody(object interface{}) io.ReadCloser {
output, err := json.Marshal(object)
if err != nil {
Expand Down
4 changes: 0 additions & 4 deletions vendor/github.com/emicklei/go-restful-swagger12/.travis.yml

This file was deleted.

46 changes: 0 additions & 46 deletions vendor/github.com/emicklei/go-restful-swagger12/CHANGES.md

This file was deleted.

22 changes: 0 additions & 22 deletions vendor/github.com/emicklei/go-restful-swagger12/LICENSE

This file was deleted.

Loading