Skip to content

Commit

Permalink
refact(deps): bump k8s and client-go to v0.20.2 (#4)
Browse files Browse the repository at this point in the history 
Signed-off-by: prateekpandey14 <[email protected]>
  • Loading branch information
@prateekpandey14
prateekpandey14 authored Mar 3, 2021
1 parent bccc586 commit f80e8f9
Show file tree
Hide file tree
Showing 1,915 changed files with 808,408 additions and 352 deletions.
77 changes: 30 additions & 47 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,56 +4,39 @@ go 1.14

require (
github.com/container-storage-interface/spec v1.1.0
github.com/gogo/protobuf v1.3.0 // indirect
github.com/google/uuid v1.0.0
github.com/googleapis/gnostic v0.3.1 // indirect
github.com/google/uuid v1.1.2
github.com/imdario/mergo v0.3.7 // indirect
github.com/json-iterator/go v1.1.8 // indirect
github.com/kr/pretty v0.1.0 // indirect
github.com/pkg/errors v0.8.1
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.5.1 // indirect
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 // indirect
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 // indirect
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
golang.org/x/sys v0.0.0-20190902133755-9109b7679e13 // indirect
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
google.golang.org/appengine v1.6.2 // indirect
google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9 // indirect
google.golang.org/grpc v1.23.1 // indirect
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/api v0.15.12
k8s.io/apimachinery v0.15.12
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
github.com/pkg/errors v0.9.1
k8s.io/api v0.20.2
k8s.io/apimachinery v0.20.2
k8s.io/client-go v0.20.2
k8s.io/klog v1.0.0
k8s.io/kubernetes v1.15.12
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f // indirect
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
)

replace (
k8s.io/api => k8s.io/api v0.15.12
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.15.12
k8s.io/apimachinery => k8s.io/apimachinery v0.15.12
k8s.io/apiserver => k8s.io/apiserver v0.15.12
k8s.io/cli-runtime => k8s.io/cli-runtime v0.15.12
k8s.io/client-go => k8s.io/client-go v0.15.12
k8s.io/cloud-provider => k8s.io/cloud-provider v0.15.12
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.15.12
k8s.io/code-generator => k8s.io/code-generator v0.15.12
k8s.io/component-base => k8s.io/component-base v0.15.12
k8s.io/cri-api => k8s.io/cri-api v0.15.12
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.15.12
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.15.12
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.15.12
k8s.io/kube-proxy => k8s.io/kube-proxy v0.15.12
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.15.12
k8s.io/kubectl => k8s.io/kubectl v0.15.12
k8s.io/kubelet => k8s.io/kubelet v0.15.12
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.15.12
k8s.io/metrics => k8s.io/metrics v0.15.12
k8s.io/node-api => k8s.io/node-api v0.15.12
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.15.12
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.15.12
k8s.io/sample-controller => k8s.io/sample-controller v0.15.12
k8s.io/api => k8s.io/api v0.20.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.2
k8s.io/apimachinery => k8s.io/apimachinery v0.20.2
k8s.io/apiserver => k8s.io/apiserver v0.20.2
k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.2
k8s.io/client-go => k8s.io/client-go v0.20.2
k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.2
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.2
k8s.io/code-generator => k8s.io/code-generator v0.20.2
k8s.io/component-base => k8s.io/component-base v0.20.2
k8s.io/cri-api => k8s.io/cri-api v0.20.2
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.2
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.2
k8s.io/kubectl => k8s.io/kubectl v0.20.2
k8s.io/kubelet => k8s.io/kubelet v0.20.2
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.2
k8s.io/metrics => k8s.io/metrics v0.20.2
k8s.io/node-api => k8s.io/node-api v0.20.2
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.2
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.20.2
k8s.io/sample-controller => k8s.io/sample-controller v0.20.2
)
594 changes: 311 additions & 283 deletions go.sum
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion pkg/client/k8s/configmap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package k8s

import (
"context"
"strings"

"github.com/pkg/errors"
Expand Down Expand Up @@ -50,5 +51,5 @@ func (c *Configmap) Get(options metav1.GetOptions) (cm *corev1.ConfigMap, err er
if err != nil {
return nil, errors.Wrapf(err, "failed to get config map %s %s", c.namespace, c.name)
}
return cs.CoreV1().ConfigMaps(c.namespace).Get(c.name, options)
return cs.CoreV1().ConfigMaps(c.namespace).Get(context.TODO(), c.name, options)
}
6 changes: 4 additions & 2 deletions pkg/client/k8s/namespace.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ limitations under the License.
package k8s

import (
"context"

"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -46,7 +48,7 @@ func (ns *NamespaceStruct) Get(name string, options metav1.GetOptions) (*corev1.
if err != nil {
return nil, errors.Wrapf(err, "failed to get namespace: %s", name)
}
return cs.CoreV1().Namespaces().Get(name, options)
return cs.CoreV1().Namespaces().Get(context.TODO(), name, options)
}

// List returns a slice of namespaces defined in a Kubernetes cluster
Expand All @@ -55,5 +57,5 @@ func (ns *NamespaceStruct) List(options metav1.ListOptions) (*corev1.NamespaceLi
if err != nil {
return nil, errors.Wrapf(err, "failed to get namespaces")
}
return cs.CoreV1().Namespaces().List(options)
return cs.CoreV1().Namespaces().List(context.TODO(), options)
}
6 changes: 4 additions & 2 deletions pkg/client/k8s/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ limitations under the License.
package k8s

import (
"context"

"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -46,7 +48,7 @@ func (n *NodeStruct) Get(name string, options metav1.GetOptions) (*corev1.Node,
if err != nil {
return nil, errors.Wrapf(err, "failed to get node: %s", name)
}
return cs.CoreV1().Nodes().Get(name, options)
return cs.CoreV1().Nodes().Get(context.TODO(), name, options)
}

// List returns a slice of Nodes registered in a Kubernetes cluster
Expand All @@ -55,7 +57,7 @@ func (n *NodeStruct) List(options metav1.ListOptions) (*corev1.NodeList, error)
if err != nil {
return nil, errors.Wrapf(err, "failed to get nodes")
}
return cs.CoreV1().Nodes().List(options)
return cs.CoreV1().Nodes().List(context.TODO(), options)
}

// NumberOfNodes returns the number of nodes registered in a Kubernetes cluster
Expand Down
11 changes: 6 additions & 5 deletions pkg/client/k8s/resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ limitations under the License.
package k8s

import (
"context"
"fmt"
"strings"

Expand Down Expand Up @@ -93,7 +94,7 @@ func (r *ResourceStruct) Create(obj *unstructured.Unstructured, subresources ...
err = errors.Wrapf(err, "failed to create resource '%s' '%s' at '%s'", r.gvr, obj.GetName(), r.namespace)
return
}
u, err = dynamic.Resource(r.gvr).Namespace(r.namespace).Create(obj, metav1.CreateOptions{}, subresources...)
u, err = dynamic.Resource(r.gvr).Namespace(r.namespace).Create(context.TODO(), obj, metav1.CreateOptions{}, subresources...)
if err != nil {
err = errors.Wrapf(err, "failed to create resource '%s' '%s' at '%s'", r.gvr, obj.GetName(), r.namespace)
return
Expand All @@ -110,7 +111,7 @@ func (r *ResourceStruct) Delete(obj *unstructured.Unstructured, subresources ...
if err != nil {
return errors.Wrapf(err, "failed to delete resource '%s' '%s' at '%s'", r.gvr, obj.GetName(), r.namespace)
}
err = dynamic.Resource(r.gvr).Namespace(r.namespace).Delete(obj.GetName(), &metav1.DeleteOptions{})
err = dynamic.Resource(r.gvr).Namespace(r.namespace).Delete(context.TODO(), obj.GetName(), metav1.DeleteOptions{})
if err != nil {
return errors.Wrapf(err, "failed to delete resource '%s' '%s' at '%s'", r.gvr, obj.GetName(), r.namespace)
}
Expand All @@ -128,7 +129,7 @@ func (r *ResourceStruct) Get(name string, opts metav1.GetOptions, subresources .
err = errors.Wrapf(err, "failed to get resource '%s' '%s' at '%s'", r.gvr, name, r.namespace)
return
}
u, err = dynamic.Resource(r.gvr).Namespace(r.namespace).Get(name, opts, subresources...)
u, err = dynamic.Resource(r.gvr).Namespace(r.namespace).Get(context.TODO(), name, opts, subresources...)
if err != nil {
err = errors.Wrapf(err, "failed to get resource '%s' '%s' at '%s'", r.gvr, name, r.namespace)
return
Expand All @@ -155,7 +156,7 @@ func (r *ResourceStruct) Update(oldobj, newobj *unstructured.Unstructured, subre
resourceVersion := oldobj.GetResourceVersion()
newobj.SetResourceVersion(resourceVersion)

u, err = dynamic.Resource(r.gvr).Namespace(r.namespace).Update(newobj, metav1.UpdateOptions{}, subresources...)
u, err = dynamic.Resource(r.gvr).Namespace(r.namespace).Update(context.TODO(), newobj, metav1.UpdateOptions{}, subresources...)
if err != nil {
err = errors.Wrapf(err, "failed to update resource '%s' '%s' at '%s'", r.gvr, oldobj.GetName(), r.namespace)
return
Expand All @@ -170,7 +171,7 @@ func (r *ResourceStruct) List(opts metav1.ListOptions) (u *unstructured.Unstruct
err = errors.Wrapf(err, "failed to list resource '%s' at '%s'", r.gvr, r.namespace)
return
}
u, err = dynamic.Resource(r.gvr).Namespace(r.namespace).List(opts)
u, err = dynamic.Resource(r.gvr).Namespace(r.namespace).List(context.TODO(), opts)
if err != nil {
err = errors.Wrapf(err, "failed to list resource '%s' at '%s'", r.gvr, r.namespace)
return
Expand Down
12 changes: 6 additions & 6 deletions pkg/device/iolimit/models.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ limitations under the License.
package iolimit

type Request struct {
DeviceName string
PodUid string
DeviceName string
PodUid string
ContainerRuntime string
IOLimit *IOMax
IOLimit *IOMax
}

type ValidRequest struct {
FilePath string
FilePath string
DeviceNumber *DeviceNumber
IOMax *IOMax
IOMax *IOMax
}

type IOMax struct {
Expand All @@ -39,4 +39,4 @@ type IOMax struct {
type DeviceNumber struct {
Major uint64
Minor uint64
}
}
6 changes: 3 additions & 3 deletions pkg/device/iolimit/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func validate(request *Request) (*ValidRequest, error) {
return &ValidRequest{
FilePath: ioMaxFile,
DeviceNumber: deviceNumber,
IOMax: request.IOLimit,
IOMax: request.IOLimit,
}, nil
}

Expand Down Expand Up @@ -114,8 +114,8 @@ func getDeviceNumber(deviceName string) (*DeviceNumber, error) {
return nil, err
}
return &DeviceNumber{
Major: uint64(stat.Rdev/256),
Minor: uint64(stat.Rdev%256),
Major: uint64(stat.Rdev / 256),
Minor: uint64(stat.Rdev % 256),
}, nil
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/mount/mount_utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package mount

import (
"k8s.io/kubernetes/pkg/util/mount"
"k8s.io/utils/mount"
)

// GetMounts gets mountpoints for the specified volume
Expand Down
4 changes: 2 additions & 2 deletions pkg/scheduler/scheduler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ func Scheduler(req *csi.CreateVolumeRequest, nmap map[string]int64) []string {
}

topo := areq.Preferred
if len(topo) == 0 {
if len(topo) == 0 {
// if preferred list is empty, use the requisite
topo = areq.Requisite
}

if len(topo) == 0 {
if len(topo) == 0 {
klog.Errorf("scheduler: topology information not provided")
return nodelist
}
Expand Down
Loading

0 comments on commit f80e8f9

Please sign in to comment.