Skip to content
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.

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

Update to client-go kubernetes-1.14.0 #3886

Merged
merged 2 commits into from
Jun 12, 2019
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
84 changes: 35 additions & 49 deletions Gopkg.lock

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

6 changes: 3 additions & 3 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

[[constraint]]
name = "k8s.io/api"
version="kubernetes-1.13.0"
version="kubernetes-1.14.0"

[[constraint]]
name = "k8s.io/apimachinery"
version="kubernetes-1.13.0"
version="kubernetes-1.14.0"

[[constraint]]
name = "k8s.io/client-go"
version="v10.0.0"
version="kubernetes-1.14.0"

[[constraint]]
name = "k8s.io/heapster"
Expand Down
2 changes: 1 addition & 1 deletion src/app/backend/resource/ingress/detail.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ type IngressDetail struct {
func GetIngressDetail(client client.Interface, namespace, name string) (*IngressDetail, error) {
log.Printf("Getting details of %s ingress in %s namespace", name, namespace)

rawIngress, err := client.Extensions().Ingresses(namespace).Get(name, metaV1.GetOptions{})
rawIngress, err := client.ExtensionsV1beta1().Ingresses(namespace).Get(name, metaV1.GetOptions{})

if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion src/app/backend/resource/ingress/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ type IngressList struct {
// GetIngressList returns all ingresses in the given namespace.
func GetIngressList(client client.Interface, namespace *common.NamespaceQuery,
dsQuery *dataselect.DataSelectQuery) (*IngressList, error) {
ingressList, err := client.Extensions().Ingresses(namespace.ToRequestParam()).List(api.ListEverything)
ingressList, err := client.ExtensionsV1beta1().Ingresses(namespace.ToRequestParam()).List(api.ListEverything)

nonCriticalErrors, criticalError := errors.HandleError(err)
if criticalError != nil {
Expand Down
2 changes: 1 addition & 1 deletion src/app/backend/resource/job/pods.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func GetJobPods(client k8sClient.Interface, metricClient metricapi.MetricClient,

// Returns array of api pods targeting job with given name.
func getRawJobPods(client k8sClient.Interface, petSetName, namespace string) ([]v1.Pod, error) {
job, err := client.Batch().Jobs(namespace).Get(petSetName, metaV1.GetOptions{})
job, err := client.BatchV1().Jobs(namespace).Get(petSetName, metaV1.GetOptions{})
if err != nil {
return nil, err
}
Expand Down
4 changes: 2 additions & 2 deletions src/app/backend/scaling/scale.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"strconv"

"k8s.io/client-go/discovery"
"k8s.io/client-go/discovery/cached"
"k8s.io/client-go/discovery/cached/memory"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
Expand Down Expand Up @@ -98,7 +98,7 @@ func getScaleGetter(cfg *rest.Config) (scale.ScalesGetter, error) {
}

resolver := scale.NewDiscoveryScaleKindResolver(discoveryClient)
dc := cached.NewMemCacheClient(discoveryClient)
dc := memory.NewMemCacheClient(discoveryClient)
drm := restmapper.NewDeferredDiscoveryRESTMapper(dc)

// Fixes "unable to get full preferred group-version-resource for <resource>: the cache has not been filled yet".
Expand Down
1 change: 0 additions & 1 deletion vendor/github.com/google/btree/.travis.yml

This file was deleted.

12 changes: 0 additions & 12 deletions vendor/github.com/google/btree/README.md

This file was deleted.

Loading