Skip to content

Commit ad6c7b1

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#3730 from BigDarkClown/update-vendor-11-2020
Update vendor dependencies
2 parents 4b76aad + 305f1ac commit ad6c7b1

File tree

1,831 files changed

+190047
-69956
lines changed

Some content is hidden

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

1,831 files changed

+190047
-69956
lines changed

‎cluster-autoscaler/cloudprovider/alicloud/alicloud_auto_scaling_group.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
apiv1 "k8s.io/api/core/v1"
2323
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
2424
klog "k8s.io/klog/v2"
25-
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
25+
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework"
2626
)
2727

2828
// Asg implements NodeGroup interface.

‎cluster-autoscaler/cloudprovider/aws/aws_cloud_provider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"k8s.io/autoscaler/cluster-autoscaler/config"
3030
"k8s.io/autoscaler/cluster-autoscaler/utils/errors"
3131
klog "k8s.io/klog/v2"
32-
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
32+
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework"
3333
)
3434

3535
const (

‎cluster-autoscaler/cloudprovider/azure/azure_agent_pool.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
3535
"k8s.io/autoscaler/cluster-autoscaler/config/dynamic"
3636
klog "k8s.io/klog/v2"
37-
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
37+
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework"
3838
"k8s.io/legacy-cloud-providers/azure/retry"
3939
)
4040

‎cluster-autoscaler/cloudprovider/azure/azure_kubernetes_service_pool.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
apiv1 "k8s.io/api/core/v1"
2929
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
3030
"k8s.io/autoscaler/cluster-autoscaler/config/dynamic"
31-
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
31+
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework"
3232
)
3333

3434
//AKSAgentPool implements NodeGroup interface for agent pool deployed in AKS

‎cluster-autoscaler/cloudprovider/azure/azure_scale_set.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
2929
"k8s.io/autoscaler/cluster-autoscaler/config/dynamic"
3030
klog "k8s.io/klog/v2"
31-
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
31+
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework"
3232
"k8s.io/legacy-cloud-providers/azure/retry"
3333

3434
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"

‎cluster-autoscaler/cloudprovider/baiducloud/baiducloud_cloud_provider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"k8s.io/autoscaler/cluster-autoscaler/config/dynamic"
3030
"k8s.io/autoscaler/cluster-autoscaler/utils/errors"
3131
klog "k8s.io/klog/v2"
32-
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
32+
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework"
3333
)
3434

3535
const (

‎cluster-autoscaler/cloudprovider/cloud_provider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
apiv1 "k8s.io/api/core/v1"
2424
"k8s.io/apimachinery/pkg/api/resource"
2525
"k8s.io/autoscaler/cluster-autoscaler/utils/errors"
26-
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
26+
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework"
2727
)
2828

2929
const (

‎cluster-autoscaler/cloudprovider/cloudstack/cloudstack_node_group.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
apiv1 "k8s.io/api/core/v1"
2828
klog "k8s.io/klog/v2"
29-
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
29+
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework"
3030
)
3131

3232
// asg implements NodeGroup interface.

‎cluster-autoscaler/cloudprovider/clusterapi/clusterapi_controller_test.go‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,21 @@ func mustCreateTestController(t *testing.T, testConfigs ...*testConfig) (*machin
9494
}
9595

9696
kubeclientSet := fakekube.NewSimpleClientset(nodeObjects...)
97-
dynamicClientset := fakedynamic.NewSimpleDynamicClient(runtime.NewScheme(), machineObjects...)
97+
dynamicClientset := fakedynamic.NewSimpleDynamicClientWithCustomListKinds(
98+
runtime.NewScheme(),
99+
map[schema.GroupVersionResource]string{
100+
{Group: "cluster.x-k8s.io", Version: "v1alpha3", Resource: "machinedeployments"}: "kindList",
101+
{Group: "cluster.x-k8s.io", Version: "v1alpha3", Resource: "machines"}: "kindList",
102+
{Group: "cluster.x-k8s.io", Version: "v1alpha3", Resource: "machinesets"}: "kindList",
103+
{Group: "cluster.x-k8s.io", Version: "v1beta1", Resource: "machinedeployments"}: "kindList",
104+
{Group: "cluster.x-k8s.io", Version: "v1beta1", Resource: "machines"}: "kindList",
105+
{Group: "cluster.x-k8s.io", Version: "v1beta1", Resource: "machinesets"}: "kindList",
106+
{Group: "custom.x-k8s.io", Version: "v1beta1", Resource: "machinedeployments"}: "kindList",
107+
{Group: "custom.x-k8s.io", Version: "v1beta1", Resource: "machines"}: "kindList",
108+
{Group: "custom.x-k8s.io", Version: "v1beta1", Resource: "machinesets"}: "kindList",
109+
},
110+
machineObjects...,
111+
)
98112
discoveryClient := &fakediscovery.FakeDiscovery{
99113
Fake: &clientgotesting.Fake{
100114
Resources: []*metav1.APIResourceList{

‎cluster-autoscaler/cloudprovider/clusterapi/clusterapi_nodegroup.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
corev1 "k8s.io/api/core/v1"
2323
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
24-
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
24+
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework"
2525

2626
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
2727
)

0 commit comments

Comments
 (0)