Migrate to klog v2

2020-06-05 15:32:37 +02:00 · 2020-06-05 15:32:37 +02:00 · 655b4081f4
parent b0fcd7d1f1
commit 655b4081f4
81 changed files with 82 additions and 82 deletions
--- 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"
 )

--- 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"
 )

--- 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 {
--- 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"
 )

--- 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 (
--- 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"
 )

--- 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"
--- 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 (
--- 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 (
--- 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"
 )

--- 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"
 )
--- 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"
--- 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"
 )

--- 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"
 )
--- 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 (
--- 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"
--- 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 (
--- 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(`/*
--- 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"
--- 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"
--- 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"
--- 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"
 )

--- 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"
--- 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.
--- 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 {
--- 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"
 )

--- 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 (
--- 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.
--- 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"
 )

--- 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"
 )

--- 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"
 )

--- 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 (
--- 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)
--- 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 (
--- 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 (
--- 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.
--- 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"
 )

--- 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 (
--- 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"
 )

--- 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

--- 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.
--- 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 (
--- 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 (
--- 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 (
--- 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"
 )

--- 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"
 )

--- 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 (
--- 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"
 )

--- 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"
 )

--- 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 (
--- 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 (
--- 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 (
--- 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
--- 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"
 )

--- 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 (
--- 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"

--- 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
--- 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())
 			}
--- 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 {
--- 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:
--- 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.
--- 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"
 )

--- 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"
 )

 // *************
--- 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"
 )

--- 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"
 )

--- 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"
 )

--- 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
--- 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.
--- 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"
--- 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"

--- 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.
--- 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 (
--- 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"
--- 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 (
--- 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
--- 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 {
--- 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.
--- 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 (
--- 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 {
--- 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 (
--- 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"
 )