From 655b4081f424b3d2dfd5cc2f155f6c2a81d6416b Mon Sep 17 00:00:00 2001 From: Maciek Pytel Date: Fri, 5 Jun 2020 15:32:37 +0200 Subject: [PATCH] Migrate to klog v2 --- .../cloudprovider/alicloud/alicloud_auto_scaling.go | 2 +- .../cloudprovider/alicloud/alicloud_auto_scaling_group.go | 2 +- .../cloudprovider/alicloud/alicloud_auto_scaling_groups.go | 2 +- .../cloudprovider/alicloud/alicloud_cloud_config.go | 2 +- .../cloudprovider/alicloud/alicloud_cloud_provider.go | 2 +- .../cloudprovider/alicloud/alicloud_instance_types.go | 2 +- cluster-autoscaler/cloudprovider/alicloud/alicloud_manager.go | 2 +- cluster-autoscaler/cloudprovider/aws/auto_scaling.go | 2 +- cluster-autoscaler/cloudprovider/aws/auto_scaling_groups.go | 2 +- cluster-autoscaler/cloudprovider/aws/aws_cloud_provider.go | 2 +- cluster-autoscaler/cloudprovider/aws/aws_manager.go | 2 +- cluster-autoscaler/cloudprovider/aws/aws_util.go | 2 +- .../cloudprovider/aws/ec2_instance_types/gen.go | 2 +- cluster-autoscaler/cloudprovider/azure/azure_agent_pool.go | 2 +- cluster-autoscaler/cloudprovider/azure/azure_cache.go | 2 +- cluster-autoscaler/cloudprovider/azure/azure_client.go | 2 +- .../cloudprovider/azure/azure_cloud_provider.go | 2 +- .../cloudprovider/azure/azure_instance_types/gen.go | 2 +- .../cloudprovider/azure/azure_kubernetes_service_pool.go | 2 +- cluster-autoscaler/cloudprovider/azure/azure_manager.go | 2 +- cluster-autoscaler/cloudprovider/azure/azure_scale_set.go | 2 +- cluster-autoscaler/cloudprovider/azure/azure_util.go | 2 +- .../cloudprovider/baiducloud/baiducloud-sdk-go/cce/cluster.go | 2 +- .../cloudprovider/baiducloud/baiducloud-sdk-go/util/util.go | 2 +- .../baiducloud/baiducloud_auto_scaling_groups.go | 2 +- .../cloudprovider/baiducloud/baiducloud_cloud_provider.go | 2 +- .../cloudprovider/baiducloud/baiducloud_manager.go | 2 +- .../cloudprovider/builder/cloud_provider_builder.go | 2 +- .../cloudprovider/clusterapi/clusterapi_controller.go | 2 +- .../cloudprovider/clusterapi/clusterapi_machinedeployment.go | 2 +- .../cloudprovider/clusterapi/clusterapi_machineset.go | 2 +- .../cloudprovider/clusterapi/clusterapi_provider.go | 2 +- .../cloudprovider/digitalocean/digitalocean_cloud_provider.go | 2 +- .../cloudprovider/digitalocean/digitalocean_manager.go | 2 +- .../cloudprovider/gce/autoscaling_gce_client.go | 2 +- cluster-autoscaler/cloudprovider/gce/cache.go | 2 +- cluster-autoscaler/cloudprovider/gce/gce_cloud_provider.go | 2 +- cluster-autoscaler/cloudprovider/gce/gce_manager.go | 2 +- .../cloudprovider/gce/mig_target_sizes_provider.go | 2 +- cluster-autoscaler/cloudprovider/gce/reserved.go | 2 +- cluster-autoscaler/cloudprovider/gce/templates.go | 2 +- cluster-autoscaler/cloudprovider/kubemark/kubemark_linux.go | 2 +- cluster-autoscaler/cloudprovider/kubemark/kubemark_other.go | 2 +- .../cloudprovider/magnum/magnum_cloud_provider.go | 2 +- .../cloudprovider/magnum/magnum_manager_heat.go | 2 +- cluster-autoscaler/cloudprovider/magnum/magnum_nodegroup.go | 2 +- .../cloudprovider/packet/packet_cloud_provider.go | 2 +- .../cloudprovider/packet/packet_manager_rest.go | 2 +- cluster-autoscaler/cloudprovider/packet/packet_node_group.go | 2 +- cluster-autoscaler/clusterstate/clusterstate.go | 2 +- cluster-autoscaler/clusterstate/utils/node_instances_cache.go | 2 +- cluster-autoscaler/clusterstate/utils/status.go | 2 +- cluster-autoscaler/context/autoscaling_context.go | 2 +- cluster-autoscaler/core/filter_out_schedulable.go | 2 +- cluster-autoscaler/core/scale_down.go | 2 +- cluster-autoscaler/core/scale_down_test.go | 2 +- cluster-autoscaler/core/scale_up.go | 2 +- cluster-autoscaler/core/static_autoscaler.go | 4 ++-- cluster-autoscaler/core/static_autoscaler_test.go | 2 +- cluster-autoscaler/core/utils/expendable.go | 2 +- cluster-autoscaler/core/utils/utils.go | 2 +- cluster-autoscaler/estimator/binpacking_estimator.go | 2 +- cluster-autoscaler/expander/price/price.go | 2 +- cluster-autoscaler/expander/priority/priority.go | 2 +- cluster-autoscaler/expander/waste/waste.go | 2 +- cluster-autoscaler/main.go | 2 +- cluster-autoscaler/metrics/metrics.go | 2 +- .../processors/nodegroupset/balancing_processor.go | 2 +- .../processors/nodes/pre_filtering_processor.go | 2 +- .../processors/status/eventing_scale_up_processor.go | 2 +- .../processors/status/scale_down_status_processor.go | 2 +- cluster-autoscaler/simulator/cluster.go | 2 +- .../simulator/scheduler_based_predicates_checker.go | 2 +- cluster-autoscaler/utils/deletetaint/delete.go | 2 +- cluster-autoscaler/utils/glogx/defaults.go | 2 +- cluster-autoscaler/utils/glogx/glogx.go | 2 +- cluster-autoscaler/utils/glogx/glogx_test.go | 2 +- cluster-autoscaler/utils/gpu/gpu.go | 2 +- .../utils/kubernetes/event_sink_logging_wrapper.go | 2 +- cluster-autoscaler/utils/taints/taints.go | 2 +- cluster-autoscaler/utils/utils.go | 2 +- 81 files changed, 82 insertions(+), 82 deletions(-) diff --git a/cluster-autoscaler/cloudprovider/alicloud/alicloud_auto_scaling.go b/cluster-autoscaler/cloudprovider/alicloud/alicloud_auto_scaling.go index b93e7f38e6..7ca40574ab 100644 --- a/cluster-autoscaler/cloudprovider/alicloud/alicloud_auto_scaling.go +++ b/cluster-autoscaler/cloudprovider/alicloud/alicloud_auto_scaling.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/alicloud/alibaba-cloud-sdk-go/sdk/requests" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/alicloud/alibaba-cloud-sdk-go/services/ess" - "k8s.io/klog" + klog "k8s.io/klog/v2" "time" ) diff --git a/cluster-autoscaler/cloudprovider/alicloud/alicloud_auto_scaling_group.go b/cluster-autoscaler/cloudprovider/alicloud/alicloud_auto_scaling_group.go index 0eef4b2b64..7cfaac9cc1 100644 --- a/cluster-autoscaler/cloudprovider/alicloud/alicloud_auto_scaling_group.go +++ b/cluster-autoscaler/cloudprovider/alicloud/alicloud_auto_scaling_group.go @@ -21,7 +21,7 @@ import ( apiv1 "k8s.io/api/core/v1" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" - "k8s.io/klog" + klog "k8s.io/klog/v2" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" ) diff --git a/cluster-autoscaler/cloudprovider/alicloud/alicloud_auto_scaling_groups.go b/cluster-autoscaler/cloudprovider/alicloud/alicloud_auto_scaling_groups.go index ec32f446f5..eb49025dae 100644 --- a/cluster-autoscaler/cloudprovider/alicloud/alicloud_auto_scaling_groups.go +++ b/cluster-autoscaler/cloudprovider/alicloud/alicloud_auto_scaling_groups.go @@ -21,7 +21,7 @@ import ( "time" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) type autoScalingGroups struct { diff --git a/cluster-autoscaler/cloudprovider/alicloud/alicloud_cloud_config.go b/cluster-autoscaler/cloudprovider/alicloud/alicloud_cloud_config.go index ca414ca2c2..36d518dac5 100644 --- a/cluster-autoscaler/cloudprovider/alicloud/alicloud_cloud_config.go +++ b/cluster-autoscaler/cloudprovider/alicloud/alicloud_cloud_config.go @@ -18,7 +18,7 @@ package alicloud import ( "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/alicloud/metadata" - "k8s.io/klog" + klog "k8s.io/klog/v2" "os" ) diff --git a/cluster-autoscaler/cloudprovider/alicloud/alicloud_cloud_provider.go b/cluster-autoscaler/cloudprovider/alicloud/alicloud_cloud_provider.go index 9b056d8d4b..c3aa703cf6 100644 --- a/cluster-autoscaler/cloudprovider/alicloud/alicloud_cloud_provider.go +++ b/cluster-autoscaler/cloudprovider/alicloud/alicloud_cloud_provider.go @@ -27,7 +27,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/config" "k8s.io/autoscaler/cluster-autoscaler/config/dynamic" "k8s.io/autoscaler/cluster-autoscaler/utils/errors" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/cloudprovider/alicloud/alicloud_instance_types.go b/cluster-autoscaler/cloudprovider/alicloud/alicloud_instance_types.go index c07d3e8e05..3f09394d78 100644 --- a/cluster-autoscaler/cloudprovider/alicloud/alicloud_instance_types.go +++ b/cluster-autoscaler/cloudprovider/alicloud/alicloud_instance_types.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/alicloud/alibaba-cloud-sdk-go/services/ecs" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/alicloud/alibaba-cloud-sdk-go/services/ess" - "k8s.io/klog" + klog "k8s.io/klog/v2" "time" ) diff --git a/cluster-autoscaler/cloudprovider/alicloud/alicloud_manager.go b/cluster-autoscaler/cloudprovider/alicloud/alicloud_manager.go index 7abbf4ea4b..2b124cde5f 100644 --- a/cluster-autoscaler/cloudprovider/alicloud/alicloud_manager.go +++ b/cluster-autoscaler/cloudprovider/alicloud/alicloud_manager.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/alicloud/alibaba-cloud-sdk-go/services/ess" - "k8s.io/klog" + klog "k8s.io/klog/v2" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "math/rand" "time" diff --git a/cluster-autoscaler/cloudprovider/aws/auto_scaling.go b/cluster-autoscaler/cloudprovider/aws/auto_scaling.go index 00d50df0b8..81a0d4e45a 100644 --- a/cluster-autoscaler/cloudprovider/aws/auto_scaling.go +++ b/cluster-autoscaler/cloudprovider/aws/auto_scaling.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/rand" "k8s.io/client-go/tools/cache" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/cloudprovider/aws/auto_scaling_groups.go b/cluster-autoscaler/cloudprovider/aws/auto_scaling_groups.go index cec6c35987..4915fe1b27 100644 --- a/cluster-autoscaler/cloudprovider/aws/auto_scaling_groups.go +++ b/cluster-autoscaler/cloudprovider/aws/auto_scaling_groups.go @@ -26,7 +26,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/autoscaling" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/cloudprovider/aws/aws_cloud_provider.go b/cluster-autoscaler/cloudprovider/aws/aws_cloud_provider.go index 7475ae0581..b4e276c6fb 100644 --- a/cluster-autoscaler/cloudprovider/aws/aws_cloud_provider.go +++ b/cluster-autoscaler/cloudprovider/aws/aws_cloud_provider.go @@ -28,7 +28,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" "k8s.io/autoscaler/cluster-autoscaler/config" "k8s.io/autoscaler/cluster-autoscaler/utils/errors" - "k8s.io/klog" + klog "k8s.io/klog/v2" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" ) diff --git a/cluster-autoscaler/cloudprovider/aws/aws_manager.go b/cluster-autoscaler/cloudprovider/aws/aws_manager.go index c525b00f9b..279cd44317 100644 --- a/cluster-autoscaler/cloudprovider/aws/aws_manager.go +++ b/cluster-autoscaler/cloudprovider/aws/aws_manager.go @@ -40,7 +40,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" "k8s.io/autoscaler/cluster-autoscaler/utils/gpu" - "k8s.io/klog" + klog "k8s.io/klog/v2" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" provider_aws "k8s.io/legacy-cloud-providers/aws" ) diff --git a/cluster-autoscaler/cloudprovider/aws/aws_util.go b/cluster-autoscaler/cloudprovider/aws/aws_util.go index 23a7ca7252..83ab19e3ed 100644 --- a/cluster-autoscaler/cloudprovider/aws/aws_util.go +++ b/cluster-autoscaler/cloudprovider/aws/aws_util.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/aws/aws-sdk-go/aws/endpoints" "io/ioutil" - "k8s.io/klog" + klog "k8s.io/klog/v2" "net/http" "os" "regexp" diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types/gen.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types/gen.go index 54678621b1..0b28399809 100644 --- a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types/gen.go +++ b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types/gen.go @@ -22,7 +22,7 @@ import ( "flag" "html/template" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/aws" - "k8s.io/klog" + klog "k8s.io/klog/v2" "os" ) diff --git a/cluster-autoscaler/cloudprovider/azure/azure_agent_pool.go b/cluster-autoscaler/cloudprovider/azure/azure_agent_pool.go index ee290c8d77..de1e5f39fb 100644 --- a/cluster-autoscaler/cloudprovider/azure/azure_agent_pool.go +++ b/cluster-autoscaler/cloudprovider/azure/azure_agent_pool.go @@ -33,7 +33,7 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" "k8s.io/autoscaler/cluster-autoscaler/config/dynamic" - "k8s.io/klog" + klog "k8s.io/klog/v2" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" "k8s.io/legacy-cloud-providers/azure/retry" ) diff --git a/cluster-autoscaler/cloudprovider/azure/azure_cache.go b/cluster-autoscaler/cloudprovider/azure/azure_cache.go index 524cd8ccff..effe541765 100644 --- a/cluster-autoscaler/cloudprovider/azure/azure_cache.go +++ b/cluster-autoscaler/cloudprovider/azure/azure_cache.go @@ -23,7 +23,7 @@ import ( "sync" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) var ( diff --git a/cluster-autoscaler/cloudprovider/azure/azure_client.go b/cluster-autoscaler/cloudprovider/azure/azure_client.go index e9035dc11e..2c3cd31b97 100644 --- a/cluster-autoscaler/cloudprovider/azure/azure_client.go +++ b/cluster-autoscaler/cloudprovider/azure/azure_client.go @@ -30,7 +30,7 @@ import ( "github.com/Azure/go-autorest/autorest/adal" "github.com/Azure/go-autorest/autorest/azure" - "k8s.io/klog" + klog "k8s.io/klog/v2" "k8s.io/legacy-cloud-providers/azure/clients/diskclient" "k8s.io/legacy-cloud-providers/azure/clients/interfaceclient" "k8s.io/legacy-cloud-providers/azure/clients/storageaccountclient" diff --git a/cluster-autoscaler/cloudprovider/azure/azure_cloud_provider.go b/cluster-autoscaler/cloudprovider/azure/azure_cloud_provider.go index 83ba036fe3..cec81a1802 100644 --- a/cluster-autoscaler/cloudprovider/azure/azure_cloud_provider.go +++ b/cluster-autoscaler/cloudprovider/azure/azure_cloud_provider.go @@ -25,7 +25,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" "k8s.io/autoscaler/cluster-autoscaler/config" "k8s.io/autoscaler/cluster-autoscaler/utils/errors" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/cloudprovider/azure/azure_instance_types/gen.go b/cluster-autoscaler/cloudprovider/azure/azure_instance_types/gen.go index 99d472e129..ca2495f8c4 100644 --- a/cluster-autoscaler/cloudprovider/azure/azure_instance_types/gen.go +++ b/cluster-autoscaler/cloudprovider/azure/azure_instance_types/gen.go @@ -28,7 +28,7 @@ import ( "strings" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) var packageTemplate = template.Must(template.New("").Parse(`/* diff --git a/cluster-autoscaler/cloudprovider/azure/azure_kubernetes_service_pool.go b/cluster-autoscaler/cloudprovider/azure/azure_kubernetes_service_pool.go index 1c9e7992d1..eac839b0e4 100644 --- a/cluster-autoscaler/cloudprovider/azure/azure_kubernetes_service_pool.go +++ b/cluster-autoscaler/cloudprovider/azure/azure_kubernetes_service_pool.go @@ -23,7 +23,7 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2018-03-31/containerservice" - "k8s.io/klog" + klog "k8s.io/klog/v2" apiv1 "k8s.io/api/core/v1" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" diff --git a/cluster-autoscaler/cloudprovider/azure/azure_manager.go b/cluster-autoscaler/cloudprovider/azure/azure_manager.go index d2b2b0bcda..e0b33bf810 100644 --- a/cluster-autoscaler/cloudprovider/azure/azure_manager.go +++ b/cluster-autoscaler/cloudprovider/azure/azure_manager.go @@ -30,7 +30,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" "k8s.io/autoscaler/cluster-autoscaler/config/dynamic" - "k8s.io/klog" + klog "k8s.io/klog/v2" providerazure "k8s.io/legacy-cloud-providers/azure" azclients "k8s.io/legacy-cloud-providers/azure/clients" "k8s.io/legacy-cloud-providers/azure/retry" diff --git a/cluster-autoscaler/cloudprovider/azure/azure_scale_set.go b/cluster-autoscaler/cloudprovider/azure/azure_scale_set.go index b77a4e46c7..e2b1bf0adb 100644 --- a/cluster-autoscaler/cloudprovider/azure/azure_scale_set.go +++ b/cluster-autoscaler/cloudprovider/azure/azure_scale_set.go @@ -32,7 +32,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/config/dynamic" "k8s.io/autoscaler/cluster-autoscaler/utils/gpu" cloudvolume "k8s.io/cloud-provider/volume" - "k8s.io/klog" + klog "k8s.io/klog/v2" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" "k8s.io/legacy-cloud-providers/azure/retry" diff --git a/cluster-autoscaler/cloudprovider/azure/azure_util.go b/cluster-autoscaler/cloudprovider/azure/azure_util.go index 401660400b..fa6e5cb133 100644 --- a/cluster-autoscaler/cloudprovider/azure/azure_util.go +++ b/cluster-autoscaler/cloudprovider/azure/azure_util.go @@ -38,7 +38,7 @@ import ( "golang.org/x/crypto/pkcs12" "k8s.io/autoscaler/cluster-autoscaler/version" - "k8s.io/klog" + klog "k8s.io/klog/v2" "k8s.io/legacy-cloud-providers/azure/retry" ) diff --git a/cluster-autoscaler/cloudprovider/baiducloud/baiducloud-sdk-go/cce/cluster.go b/cluster-autoscaler/cloudprovider/baiducloud/baiducloud-sdk-go/cce/cluster.go index 9b857c832b..392ed870c1 100644 --- a/cluster-autoscaler/cloudprovider/baiducloud/baiducloud-sdk-go/cce/cluster.go +++ b/cluster-autoscaler/cloudprovider/baiducloud/baiducloud-sdk-go/cce/cluster.go @@ -22,7 +22,7 @@ import ( "fmt" "strconv" - "k8s.io/klog" + klog "k8s.io/klog/v2" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/baiducloud/baiducloud-sdk-go/bce" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/baiducloud/baiducloud-sdk-go/util" diff --git a/cluster-autoscaler/cloudprovider/baiducloud/baiducloud-sdk-go/util/util.go b/cluster-autoscaler/cloudprovider/baiducloud/baiducloud-sdk-go/util/util.go index 627992f0a6..5a937c62f5 100644 --- a/cluster-autoscaler/cloudprovider/baiducloud/baiducloud-sdk-go/util/util.go +++ b/cluster-autoscaler/cloudprovider/baiducloud/baiducloud-sdk-go/util/util.go @@ -42,7 +42,7 @@ import ( "strings" "time" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) // GetURL gets the full URL for a http request. diff --git a/cluster-autoscaler/cloudprovider/baiducloud/baiducloud_auto_scaling_groups.go b/cluster-autoscaler/cloudprovider/baiducloud/baiducloud_auto_scaling_groups.go index 0063bdb95d..a413a0a0a5 100644 --- a/cluster-autoscaler/cloudprovider/baiducloud/baiducloud_auto_scaling_groups.go +++ b/cluster-autoscaler/cloudprovider/baiducloud/baiducloud_auto_scaling_groups.go @@ -21,7 +21,7 @@ import ( "sync" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/baiducloud/baiducloud-sdk-go/cce" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) type autoScalingGroups struct { diff --git a/cluster-autoscaler/cloudprovider/baiducloud/baiducloud_cloud_provider.go b/cluster-autoscaler/cloudprovider/baiducloud/baiducloud_cloud_provider.go index e785ec9837..185f62f0ec 100644 --- a/cluster-autoscaler/cloudprovider/baiducloud/baiducloud_cloud_provider.go +++ b/cluster-autoscaler/cloudprovider/baiducloud/baiducloud_cloud_provider.go @@ -28,7 +28,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/config" "k8s.io/autoscaler/cluster-autoscaler/config/dynamic" "k8s.io/autoscaler/cluster-autoscaler/utils/errors" - "k8s.io/klog" + klog "k8s.io/klog/v2" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" ) diff --git a/cluster-autoscaler/cloudprovider/baiducloud/baiducloud_manager.go b/cluster-autoscaler/cloudprovider/baiducloud/baiducloud_manager.go index aca2524fcc..e1c81835e0 100644 --- a/cluster-autoscaler/cloudprovider/baiducloud/baiducloud_manager.go +++ b/cluster-autoscaler/cloudprovider/baiducloud/baiducloud_manager.go @@ -32,7 +32,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/baiducloud/baiducloud-sdk-go/bce" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/baiducloud/baiducloud-sdk-go/cce" "k8s.io/autoscaler/cluster-autoscaler/utils/gpu" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/cloudprovider/builder/cloud_provider_builder.go b/cluster-autoscaler/cloudprovider/builder/cloud_provider_builder.go index 5fca997e91..8e096661ef 100644 --- a/cluster-autoscaler/cloudprovider/builder/cloud_provider_builder.go +++ b/cluster-autoscaler/cloudprovider/builder/cloud_provider_builder.go @@ -21,7 +21,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/config" "k8s.io/autoscaler/cluster-autoscaler/context" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) // NewCloudProvider builds a cloud provider from provided parameters. diff --git a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_controller.go b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_controller.go index 0acbc6729c..6430b485c7 100644 --- a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_controller.go +++ b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_controller.go @@ -35,7 +35,7 @@ import ( kubeinformers "k8s.io/client-go/informers" kubeclient "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" - "k8s.io/klog" + klog "k8s.io/klog/v2" "k8s.io/utils/pointer" ) diff --git a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_machinedeployment.go b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_machinedeployment.go index fe636c8ffc..7ce675cc80 100644 --- a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_machinedeployment.go +++ b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_machinedeployment.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "k8s.io/klog" + klog "k8s.io/klog/v2" "k8s.io/utils/pointer" ) diff --git a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_machineset.go b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_machineset.go index 97d396c119..5db264e287 100644 --- a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_machineset.go +++ b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_machineset.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "k8s.io/klog" + klog "k8s.io/klog/v2" "k8s.io/utils/pointer" ) diff --git a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_provider.go b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_provider.go index a409257045..63b08a6e2c 100644 --- a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_provider.go +++ b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_provider.go @@ -28,7 +28,7 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/cloudprovider/digitalocean/digitalocean_cloud_provider.go b/cluster-autoscaler/cloudprovider/digitalocean/digitalocean_cloud_provider.go index a9d671b1da..4ad0b94458 100644 --- a/cluster-autoscaler/cloudprovider/digitalocean/digitalocean_cloud_provider.go +++ b/cluster-autoscaler/cloudprovider/digitalocean/digitalocean_cloud_provider.go @@ -27,7 +27,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" "k8s.io/autoscaler/cluster-autoscaler/config" "k8s.io/autoscaler/cluster-autoscaler/utils/errors" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) var _ cloudprovider.CloudProvider = (*digitaloceanCloudProvider)(nil) diff --git a/cluster-autoscaler/cloudprovider/digitalocean/digitalocean_manager.go b/cluster-autoscaler/cloudprovider/digitalocean/digitalocean_manager.go index e670e95a3b..f1450ed06c 100644 --- a/cluster-autoscaler/cloudprovider/digitalocean/digitalocean_manager.go +++ b/cluster-autoscaler/cloudprovider/digitalocean/digitalocean_manager.go @@ -26,7 +26,7 @@ import ( "github.com/digitalocean/godo" "golang.org/x/oauth2" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) var ( diff --git a/cluster-autoscaler/cloudprovider/gce/autoscaling_gce_client.go b/cluster-autoscaler/cloudprovider/gce/autoscaling_gce_client.go index dd02e9d503..d00a5c2797 100644 --- a/cluster-autoscaler/cloudprovider/gce/autoscaling_gce_client.go +++ b/cluster-autoscaler/cloudprovider/gce/autoscaling_gce_client.go @@ -30,7 +30,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/utils/glogx" gce "google.golang.org/api/compute/v1" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/cloudprovider/gce/cache.go b/cluster-autoscaler/cloudprovider/gce/cache.go index 80afc7ffaa..23323e16fa 100644 --- a/cluster-autoscaler/cloudprovider/gce/cache.go +++ b/cluster-autoscaler/cloudprovider/gce/cache.go @@ -25,7 +25,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" gce "google.golang.org/api/compute/v1" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) // MachineTypeKey is used to identify MachineType. diff --git a/cluster-autoscaler/cloudprovider/gce/gce_cloud_provider.go b/cluster-autoscaler/cloudprovider/gce/gce_cloud_provider.go index 2560db5aa7..4161e842f2 100644 --- a/cluster-autoscaler/cloudprovider/gce/gce_cloud_provider.go +++ b/cluster-autoscaler/cloudprovider/gce/gce_cloud_provider.go @@ -27,7 +27,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" "k8s.io/autoscaler/cluster-autoscaler/config" "k8s.io/autoscaler/cluster-autoscaler/utils/errors" - "k8s.io/klog" + klog "k8s.io/klog/v2" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" ) diff --git a/cluster-autoscaler/cloudprovider/gce/gce_manager.go b/cluster-autoscaler/cloudprovider/gce/gce_manager.go index d34d899d70..dfb9f89c3e 100644 --- a/cluster-autoscaler/cloudprovider/gce/gce_manager.go +++ b/cluster-autoscaler/cloudprovider/gce/gce_manager.go @@ -39,7 +39,7 @@ import ( "golang.org/x/oauth2/google" gce "google.golang.org/api/compute/v1" gcfg "gopkg.in/gcfg.v1" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/cloudprovider/gce/mig_target_sizes_provider.go b/cluster-autoscaler/cloudprovider/gce/mig_target_sizes_provider.go index 64150684ba..fc1a557cfc 100644 --- a/cluster-autoscaler/cloudprovider/gce/mig_target_sizes_provider.go +++ b/cluster-autoscaler/cloudprovider/gce/mig_target_sizes_provider.go @@ -18,7 +18,7 @@ package gce import ( "fmt" - "k8s.io/klog" + klog "k8s.io/klog/v2" "sync" ) diff --git a/cluster-autoscaler/cloudprovider/gce/reserved.go b/cluster-autoscaler/cloudprovider/gce/reserved.go index d716b6fc45..04b4eaaa26 100644 --- a/cluster-autoscaler/cloudprovider/gce/reserved.go +++ b/cluster-autoscaler/cloudprovider/gce/reserved.go @@ -16,7 +16,7 @@ limitations under the License. package gce -import "k8s.io/klog" +import klog "k8s.io/klog/v2" // There should be no imports as it is used standalone in e2e tests diff --git a/cluster-autoscaler/cloudprovider/gce/templates.go b/cluster-autoscaler/cloudprovider/gce/templates.go index ca38d734b1..23210fb22d 100644 --- a/cluster-autoscaler/cloudprovider/gce/templates.go +++ b/cluster-autoscaler/cloudprovider/gce/templates.go @@ -31,7 +31,7 @@ import ( kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "github.com/ghodss/yaml" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) // GceTemplateBuilder builds templates for GCE nodes. diff --git a/cluster-autoscaler/cloudprovider/kubemark/kubemark_linux.go b/cluster-autoscaler/cloudprovider/kubemark/kubemark_linux.go index a385f66973..a42a357e61 100644 --- a/cluster-autoscaler/cloudprovider/kubemark/kubemark_linux.go +++ b/cluster-autoscaler/cloudprovider/kubemark/kubemark_linux.go @@ -37,7 +37,7 @@ import ( "k8s.io/kubernetes/pkg/kubemark" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/cloudprovider/kubemark/kubemark_other.go b/cluster-autoscaler/cloudprovider/kubemark/kubemark_other.go index 54bfc7187e..dbd094028d 100644 --- a/cluster-autoscaler/cloudprovider/kubemark/kubemark_other.go +++ b/cluster-autoscaler/cloudprovider/kubemark/kubemark_other.go @@ -26,7 +26,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" "k8s.io/autoscaler/cluster-autoscaler/config" "k8s.io/autoscaler/cluster-autoscaler/utils/errors" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/cloudprovider/magnum/magnum_cloud_provider.go b/cluster-autoscaler/cloudprovider/magnum/magnum_cloud_provider.go index 85787a22cd..d1e7407fb5 100644 --- a/cluster-autoscaler/cloudprovider/magnum/magnum_cloud_provider.go +++ b/cluster-autoscaler/cloudprovider/magnum/magnum_cloud_provider.go @@ -27,7 +27,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/config" "k8s.io/autoscaler/cluster-autoscaler/config/dynamic" "k8s.io/autoscaler/cluster-autoscaler/utils/errors" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/cloudprovider/magnum/magnum_manager_heat.go b/cluster-autoscaler/cloudprovider/magnum/magnum_manager_heat.go index b5b7cffac7..cdae94b3bd 100644 --- a/cluster-autoscaler/cloudprovider/magnum/magnum_manager_heat.go +++ b/cluster-autoscaler/cloudprovider/magnum/magnum_manager_heat.go @@ -37,7 +37,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/config" "k8s.io/autoscaler/cluster-autoscaler/version" certutil "k8s.io/client-go/util/cert" - "k8s.io/klog" + klog "k8s.io/klog/v2" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" ) diff --git a/cluster-autoscaler/cloudprovider/magnum/magnum_nodegroup.go b/cluster-autoscaler/cloudprovider/magnum/magnum_nodegroup.go index 71bc98d18e..acd391dc33 100644 --- a/cluster-autoscaler/cloudprovider/magnum/magnum_nodegroup.go +++ b/cluster-autoscaler/cloudprovider/magnum/magnum_nodegroup.go @@ -23,7 +23,7 @@ import ( apiv1 "k8s.io/api/core/v1" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" - "k8s.io/klog" + klog "k8s.io/klog/v2" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" ) diff --git a/cluster-autoscaler/cloudprovider/packet/packet_cloud_provider.go b/cluster-autoscaler/cloudprovider/packet/packet_cloud_provider.go index 8234b915dd..de57adf6c5 100644 --- a/cluster-autoscaler/cloudprovider/packet/packet_cloud_provider.go +++ b/cluster-autoscaler/cloudprovider/packet/packet_cloud_provider.go @@ -27,7 +27,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/config" "k8s.io/autoscaler/cluster-autoscaler/config/dynamic" "k8s.io/autoscaler/cluster-autoscaler/utils/errors" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/cloudprovider/packet/packet_manager_rest.go b/cluster-autoscaler/cloudprovider/packet/packet_manager_rest.go index a588b2bcda..2edda3d848 100644 --- a/cluster-autoscaler/cloudprovider/packet/packet_manager_rest.go +++ b/cluster-autoscaler/cloudprovider/packet/packet_manager_rest.go @@ -33,7 +33,7 @@ import ( "gopkg.in/gcfg.v1" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" "k8s.io/autoscaler/cluster-autoscaler/config" - "k8s.io/klog" + klog "k8s.io/klog/v2" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" ) diff --git a/cluster-autoscaler/cloudprovider/packet/packet_node_group.go b/cluster-autoscaler/cloudprovider/packet/packet_node_group.go index bb54bb78a7..1ef2f311f0 100644 --- a/cluster-autoscaler/cloudprovider/packet/packet_node_group.go +++ b/cluster-autoscaler/cloudprovider/packet/packet_node_group.go @@ -23,7 +23,7 @@ import ( apiv1 "k8s.io/api/core/v1" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" - "k8s.io/klog" + klog "k8s.io/klog/v2" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" ) diff --git a/cluster-autoscaler/clusterstate/clusterstate.go b/cluster-autoscaler/clusterstate/clusterstate.go index 51097bf93f..53aae7e132 100644 --- a/cluster-autoscaler/clusterstate/clusterstate.go +++ b/cluster-autoscaler/clusterstate/clusterstate.go @@ -36,7 +36,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/clusterstate/utils/node_instances_cache.go b/cluster-autoscaler/clusterstate/utils/node_instances_cache.go index b6dea271b9..ac2723eb4a 100644 --- a/cluster-autoscaler/clusterstate/utils/node_instances_cache.go +++ b/cluster-autoscaler/clusterstate/utils/node_instances_cache.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/clusterstate/utils/status.go b/cluster-autoscaler/clusterstate/utils/status.go index 7a2f6ce51d..f7deb1ef22 100644 --- a/cluster-autoscaler/clusterstate/utils/status.go +++ b/cluster-autoscaler/clusterstate/utils/status.go @@ -29,7 +29,7 @@ import ( kube_client "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/record" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/context/autoscaling_context.go b/cluster-autoscaler/context/autoscaling_context.go index 3130c14704..2dda9ee761 100644 --- a/cluster-autoscaler/context/autoscaling_context.go +++ b/cluster-autoscaler/context/autoscaling_context.go @@ -27,7 +27,7 @@ import ( kube_util "k8s.io/autoscaler/cluster-autoscaler/utils/kubernetes" kube_client "k8s.io/client-go/kubernetes" kube_record "k8s.io/client-go/tools/record" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) // AutoscalingContext contains user-configurable constant and configuration-related objects passed to diff --git a/cluster-autoscaler/core/filter_out_schedulable.go b/cluster-autoscaler/core/filter_out_schedulable.go index 5a2fe86a65..5bd766de17 100644 --- a/cluster-autoscaler/core/filter_out_schedulable.go +++ b/cluster-autoscaler/core/filter_out_schedulable.go @@ -27,7 +27,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/simulator" apiv1 "k8s.io/api/core/v1" - "k8s.io/klog" + klog "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/api/v1/pod" ) diff --git a/cluster-autoscaler/core/scale_down.go b/cluster-autoscaler/core/scale_down.go index a00e004367..390af6d550 100644 --- a/cluster-autoscaler/core/scale_down.go +++ b/cluster-autoscaler/core/scale_down.go @@ -48,7 +48,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/utils/gpu" kube_client "k8s.io/client-go/kubernetes" kube_record "k8s.io/client-go/tools/record" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/core/scale_down_test.go b/cluster-autoscaler/core/scale_down_test.go index f2ed8c5e2e..a6050d5600 100644 --- a/cluster-autoscaler/core/scale_down_test.go +++ b/cluster-autoscaler/core/scale_down_test.go @@ -45,7 +45,7 @@ import ( kube_client "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" - "k8s.io/klog" + klog "k8s.io/klog/v2" "strconv" diff --git a/cluster-autoscaler/core/scale_up.go b/cluster-autoscaler/core/scale_up.go index 33fcdc5c93..eca2aa42ea 100644 --- a/cluster-autoscaler/core/scale_up.go +++ b/cluster-autoscaler/core/scale_up.go @@ -43,7 +43,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/utils/gpu" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) type scaleUpResourcesLimits map[string]int64 diff --git a/cluster-autoscaler/core/static_autoscaler.go b/cluster-autoscaler/core/static_autoscaler.go index 90e98cd6d5..6420e826bb 100644 --- a/cluster-autoscaler/core/static_autoscaler.go +++ b/cluster-autoscaler/core/static_autoscaler.go @@ -45,7 +45,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/utils/taints" "k8s.io/autoscaler/cluster-autoscaler/utils/tpu" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( @@ -484,7 +484,7 @@ func (a *StaticAutoscaler) RunOnce(currentTime time.Time) errors.AutoscalerError metrics.UpdateDurationFromStart(metrics.FindUnneeded, unneededStart) - if klog.V(4) { + if klog.V(4).Enabled() { for key, val := range scaleDown.unneededNodes { klog.Infof("%s is unneeded since %s duration %s", key, val.String(), currentTime.Sub(val).String()) } diff --git a/cluster-autoscaler/core/static_autoscaler_test.go b/cluster-autoscaler/core/static_autoscaler_test.go index 2dd3faec57..50aaa18176 100644 --- a/cluster-autoscaler/core/static_autoscaler_test.go +++ b/cluster-autoscaler/core/static_autoscaler_test.go @@ -47,7 +47,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) type podListerMock struct { diff --git a/cluster-autoscaler/core/utils/expendable.go b/cluster-autoscaler/core/utils/expendable.go index 099f0efb81..dc9e11cd6e 100644 --- a/cluster-autoscaler/core/utils/expendable.go +++ b/cluster-autoscaler/core/utils/expendable.go @@ -18,7 +18,7 @@ package utils import ( apiv1 "k8s.io/api/core/v1" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) // FilterOutExpendableAndSplit filters out expendable pods and splits into: diff --git a/cluster-autoscaler/core/utils/utils.go b/cluster-autoscaler/core/utils/utils.go index f0f82dcc40..0f81bb41f6 100644 --- a/cluster-autoscaler/core/utils/utils.go +++ b/cluster-autoscaler/core/utils/utils.go @@ -35,7 +35,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/utils/taints" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) // GetNodeInfosForGroups finds NodeInfos for all node groups used to manage the given nodes. It also returns a node group to sample node mapping. diff --git a/cluster-autoscaler/estimator/binpacking_estimator.go b/cluster-autoscaler/estimator/binpacking_estimator.go index 46fb8fd250..05ec6fde1e 100644 --- a/cluster-autoscaler/estimator/binpacking_estimator.go +++ b/cluster-autoscaler/estimator/binpacking_estimator.go @@ -24,7 +24,7 @@ import ( apiv1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/autoscaler/cluster-autoscaler/simulator" - "k8s.io/klog" + klog "k8s.io/klog/v2" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" ) diff --git a/cluster-autoscaler/expander/price/price.go b/cluster-autoscaler/expander/price/price.go index c3d621136b..2a79e968b8 100644 --- a/cluster-autoscaler/expander/price/price.go +++ b/cluster-autoscaler/expander/price/price.go @@ -30,7 +30,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/utils/units" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) // ************* diff --git a/cluster-autoscaler/expander/priority/priority.go b/cluster-autoscaler/expander/priority/priority.go index 2f68c2d939..57abd32f6e 100644 --- a/cluster-autoscaler/expander/priority/priority.go +++ b/cluster-autoscaler/expander/priority/priority.go @@ -30,7 +30,7 @@ import ( apiv1 "k8s.io/api/core/v1" v1lister "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/record" - "k8s.io/klog" + klog "k8s.io/klog/v2" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" ) diff --git a/cluster-autoscaler/expander/waste/waste.go b/cluster-autoscaler/expander/waste/waste.go index 5907d73f99..ef799c3273 100644 --- a/cluster-autoscaler/expander/waste/waste.go +++ b/cluster-autoscaler/expander/waste/waste.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "k8s.io/autoscaler/cluster-autoscaler/expander" "k8s.io/autoscaler/cluster-autoscaler/expander/random" - "k8s.io/klog" + klog "k8s.io/klog/v2" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" ) diff --git a/cluster-autoscaler/main.go b/cluster-autoscaler/main.go index b6fc06baa1..552dc54780 100644 --- a/cluster-autoscaler/main.go +++ b/cluster-autoscaler/main.go @@ -56,7 +56,7 @@ import ( kube_flag "k8s.io/component-base/cli/flag" componentbaseconfig "k8s.io/component-base/config" "k8s.io/component-base/metrics/legacyregistry" - "k8s.io/klog" + klog "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/client/leaderelectionconfig" ) diff --git a/cluster-autoscaler/metrics/metrics.go b/cluster-autoscaler/metrics/metrics.go index 44621aba34..25e5a18422 100644 --- a/cluster-autoscaler/metrics/metrics.go +++ b/cluster-autoscaler/metrics/metrics.go @@ -25,7 +25,7 @@ import ( k8smetrics "k8s.io/component-base/metrics" "k8s.io/component-base/metrics/legacyregistry" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) // NodeScaleDownReason describes reason for removing node diff --git a/cluster-autoscaler/processors/nodegroupset/balancing_processor.go b/cluster-autoscaler/processors/nodegroupset/balancing_processor.go index cfd5262021..01950b071b 100644 --- a/cluster-autoscaler/processors/nodegroupset/balancing_processor.go +++ b/cluster-autoscaler/processors/nodegroupset/balancing_processor.go @@ -24,7 +24,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/utils/errors" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) // BalancingNodeGroupSetProcessor tries to keep similar node groups balanced on scale-up. diff --git a/cluster-autoscaler/processors/nodes/pre_filtering_processor.go b/cluster-autoscaler/processors/nodes/pre_filtering_processor.go index 1dde725e50..a40e61e059 100644 --- a/cluster-autoscaler/processors/nodes/pre_filtering_processor.go +++ b/cluster-autoscaler/processors/nodes/pre_filtering_processor.go @@ -20,7 +20,7 @@ import ( "reflect" apiv1 "k8s.io/api/core/v1" - "k8s.io/klog" + klog "k8s.io/klog/v2" "k8s.io/autoscaler/cluster-autoscaler/context" "k8s.io/autoscaler/cluster-autoscaler/utils" diff --git a/cluster-autoscaler/processors/status/eventing_scale_up_processor.go b/cluster-autoscaler/processors/status/eventing_scale_up_processor.go index 9ee6dec100..e589655ee2 100644 --- a/cluster-autoscaler/processors/status/eventing_scale_up_processor.go +++ b/cluster-autoscaler/processors/status/eventing_scale_up_processor.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + klog "k8s.io/klog/v2" apiv1 "k8s.io/api/core/v1" diff --git a/cluster-autoscaler/processors/status/scale_down_status_processor.go b/cluster-autoscaler/processors/status/scale_down_status_processor.go index 789cbc256a..62b7c90e59 100644 --- a/cluster-autoscaler/processors/status/scale_down_status_processor.go +++ b/cluster-autoscaler/processors/status/scale_down_status_processor.go @@ -22,7 +22,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/context" "k8s.io/autoscaler/cluster-autoscaler/simulator" "k8s.io/autoscaler/cluster-autoscaler/utils/drain" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) // ScaleDownStatus represents the state of scale down. diff --git a/cluster-autoscaler/simulator/cluster.go b/cluster-autoscaler/simulator/cluster.go index 5365599ca3..7ed09a9db5 100644 --- a/cluster-autoscaler/simulator/cluster.go +++ b/cluster-autoscaler/simulator/cluster.go @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) var ( diff --git a/cluster-autoscaler/simulator/scheduler_based_predicates_checker.go b/cluster-autoscaler/simulator/scheduler_based_predicates_checker.go index 7fc301886f..7f13acfaea 100644 --- a/cluster-autoscaler/simulator/scheduler_based_predicates_checker.go +++ b/cluster-autoscaler/simulator/scheduler_based_predicates_checker.go @@ -25,7 +25,7 @@ import ( "k8s.io/client-go/informers" kube_client "k8s.io/client-go/kubernetes" v1listers "k8s.io/client-go/listers/core/v1" - "k8s.io/klog" + klog "k8s.io/klog/v2" volume_scheduling "k8s.io/kubernetes/pkg/controller/volume/scheduling" scheduler_apis_config "k8s.io/kubernetes/pkg/scheduler/apis/config" scheduler_plugins "k8s.io/kubernetes/pkg/scheduler/framework/plugins" diff --git a/cluster-autoscaler/utils/deletetaint/delete.go b/cluster-autoscaler/utils/deletetaint/delete.go index b3ea3dda57..308a7eb827 100644 --- a/cluster-autoscaler/utils/deletetaint/delete.go +++ b/cluster-autoscaler/utils/deletetaint/delete.go @@ -28,7 +28,7 @@ import ( kube_client "k8s.io/client-go/kubernetes" kube_record "k8s.io/client-go/tools/record" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/utils/glogx/defaults.go b/cluster-autoscaler/utils/glogx/defaults.go index 2ba8d22827..65b513e20b 100644 --- a/cluster-autoscaler/utils/glogx/defaults.go +++ b/cluster-autoscaler/utils/glogx/defaults.go @@ -16,7 +16,7 @@ limitations under the License. package glogx -import "k8s.io/klog" +import klog "k8s.io/klog/v2" const ( // MaxPodsLogged is the maximum number of pods for which we will diff --git a/cluster-autoscaler/utils/glogx/glogx.go b/cluster-autoscaler/utils/glogx/glogx.go index 1b274ca044..b256b65d9a 100644 --- a/cluster-autoscaler/utils/glogx/glogx.go +++ b/cluster-autoscaler/utils/glogx/glogx.go @@ -17,7 +17,7 @@ limitations under the License. package glogx import ( - "k8s.io/klog" + klog "k8s.io/klog/v2" ) type quota struct { diff --git a/cluster-autoscaler/utils/glogx/glogx_test.go b/cluster-autoscaler/utils/glogx/glogx_test.go index 3f952ace30..ae489f4a94 100644 --- a/cluster-autoscaler/utils/glogx/glogx_test.go +++ b/cluster-autoscaler/utils/glogx/glogx_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) // Left, UpTo and Over should work as expected. diff --git a/cluster-autoscaler/utils/gpu/gpu.go b/cluster-autoscaler/utils/gpu/gpu.go index 794a9775e6..525758d2be 100644 --- a/cluster-autoscaler/utils/gpu/gpu.go +++ b/cluster-autoscaler/utils/gpu/gpu.go @@ -22,7 +22,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/utils/errors" "k8s.io/autoscaler/cluster-autoscaler/utils/kubernetes" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/utils/kubernetes/event_sink_logging_wrapper.go b/cluster-autoscaler/utils/kubernetes/event_sink_logging_wrapper.go index 6a44f51ef7..20ff3e875f 100644 --- a/cluster-autoscaler/utils/kubernetes/event_sink_logging_wrapper.go +++ b/cluster-autoscaler/utils/kubernetes/event_sink_logging_wrapper.go @@ -19,7 +19,7 @@ package kubernetes import ( clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) type eventSinkLoggingWrapper struct { diff --git a/cluster-autoscaler/utils/taints/taints.go b/cluster-autoscaler/utils/taints/taints.go index 2b416a15e3..83574c0f0b 100644 --- a/cluster-autoscaler/utils/taints/taints.go +++ b/cluster-autoscaler/utils/taints/taints.go @@ -24,7 +24,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/utils/deletetaint" cloudproviderapi "k8s.io/cloud-provider/api" - "k8s.io/klog" + klog "k8s.io/klog/v2" ) const ( diff --git a/cluster-autoscaler/utils/utils.go b/cluster-autoscaler/utils/utils.go index 782c42e994..8ba4c642b3 100644 --- a/cluster-autoscaler/utils/utils.go +++ b/cluster-autoscaler/utils/utils.go @@ -18,7 +18,7 @@ package utils import ( apiv1 "k8s.io/api/core/v1" - "k8s.io/klog" + klog "k8s.io/klog/v2" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" )