Skip to content

Commit 4efe655

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#2914 from losipiuk/lo/update-vendor-03-10
Update vendor
2 parents 9ea7714 + d00bd06 commit 4efe655

File tree

483 files changed

+9458
-27936
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

483 files changed

+9458
-27936
lines changed

‎cluster-autoscaler/clusterstate/utils/status.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func WriteStatusConfigMap(kubeClient kube_client.Interface, namespace string, ms
135135
// DeleteStatusConfigMap deletes status configmap
136136
func DeleteStatusConfigMap(kubeClient kube_client.Interface, namespace string) error {
137137
maps := kubeClient.CoreV1().ConfigMaps(namespace)
138-
err := maps.Delete(context.TODO(), StatusConfigMapName, &metav1.DeleteOptions{})
138+
err := maps.Delete(context.TODO(), StatusConfigMapName, metav1.DeleteOptions{})
139139
if err != nil {
140140
klog.Error("Failed to delete status configmap")
141141
}

‎cluster-autoscaler/core/scale_down.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1163,7 +1163,7 @@ func evictPod(podToEvict *apiv1.Pod, client kube_client.Interface, recorder kube
11631163
GracePeriodSeconds: &maxTermination,
11641164
},
11651165
}
1166-
lastError = client.CoreV1().Pods(podToEvict.Namespace).Evict(eviction)
1166+
lastError = client.CoreV1().Pods(podToEvict.Namespace).Evict(ctx.TODO(), eviction)
11671167
if lastError == nil || kube_errors.IsNotFound(lastError) {
11681168
return status.PodEvictionResult{Pod: podToEvict, TimedOut: false, Err: nil}
11691169
}

‎cluster-autoscaler/go.mod‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -402,36 +402,36 @@ replace (
402402
gotest.tools/gotestsum => gotest.tools/gotestsum v0.3.5
403403
grpc.go4.org => grpc.go4.org v0.0.0-20170609214715-11d0a25b4919
404404
honnef.co/go/tools => honnef.co/go/tools v0.0.1-2019.2.2
405-
k8s.io/api => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/api
406-
k8s.io/apiextensions-apiserver => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/apiextensions-apiserver
407-
k8s.io/apimachinery => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/apimachinery
408-
k8s.io/apiserver => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/apiserver
409-
k8s.io/cli-runtime => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/cli-runtime
410-
k8s.io/client-go => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/client-go
411-
k8s.io/cloud-provider => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/cloud-provider
412-
k8s.io/cluster-bootstrap => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/cluster-bootstrap
413-
k8s.io/code-generator => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/code-generator
414-
k8s.io/component-base => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/component-base
415-
k8s.io/cri-api => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/cri-api
416-
k8s.io/csi-translation-lib => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/csi-translation-lib
405+
k8s.io/api => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/api
406+
k8s.io/apiextensions-apiserver => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/apiextensions-apiserver
407+
k8s.io/apimachinery => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/apimachinery
408+
k8s.io/apiserver => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/apiserver
409+
k8s.io/cli-runtime => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/cli-runtime
410+
k8s.io/client-go => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/client-go
411+
k8s.io/cloud-provider => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/cloud-provider
412+
k8s.io/cluster-bootstrap => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/cluster-bootstrap
413+
k8s.io/code-generator => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/code-generator
414+
k8s.io/component-base => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/component-base
415+
k8s.io/cri-api => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/cri-api
416+
k8s.io/csi-translation-lib => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/csi-translation-lib
417417
k8s.io/gengo => k8s.io/gengo v0.0.0-20200114144118-36b2048a9120
418418
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
419419
k8s.io/klog => k8s.io/klog v1.0.0
420-
k8s.io/kube-aggregator => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/kube-aggregator
421-
k8s.io/kube-controller-manager => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/kube-controller-manager
420+
k8s.io/kube-aggregator => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/kube-aggregator
421+
k8s.io/kube-controller-manager => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/kube-controller-manager
422422
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
423-
k8s.io/kube-proxy => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/kube-proxy
424-
k8s.io/kube-scheduler => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/kube-scheduler
425-
k8s.io/kubectl => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/kubectl
426-
k8s.io/kubelet => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/kubelet
427-
k8s.io/legacy-cloud-providers => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/legacy-cloud-providers
428-
k8s.io/metrics => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/metrics
423+
k8s.io/kube-proxy => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/kube-proxy
424+
k8s.io/kube-scheduler => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/kube-scheduler
425+
k8s.io/kubectl => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/kubectl
426+
k8s.io/kubelet => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/kubelet
427+
k8s.io/legacy-cloud-providers => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/legacy-cloud-providers
428+
k8s.io/metrics => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/metrics
429429
k8s.io/repo-infra => k8s.io/repo-infra v0.0.1-alpha.1
430-
k8s.io/sample-apiserver => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/sample-apiserver
431-
k8s.io/sample-cli-plugin => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/sample-cli-plugin
432-
k8s.io/sample-controller => /tmp/ca-update-vendor.PKQi/kubernetes/staging/src/k8s.io/sample-controller
430+
k8s.io/sample-apiserver => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/sample-apiserver
431+
k8s.io/sample-cli-plugin => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/sample-cli-plugin
432+
k8s.io/sample-controller => /tmp/ca-update-vendor.ou1l/kubernetes/staging/src/k8s.io/sample-controller
433433
k8s.io/system-validators => k8s.io/system-validators v1.0.4
434-
k8s.io/utils => k8s.io/utils v0.0.0-20200117235808-5f6fbceb4c31
434+
k8s.io/utils => k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab
435435
modernc.org/cc => modernc.org/cc v1.0.0
436436
modernc.org/golex => modernc.org/golex v1.0.0
437437
modernc.org/mathutil => modernc.org/mathutil v1.0.0
@@ -441,9 +441,9 @@ replace (
441441
mvdan.cc/lint => mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b
442442
mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20190209190245-fbb59629db34
443443
rsc.io/pdf => rsc.io/pdf v0.1.1
444-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client => sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.5
444+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client => sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7
445445
sigs.k8s.io/kustomize => sigs.k8s.io/kustomize v2.0.3+incompatible
446-
sigs.k8s.io/structured-merge-diff/v3 => sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200207200219-5e70324e7c1c
446+
sigs.k8s.io/structured-merge-diff/v3 => sigs.k8s.io/structured-merge-diff/v3 v3.0.0
447447
sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.2.0
448448
sourcegraph.com/sqs/pbtypes => sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4
449449
vbom.ml/util => vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc
@@ -453,4 +453,4 @@ replace github.com/digitalocean/godo => github.com/digitalocean/godo v1.27.0
453453

454454
replace github.com/rancher/go-rancher => github.com/rancher/go-rancher v0.1.0
455455

456-
replace k8s.io/kubernetes => /tmp/ca-update-vendor.PKQi/kubernetes
456+
replace k8s.io/kubernetes => /tmp/ca-update-vendor.ou1l/kubernetes

‎cluster-autoscaler/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -548,8 +548,8 @@ k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c h1:/KUFqjjqAcY4Us6luF5RDN
548548
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
549549
k8s.io/repo-infra v0.0.1-alpha.1/go.mod h1:wO1t9WaB99V80ljbeENTnayuEEwNZt7gECYh/CEyOJ8=
550550
k8s.io/system-validators v1.0.4/go.mod h1:HgSgTg4NAGNoYYjKsUyk52gdNi2PVDswQ9Iyn66R7NI=
551-
k8s.io/utils v0.0.0-20200117235808-5f6fbceb4c31 h1:KCcLuc/HD1RogJgEbZi9ObRuLv1bgiRCfAbidLKrUpg=
552-
k8s.io/utils v0.0.0-20200117235808-5f6fbceb4c31/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
551+
k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab h1:I3f2hcBrepGRXI1z4sukzAb8w1R4eqbsHrAsx06LGYM=
552+
k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
553553
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
554554
modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
555555
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
@@ -559,11 +559,11 @@ mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIa
559559
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
560560
mvdan.cc/unparam v0.0.0-20190209190245-fbb59629db34/go.mod h1:H6SUd1XjIs+qQCyskXg5OFSrilMRUkD8ePJpHKDPaeY=
561561
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
562-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.5 h1:bwop2S7kJYCtltbitSoLqQb8HdTxbcRAKqAGzcB4Lk8=
563-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.5/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0=
562+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7 h1:uuHDyjllyzRyCIvvn0OBjiRB0SgBZGqHNYAmjR7fO50=
563+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0=
564564
sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
565-
sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200207200219-5e70324e7c1c h1:xQP7F7Lntt2dtYmg12WPQHObOrAyPHlMWP1JVSa79GM=
566-
sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200207200219-5e70324e7c1c/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
565+
sigs.k8s.io/structured-merge-diff/v3 v3.0.0 h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E=
566+
sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
567567
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
568568
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
569569
sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=

‎cluster-autoscaler/simulator/scheduler_based_predicates_checker.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import (
2626
kube_client "k8s.io/client-go/kubernetes"
2727
v1listers "k8s.io/client-go/listers/core/v1"
2828
"k8s.io/klog"
29+
volume_scheduling "k8s.io/kubernetes/pkg/controller/volume/scheduling"
2930
scheduler_apis_config "k8s.io/kubernetes/pkg/scheduler/apis/config"
3031
scheduler_plugins "k8s.io/kubernetes/pkg/scheduler/framework/plugins"
3132
scheduler_framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
3233
scheduler_nodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
33-
scheduler_volumebinder "k8s.io/kubernetes/pkg/scheduler/volumebinder"
3434

3535
// We need to import provider to initialize default scheduler.
3636
"k8s.io/kubernetes/pkg/scheduler/algorithmprovider"
@@ -52,7 +52,7 @@ func NewSchedulerBasedPredicateChecker(kubeClient kube_client.Interface, stop <-
5252
plugins := providerRegistry[scheduler_apis_config.SchedulerDefaultProviderName]
5353
sharedLister := NewDelegatingSchedulerSharedLister()
5454

55-
volumeBinder := scheduler_volumebinder.NewVolumeBinder(
55+
volumeBinder := volume_scheduling.NewVolumeBinder(
5656
kubeClient,
5757
informerFactory.Core().V1().Nodes(),
5858
informerFactory.Storage().V1().CSINodes(),

0 commit comments

Comments
 (0)