From 4d9f0128a30ada4d7c975a93b30d78bb9513502a Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Sun, 16 Aug 2020 10:47:16 -0500 Subject: [PATCH] Upgrade to klog2 This splits up the kubernetes 1.19 PR to make it easier to keep up to date until we get it sorted out. --- channels/cmd/channels/BUILD.bazel | 2 +- channels/cmd/channels/main.go | 2 +- channels/pkg/channels/BUILD.bazel | 2 +- channels/pkg/channels/addon.go | 2 +- channels/pkg/channels/addons.go | 2 +- channels/pkg/channels/apply.go | 2 +- channels/pkg/channels/channel_version.go | 2 +- cloudmock/aws/mockautoscaling/BUILD.bazel | 2 +- cloudmock/aws/mockautoscaling/attach.go | 2 +- cloudmock/aws/mockautoscaling/group.go | 2 +- .../mockautoscaling/launchconfigurations.go | 2 +- cloudmock/aws/mockautoscaling/tags.go | 2 +- cloudmock/aws/mockec2/BUILD.bazel | 2 +- cloudmock/aws/mockec2/address.go | 2 +- cloudmock/aws/mockec2/dhcpoptions.go | 2 +- cloudmock/aws/mockec2/images.go | 2 +- cloudmock/aws/mockec2/instances.go | 2 +- cloudmock/aws/mockec2/internetgateways.go | 2 +- cloudmock/aws/mockec2/keypairs.go | 2 +- cloudmock/aws/mockec2/natgateway.go | 2 +- cloudmock/aws/mockec2/routetable.go | 2 +- cloudmock/aws/mockec2/securitygroups.go | 2 +- cloudmock/aws/mockec2/subnets.go | 2 +- cloudmock/aws/mockec2/tags.go | 2 +- cloudmock/aws/mockec2/volumes.go | 2 +- cloudmock/aws/mockec2/vpcs.go | 2 +- cloudmock/aws/mockelb/BUILD.bazel | 2 +- cloudmock/aws/mockelb/api.go | 2 +- cloudmock/aws/mockelb/attributes.go | 2 +- cloudmock/aws/mockelb/healthcheck.go | 2 +- cloudmock/aws/mockelb/tags.go | 2 +- cloudmock/aws/mockelbv2/BUILD.bazel | 2 +- cloudmock/aws/mockelbv2/api.go | 2 +- cloudmock/aws/mockiam/BUILD.bazel | 2 +- cloudmock/aws/mockiam/iaminstanceprofile.go | 2 +- cloudmock/aws/mockiam/iamrole.go | 2 +- cloudmock/aws/mockiam/iamrolepolicy.go | 2 +- cloudmock/aws/mockiam/oidcprovider.go | 2 +- cloudmock/aws/mockroute53/BUILD.bazel | 2 +- cloudmock/aws/mockroute53/records.go | 2 +- cloudmock/aws/mockroute53/zones.go | 2 +- cmd/kops-controller/BUILD.bazel | 2 +- cmd/kops-controller/controllers/BUILD.bazel | 2 +- .../controllers/node_controller.go | 2 +- cmd/kops-controller/main.go | 2 +- cmd/kops/BUILD.bazel | 2 +- cmd/kops/create.go | 2 +- cmd/kops/create_cluster.go | 2 +- cmd/kops/create_ig.go | 2 +- cmd/kops/create_secret_keypair_ca.go | 2 +- cmd/kops/delete.go | 2 +- cmd/kops/delete_cluster.go | 2 +- cmd/kops/edit_instancegroup.go | 2 +- cmd/kops/get_secrets.go | 2 +- cmd/kops/replace.go | 2 +- cmd/kops/root.go | 2 +- cmd/kops/toolbox_dump.go | 2 +- cmd/kops/update_cluster.go | 2 +- cmd/kops/upgrade_cluster.go | 2 +- cmd/kops/util/BUILD.bazel | 2 +- cmd/kops/util/factory.go | 2 +- cmd/kops/validate_cluster.go | 2 +- cmd/kube-apiserver-healthcheck/BUILD.bazel | 2 +- cmd/kube-apiserver-healthcheck/main.go | 2 +- cmd/nodeup/BUILD.bazel | 2 +- cmd/nodeup/main.go | 2 +- dns-controller/cmd/dns-controller/BUILD.bazel | 2 +- dns-controller/cmd/dns-controller/main.go | 2 +- dns-controller/pkg/dns/BUILD.bazel | 2 +- dns-controller/pkg/dns/dnscache.go | 2 +- dns-controller/pkg/dns/dnscontroller.go | 2 +- dns-controller/pkg/dns/zonespec.go | 2 +- dns-controller/pkg/util/BUILD.bazel | 2 +- dns-controller/pkg/util/stoppable.go | 2 +- dns-controller/pkg/watchers/BUILD.bazel | 2 +- dns-controller/pkg/watchers/ingress.go | 2 +- dns-controller/pkg/watchers/node.go | 2 +- dns-controller/pkg/watchers/pod.go | 2 +- dns-controller/pkg/watchers/service.go | 2 +- dnsprovider/pkg/dnsprovider/BUILD.bazel | 2 +- dnsprovider/pkg/dnsprovider/plugins.go | 2 +- .../providers/aws/route53/BUILD.bazel | 2 +- .../providers/aws/route53/route53.go | 2 +- .../providers/aws/route53/rrchangeset.go | 4 +- .../dnsprovider/providers/coredns/BUILD.bazel | 2 +- .../dnsprovider/providers/coredns/coredns.go | 2 +- .../dnsprovider/providers/coredns/rrsets.go | 2 +- .../providers/google/clouddns/BUILD.bazel | 2 +- .../providers/google/clouddns/clouddns.go | 2 +- .../providers/openstack/designate/BUILD.bazel | 2 +- .../openstack/designate/designate.go | 2 +- docs/cli/kops.md | 2 +- docs/cli/kops_completion.md | 2 +- docs/cli/kops_create.md | 2 +- docs/cli/kops_create_cluster.md | 2 +- docs/cli/kops_create_instancegroup.md | 2 +- docs/cli/kops_create_secret.md | 2 +- docs/cli/kops_create_secret_ciliumpassword.md | 2 +- docs/cli/kops_create_secret_dockerconfig.md | 2 +- .../kops_create_secret_encryptionconfig.md | 2 +- docs/cli/kops_create_secret_keypair.md | 2 +- docs/cli/kops_create_secret_keypair_ca.md | 2 +- docs/cli/kops_create_secret_sshpublickey.md | 2 +- docs/cli/kops_create_secret_weavepassword.md | 2 +- docs/cli/kops_delete.md | 2 +- docs/cli/kops_delete_cluster.md | 2 +- docs/cli/kops_delete_instancegroup.md | 2 +- docs/cli/kops_delete_secret.md | 2 +- docs/cli/kops_describe.md | 2 +- docs/cli/kops_describe_secrets.md | 2 +- docs/cli/kops_edit.md | 2 +- docs/cli/kops_edit_cluster.md | 2 +- docs/cli/kops_edit_instancegroup.md | 2 +- docs/cli/kops_export.md | 2 +- docs/cli/kops_export_kubecfg.md | 2 +- docs/cli/kops_get.md | 2 +- docs/cli/kops_get_clusters.md | 2 +- docs/cli/kops_get_instancegroups.md | 2 +- docs/cli/kops_get_secrets.md | 2 +- docs/cli/kops_import.md | 2 +- docs/cli/kops_import_cluster.md | 2 +- docs/cli/kops_replace.md | 2 +- docs/cli/kops_rolling-update.md | 2 +- docs/cli/kops_rolling-update_cluster.md | 2 +- docs/cli/kops_set.md | 2 +- docs/cli/kops_set_cluster.md | 2 +- docs/cli/kops_toolbox.md | 2 +- docs/cli/kops_toolbox_convert-imported.md | 2 +- docs/cli/kops_toolbox_dump.md | 2 +- docs/cli/kops_toolbox_instance-selector.md | 2 +- docs/cli/kops_toolbox_template.md | 2 +- docs/cli/kops_update.md | 2 +- docs/cli/kops_update_cluster.md | 2 +- docs/cli/kops_upgrade.md | 2 +- docs/cli/kops_upgrade_cluster.md | 2 +- docs/cli/kops_validate.md | 2 +- docs/cli/kops_validate_cluster.md | 2 +- docs/cli/kops_version.md | 2 +- go.mod | 4 +- go.sum | 6 + nodeup/pkg/bootstrap/BUILD.bazel | 2 +- nodeup/pkg/bootstrap/install.go | 2 +- nodeup/pkg/distros/BUILD.bazel | 2 +- nodeup/pkg/distros/distribution.go | 2 +- nodeup/pkg/distros/identify.go | 2 +- nodeup/pkg/model/BUILD.bazel | 4 +- nodeup/pkg/model/containerd.go | 2 +- nodeup/pkg/model/context.go | 2 +- nodeup/pkg/model/docker.go | 2 +- nodeup/pkg/model/etcd.go | 2 +- nodeup/pkg/model/firewall.go | 2 +- nodeup/pkg/model/hooks.go | 2 +- nodeup/pkg/model/kube_proxy.go | 2 +- nodeup/pkg/model/kubectl.go | 2 +- nodeup/pkg/model/kubelet.go | 2 +- nodeup/pkg/model/kubelet_test.go | 2 +- nodeup/pkg/model/logrotate.go | 2 +- nodeup/pkg/model/miscutils.go | 2 +- nodeup/pkg/model/networking/BUILD.bazel | 2 +- nodeup/pkg/model/networking/lyft.go | 2 +- nodeup/pkg/model/node_authorizer.go | 2 +- nodeup/pkg/model/ntp.go | 2 +- nodeup/pkg/model/packages.go | 2 +- nodeup/pkg/model/protokube.go | 2 +- nodeup/pkg/model/update_service.go | 2 +- nodeup/pkg/model/volumes.go | 2 +- pkg/acls/gce/BUILD.bazel | 2 +- pkg/acls/gce/storage.go | 2 +- pkg/acls/s3/BUILD.bazel | 2 +- pkg/acls/s3/storage.go | 2 +- pkg/apis/kops/BUILD.bazel | 2 +- pkg/apis/kops/channel.go | 2 +- pkg/apis/kops/instancegroup.go | 2 +- pkg/apis/kops/status.go | 2 +- pkg/apis/kops/util/BUILD.bazel | 2 +- pkg/apis/kops/util/versions.go | 2 +- pkg/apis/kops/v1alpha2/BUILD.bazel | 2 +- pkg/apis/kops/v1alpha2/defaults.go | 2 +- pkg/assets/BUILD.bazel | 2 +- pkg/assets/builder.go | 2 +- pkg/backoff/BUILD.bazel | 2 +- pkg/backoff/global.go | 2 +- pkg/client/simple/api/BUILD.bazel | 2 +- pkg/client/simple/api/clientset.go | 2 +- pkg/client/simple/vfsclientset/BUILD.bazel | 2 +- pkg/client/simple/vfsclientset/clientset.go | 2 +- pkg/client/simple/vfsclientset/cluster.go | 2 +- pkg/client/simple/vfsclientset/commonvfs.go | 2 +- .../simple/vfsclientset/instancegroup.go | 2 +- pkg/cloudinstances/BUILD.bazel | 2 +- pkg/cloudinstances/cloud_instance_group.go | 2 +- pkg/configbuilder/BUILD.bazel | 2 +- pkg/configbuilder/buildconfigfile.go | 2 +- pkg/diff/BUILD.bazel | 2 +- pkg/diff/diff.go | 2 +- pkg/dump/BUILD.bazel | 2 +- pkg/dump/dumper.go | 2 +- pkg/featureflag/BUILD.bazel | 4 +- pkg/featureflag/featureflag.go | 2 +- pkg/featureflag/featureflag_test.go | 2 +- pkg/flagbuilder/BUILD.bazel | 2 +- pkg/flagbuilder/build_flags.go | 2 +- pkg/formatter/BUILD.bazel | 2 +- pkg/formatter/instancegroup.go | 2 +- pkg/instancegroups/BUILD.bazel | 2 +- pkg/instancegroups/delete.go | 2 +- pkg/instancegroups/instancegroups.go | 2 +- pkg/instancegroups/rollingupdate.go | 2 +- pkg/k8scodecs/BUILD.bazel | 2 +- pkg/k8scodecs/codecs.go | 2 +- pkg/kopscodecs/BUILD.bazel | 2 +- pkg/kopscodecs/codecs.go | 2 +- pkg/kubeconfig/BUILD.bazel | 2 +- pkg/kubeconfig/create_kubecfg.go | 2 +- pkg/kubeconfig/kubecfg_builder.go | 2 +- pkg/kubemanifest/BUILD.bazel | 2 +- pkg/kubemanifest/images.go | 2 +- pkg/kubemanifest/manifest.go | 2 +- pkg/kubemanifest/visitor.go | 2 +- pkg/model/BUILD.bazel | 2 +- pkg/model/alimodel/BUILD.bazel | 2 +- pkg/model/alimodel/context.go | 2 +- pkg/model/alimodel/external_access.go | 2 +- pkg/model/alimodel/policy_builder.go | 2 +- pkg/model/awsmodel/BUILD.bazel | 2 +- pkg/model/awsmodel/api_loadbalancer.go | 2 +- pkg/model/awsmodel/autoscalinggroup.go | 2 +- pkg/model/bootstrapscript.go | 2 +- pkg/model/components/BUILD.bazel | 2 +- pkg/model/components/containerd.go | 2 +- pkg/model/components/context.go | 2 +- pkg/model/components/etcdmanager/BUILD.bazel | 2 +- pkg/model/components/etcdmanager/model.go | 2 +- pkg/model/components/etcdmanager/options.go | 2 +- pkg/model/components/kubecontrollermanager.go | 2 +- pkg/model/components/kubelet.go | 2 +- pkg/model/context.go | 2 +- pkg/model/external_access.go | 2 +- pkg/model/firewall.go | 2 +- pkg/model/gcemodel/BUILD.bazel | 2 +- pkg/model/gcemodel/autoscalinggroup.go | 2 +- pkg/model/gcemodel/external_access.go | 2 +- pkg/model/gcemodel/firewall.go | 2 +- pkg/model/gcemodel/storageacl.go | 2 +- pkg/model/iam.go | 2 +- pkg/model/iam/BUILD.bazel | 2 +- pkg/model/iam/iam_builder.go | 2 +- pkg/model/manifests.go | 2 +- pkg/model/names.go | 2 +- pkg/model/network.go | 2 +- pkg/model/openstackmodel/BUILD.bazel | 2 +- pkg/model/openstackmodel/context.go | 2 +- pkg/model/openstackmodel/firewall.go | 2 +- pkg/model/openstackmodel/servergroup.go | 2 +- pkg/model/spotinstmodel/BUILD.bazel | 2 +- pkg/model/spotinstmodel/instance_group.go | 2 +- pkg/nodeidentity/aws/BUILD.bazel | 2 +- pkg/nodeidentity/aws/identify.go | 2 +- pkg/nodeidentity/gce/BUILD.bazel | 2 +- pkg/nodeidentity/gce/identify.go | 2 +- pkg/pki/BUILD.bazel | 2 +- pkg/pki/cert_utils.go | 2 +- pkg/pki/certificate.go | 2 +- pkg/pki/csr.go | 2 +- pkg/pki/privatekey.go | 2 +- pkg/resources/BUILD.bazel | 2 +- pkg/resources/ali/BUILD.bazel | 2 +- pkg/resources/ali/ali.go | 2 +- pkg/resources/aws/BUILD.bazel | 2 +- pkg/resources/aws/aws.go | 2 +- pkg/resources/aws/errors.go | 2 +- pkg/resources/aws/routetable.go | 2 +- pkg/resources/aws/securitygroup.go | 2 +- pkg/resources/aws/tags.go | 2 +- pkg/resources/aws/vpc.go | 2 +- pkg/resources/digitalocean/BUILD.bazel | 2 +- pkg/resources/digitalocean/cloud.go | 2 +- pkg/resources/digitalocean/dns/BUILD.bazel | 2 +- pkg/resources/digitalocean/dns/dns.go | 2 +- pkg/resources/digitalocean/resources.go | 2 +- pkg/resources/dump.go | 2 +- pkg/resources/gce/BUILD.bazel | 2 +- pkg/resources/gce/dump.go | 2 +- pkg/resources/gce/gce.go | 2 +- pkg/resources/openstack/BUILD.bazel | 2 +- pkg/resources/openstack/lb.go | 2 +- pkg/resources/ops/BUILD.bazel | 2 +- pkg/resources/ops/delete.go | 2 +- pkg/resources/spotinst/BUILD.bazel | 2 +- pkg/resources/spotinst/resources.go | 2 +- pkg/resources/spotinst/spotinst.go | 2 +- pkg/systemd/BUILD.bazel | 2 +- pkg/systemd/escaping.go | 2 +- pkg/templates/BUILD.bazel | 2 +- pkg/templates/templates.go | 2 +- pkg/testutils/BUILD.bazel | 2 +- pkg/testutils/integrationtestharness.go | 2 +- pkg/try/BUILD.bazel | 2 +- pkg/try/files.go | 2 +- pkg/util/stringorslice/BUILD.bazel | 2 +- pkg/util/stringorslice/stringorslice_test.go | 2 +- pkg/validation/BUILD.bazel | 2 +- pkg/validation/node_conditions.go | 2 +- pkg/validation/validate_cluster.go | 2 +- protokube/cmd/protokube/BUILD.bazel | 2 +- protokube/cmd/protokube/dns_cleanup.go | 2 +- protokube/cmd/protokube/main.go | 2 +- protokube/pkg/gossip/dns/BUILD.bazel | 2 +- protokube/pkg/gossip/dns/dns.go | 2 +- protokube/pkg/gossip/dns/hosts.go | 2 +- protokube/pkg/gossip/dns/hosts/BUILD.bazel | 2 +- protokube/pkg/gossip/dns/hosts/hosts.go | 2 +- protokube/pkg/gossip/do/BUILD.bazel | 2 +- protokube/pkg/gossip/do/seeds.go | 2 +- protokube/pkg/gossip/gce/BUILD.bazel | 2 +- protokube/pkg/gossip/gce/seeds.go | 2 +- protokube/pkg/gossip/memberlist/BUILD.bazel | 2 +- protokube/pkg/gossip/memberlist/gossip.go | 2 +- protokube/pkg/gossip/memberlist/state.go | 2 +- protokube/pkg/gossip/mesh/BUILD.bazel | 2 +- protokube/pkg/gossip/mesh/glogger.go | 2 +- protokube/pkg/gossip/mesh/gossip.go | 2 +- protokube/pkg/gossip/mesh/peer.go | 2 +- protokube/pkg/gossip/openstack/BUILD.bazel | 2 +- protokube/pkg/gossip/openstack/seeds.go | 2 +- protokube/pkg/hostmount/BUILD.bazel | 4 +- protokube/pkg/hostmount/nsenter_linux.go | 2 +- protokube/pkg/protokube/BUILD.bazel | 2 +- protokube/pkg/protokube/ali_volume.go | 2 +- protokube/pkg/protokube/aws_volume.go | 2 +- protokube/pkg/protokube/channels.go | 2 +- protokube/pkg/protokube/etcd_cluster.go | 2 +- protokube/pkg/protokube/gce_volume.go | 2 +- protokube/pkg/protokube/kube_boot.go | 2 +- protokube/pkg/protokube/kube_boot_task.go | 2 +- protokube/pkg/protokube/kube_dns.go | 2 +- protokube/pkg/protokube/labeler.go | 2 +- protokube/pkg/protokube/openstack_volume.go | 2 +- protokube/pkg/protokube/rbac.go | 2 +- protokube/pkg/protokube/tainter.go | 2 +- protokube/pkg/protokube/volume_mounter.go | 2 +- upup/pkg/fi/BUILD.bazel | 2 +- upup/pkg/fi/assetstore.go | 2 +- upup/pkg/fi/assettasks/BUILD.bazel | 2 +- upup/pkg/fi/assettasks/copydockerimage.go | 2 +- upup/pkg/fi/assettasks/copyfile.go | 2 +- upup/pkg/fi/assettasks/docker_api.go | 2 +- upup/pkg/fi/assettasks/docker_cli.go | 2 +- upup/pkg/fi/changes.go | 2 +- upup/pkg/fi/clientset_castore.go | 2 +- upup/pkg/fi/cloudup/BUILD.bazel | 4 +- upup/pkg/fi/cloudup/alitasks/BUILD.bazel | 2 +- upup/pkg/fi/cloudup/alitasks/disk.go | 2 +- .../alitasks/eip_natgateway_association.go | 2 +- .../cloudup/alitasks/launchconfiguration.go | 2 +- upup/pkg/fi/cloudup/alitasks/loadbalancer.go | 2 +- .../fi/cloudup/alitasks/loadbalanceracl.go | 2 +- .../cloudup/alitasks/loadbalancerlistener.go | 2 +- upup/pkg/fi/cloudup/alitasks/natgateway.go | 2 +- upup/pkg/fi/cloudup/alitasks/rampolicy.go | 2 +- upup/pkg/fi/cloudup/alitasks/ramrole.go | 2 +- upup/pkg/fi/cloudup/alitasks/scalinggroup.go | 2 +- upup/pkg/fi/cloudup/alitasks/securitygroup.go | 2 +- .../fi/cloudup/alitasks/securitygrouprule.go | 2 +- upup/pkg/fi/cloudup/alitasks/sshkey.go | 2 +- upup/pkg/fi/cloudup/alitasks/vpc.go | 2 +- upup/pkg/fi/cloudup/alitasks/vswitch.go | 2 +- upup/pkg/fi/cloudup/alitasks/vswitchSNAT.go | 2 +- upup/pkg/fi/cloudup/aliup/BUILD.bazel | 2 +- upup/pkg/fi/cloudup/aliup/ali_cloud.go | 2 +- upup/pkg/fi/cloudup/aliup/status.go | 2 +- upup/pkg/fi/cloudup/apply_cluster.go | 2 +- upup/pkg/fi/cloudup/awstasks/BUILD.bazel | 2 +- .../fi/cloudup/awstasks/autoscalinggroup.go | 2 +- upup/pkg/fi/cloudup/awstasks/dhcp_options.go | 2 +- upup/pkg/fi/cloudup/awstasks/dnsname.go | 2 +- upup/pkg/fi/cloudup/awstasks/dnszone.go | 2 +- upup/pkg/fi/cloudup/awstasks/ebsvolume.go | 2 +- upup/pkg/fi/cloudup/awstasks/elastic_ip.go | 2 +- .../external_load_balancer_attachment.go | 2 +- .../external_target_group_attachment.go | 2 +- .../fi/cloudup/awstasks/iaminstanceprofile.go | 2 +- .../awstasks/iaminstanceprofilerole.go | 2 +- .../fi/cloudup/awstasks/iamoidcprovider.go | 2 +- upup/pkg/fi/cloudup/awstasks/iamrole.go | 2 +- upup/pkg/fi/cloudup/awstasks/iamrolepolicy.go | 2 +- upup/pkg/fi/cloudup/awstasks/instance.go | 2 +- .../awstasks/instance_elasticip_attachment.go | 2 +- .../awstasks/instance_volume_attachment.go | 2 +- .../fi/cloudup/awstasks/internetgateway.go | 2 +- .../cloudup/awstasks/launchconfiguration.go | 2 +- .../pkg/fi/cloudup/awstasks/launchtemplate.go | 2 +- .../awstasks/launchtemplate_target_api.go | 2 +- upup/pkg/fi/cloudup/awstasks/load_balancer.go | 2 +- .../awstasks/load_balancer_attachment.go | 2 +- .../awstasks/loadbalancer_attributes.go | 2 +- upup/pkg/fi/cloudup/awstasks/natgateway.go | 2 +- upup/pkg/fi/cloudup/awstasks/route.go | 2 +- upup/pkg/fi/cloudup/awstasks/routetable.go | 2 +- .../cloudup/awstasks/routetableassociation.go | 2 +- upup/pkg/fi/cloudup/awstasks/securitygroup.go | 2 +- .../fi/cloudup/awstasks/securitygrouprule.go | 2 +- upup/pkg/fi/cloudup/awstasks/sshkey.go | 2 +- upup/pkg/fi/cloudup/awstasks/subnet.go | 2 +- upup/pkg/fi/cloudup/awstasks/vpc.go | 2 +- .../awstasks/vpc_dhcpoptions_association.go | 2 +- upup/pkg/fi/cloudup/awsup/BUILD.bazel | 2 +- upup/pkg/fi/cloudup/awsup/aws_apitarget.go | 2 +- upup/pkg/fi/cloudup/awsup/aws_cloud.go | 2 +- upup/pkg/fi/cloudup/awsup/aws_utils.go | 2 +- upup/pkg/fi/cloudup/awsup/instancegroups.go | 2 +- upup/pkg/fi/cloudup/awsup/logging_retryer.go | 2 +- upup/pkg/fi/cloudup/awsup/machine_types.go | 2 +- upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go | 2 +- upup/pkg/fi/cloudup/awsup/request_logger.go | 2 +- upup/pkg/fi/cloudup/awsup/status.go | 2 +- .../pkg/fi/cloudup/bootstrapchannelbuilder.go | 2 +- .../pkg/fi/cloudup/cloudformation/BUILD.bazel | 2 +- upup/pkg/fi/cloudup/cloudformation/target.go | 2 +- upup/pkg/fi/cloudup/defaults.go | 2 +- upup/pkg/fi/cloudup/dns.go | 2 +- upup/pkg/fi/cloudup/dotasks/BUILD.bazel | 2 +- upup/pkg/fi/cloudup/dotasks/droplet.go | 2 +- upup/pkg/fi/cloudup/dotasks/loadbalancer.go | 2 +- upup/pkg/fi/cloudup/dotasks/volume.go | 2 +- upup/pkg/fi/cloudup/gce/BUILD.bazel | 2 +- upup/pkg/fi/cloudup/gce/gce_cloud.go | 2 +- upup/pkg/fi/cloudup/gce/instancegroups.go | 2 +- upup/pkg/fi/cloudup/gce/mock_gce_cloud.go | 2 +- upup/pkg/fi/cloudup/gce/network.go | 2 +- upup/pkg/fi/cloudup/gce/op.go | 2 +- upup/pkg/fi/cloudup/gce/status.go | 2 +- upup/pkg/fi/cloudup/gce/wrappers.go | 2 +- upup/pkg/fi/cloudup/gcetasks/BUILD.bazel | 2 +- upup/pkg/fi/cloudup/gcetasks/address.go | 2 +- upup/pkg/fi/cloudup/gcetasks/disk.go | 2 +- .../pkg/fi/cloudup/gcetasks/forwardingrule.go | 2 +- upup/pkg/fi/cloudup/gcetasks/instance.go | 2 +- .../fi/cloudup/gcetasks/instancetemplate.go | 4 +- upup/pkg/fi/cloudup/gcetasks/network.go | 2 +- .../fi/cloudup/gcetasks/storagebucketacl.go | 2 +- .../fi/cloudup/gcetasks/storagebucketiam.go | 2 +- .../fi/cloudup/gcetasks/storageobjectacl.go | 2 +- upup/pkg/fi/cloudup/gcetasks/subnet.go | 2 +- upup/pkg/fi/cloudup/gcetasks/targetpool.go | 2 +- upup/pkg/fi/cloudup/loader.go | 2 +- upup/pkg/fi/cloudup/networking.go | 2 +- upup/pkg/fi/cloudup/new_cluster.go | 2 +- upup/pkg/fi/cloudup/openstack/BUILD.bazel | 2 +- upup/pkg/fi/cloudup/openstack/cloud.go | 2 +- upup/pkg/fi/cloudup/openstack/instance.go | 2 +- upup/pkg/fi/cloudup/openstack/server_group.go | 2 +- upup/pkg/fi/cloudup/openstack/status.go | 2 +- upup/pkg/fi/cloudup/openstack/volume.go | 2 +- .../pkg/fi/cloudup/openstacktasks/BUILD.bazel | 2 +- .../fi/cloudup/openstacktasks/floatingip.go | 2 +- .../pkg/fi/cloudup/openstacktasks/instance.go | 2 +- upup/pkg/fi/cloudup/openstacktasks/lb.go | 2 +- .../fi/cloudup/openstacktasks/lblistener.go | 2 +- upup/pkg/fi/cloudup/openstacktasks/lbpool.go | 2 +- upup/pkg/fi/cloudup/openstacktasks/network.go | 2 +- .../cloudup/openstacktasks/poolassociation.go | 2 +- upup/pkg/fi/cloudup/openstacktasks/port.go | 2 +- upup/pkg/fi/cloudup/openstacktasks/router.go | 2 +- .../cloudup/openstacktasks/routerinterface.go | 2 +- .../cloudup/openstacktasks/securitygroup.go | 2 +- .../openstacktasks/securitygrouprule.go | 2 +- .../fi/cloudup/openstacktasks/servergroup.go | 2 +- upup/pkg/fi/cloudup/openstacktasks/sshkey.go | 2 +- upup/pkg/fi/cloudup/openstacktasks/subnet.go | 2 +- upup/pkg/fi/cloudup/openstacktasks/volume.go | 2 +- upup/pkg/fi/cloudup/populate_cluster_spec.go | 2 +- .../fi/cloudup/populate_instancegroup_spec.go | 2 +- upup/pkg/fi/cloudup/spec_builder.go | 2 +- upup/pkg/fi/cloudup/spotinsttasks/BUILD.bazel | 2 +- .../fi/cloudup/spotinsttasks/elastigroup.go | 2 +- .../fi/cloudup/spotinsttasks/launch_spec.go | 2 +- upup/pkg/fi/cloudup/spotinsttasks/ocean.go | 2 +- upup/pkg/fi/cloudup/subnets.go | 2 +- upup/pkg/fi/cloudup/template_functions.go | 2 +- upup/pkg/fi/cloudup/terraform/BUILD.bazel | 2 +- upup/pkg/fi/cloudup/terraform/hcl_printer.go | 2 +- upup/pkg/fi/cloudup/terraform/literal.go | 2 +- upup/pkg/fi/cloudup/terraform/target.go | 2 +- upup/pkg/fi/cloudup/urls.go | 2 +- upup/pkg/fi/cloudup/utils.go | 2 +- upup/pkg/fi/cloudup/validation_test.go | 2 +- upup/pkg/fi/context.go | 2 +- upup/pkg/fi/dryrun_target.go | 2 +- upup/pkg/fi/executor.go | 2 +- upup/pkg/fi/files.go | 2 +- upup/pkg/fi/files_owner.go | 2 +- upup/pkg/fi/fitasks/BUILD.bazel | 2 +- upup/pkg/fi/fitasks/keypair.go | 2 +- upup/pkg/fi/fitasks/mirrorkeystore.go | 2 +- upup/pkg/fi/fitasks/mirrorsecrets.go | 2 +- upup/pkg/fi/http.go | 2 +- upup/pkg/fi/loader/BUILD.bazel | 2 +- upup/pkg/fi/loader/options_loader.go | 2 +- upup/pkg/fi/loader/tree_walker.go | 2 +- upup/pkg/fi/nodeup/BUILD.bazel | 2 +- upup/pkg/fi/nodeup/cloudinit/BUILD.bazel | 2 +- .../fi/nodeup/cloudinit/cloud_init_target.go | 2 +- upup/pkg/fi/nodeup/command.go | 2 +- upup/pkg/fi/nodeup/loader.go | 2 +- upup/pkg/fi/nodeup/nodetasks/BUILD.bazel | 2 +- upup/pkg/fi/nodeup/nodetasks/archive.go | 2 +- upup/pkg/fi/nodeup/nodetasks/bindmount.go | 2 +- upup/pkg/fi/nodeup/nodetasks/chattr.go | 2 +- upup/pkg/fi/nodeup/nodetasks/file.go | 2 +- upup/pkg/fi/nodeup/nodetasks/group.go | 2 +- upup/pkg/fi/nodeup/nodetasks/issue_cert.go | 2 +- upup/pkg/fi/nodeup/nodetasks/load_image.go | 2 +- upup/pkg/fi/nodeup/nodetasks/package.go | 2 +- upup/pkg/fi/nodeup/nodetasks/service.go | 2 +- .../fi/nodeup/nodetasks/update_packages.go | 2 +- upup/pkg/fi/nodeup/nodetasks/user.go | 2 +- upup/pkg/fi/secrets/BUILD.bazel | 2 +- upup/pkg/fi/secrets/clientset_secretstore.go | 2 +- upup/pkg/fi/secrets/vfs_secretstore.go | 2 +- upup/pkg/fi/task.go | 2 +- upup/pkg/fi/topological_sort.go | 2 +- upup/pkg/fi/users.go | 2 +- upup/pkg/fi/vfs_castore.go | 2 +- upup/pkg/kutil/BUILD.bazel | 2 +- upup/pkg/kutil/convert_kubeup_cluster.go | 2 +- upup/pkg/kutil/import_cluster.go | 2 +- upup/pkg/kutil/kubectl.go | 2 +- util/pkg/architectures/BUILD.bazel | 2 +- util/pkg/architectures/architectures.go | 2 +- util/pkg/hashing/BUILD.bazel | 2 +- util/pkg/hashing/hash.go | 2 +- util/pkg/proxy/BUILD.bazel | 2 +- util/pkg/proxy/proxy.go | 2 +- util/pkg/reflectutils/BUILD.bazel | 2 +- util/pkg/reflectutils/print.go | 2 +- util/pkg/reflectutils/walk.go | 2 +- util/pkg/tables/BUILD.bazel | 2 +- util/pkg/tables/format.go | 2 +- util/pkg/vfs/BUILD.bazel | 2 +- util/pkg/vfs/context.go | 2 +- util/pkg/vfs/fs.go | 2 +- util/pkg/vfs/gsfs.go | 2 +- util/pkg/vfs/ossfs.go | 2 +- util/pkg/vfs/s3context.go | 2 +- util/pkg/vfs/s3fs.go | 2 +- util/pkg/vfs/sshfs.go | 2 +- util/pkg/vfs/swiftfs.go | 2 +- util/pkg/vfs/vaultcontext.go | 2 +- util/pkg/vfs/vaultfs.go | 2 +- util/pkg/vfs/vfs.go | 2 +- vendor/github.com/go-logr/logr/README.md | 159 +++++++++++++++++- vendor/github.com/go-logr/logr/go.mod | 3 + vendor/github.com/go-logr/logr/logr.go | 151 ++++++++++------- vendor/k8s.io/klog/v2/README.md | 4 +- vendor/k8s.io/klog/v2/go.mod | 2 +- vendor/k8s.io/klog/v2/go.sum | 4 +- vendor/k8s.io/klog/v2/klog.go | 94 +++++++---- vendor/k8s.io/klog/v2/klog_file.go | 64 +++---- vendor/modules.txt | 4 +- 560 files changed, 916 insertions(+), 689 deletions(-) create mode 100644 vendor/github.com/go-logr/logr/go.mod diff --git a/channels/cmd/channels/BUILD.bazel b/channels/cmd/channels/BUILD.bazel index 48671de4f5..d5e506b801 100644 --- a/channels/cmd/channels/BUILD.bazel +++ b/channels/cmd/channels/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:private"], deps = [ "//channels/pkg/cmd:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/channels/cmd/channels/main.go b/channels/cmd/channels/main.go index 523221d7cb..02633b0d94 100644 --- a/channels/cmd/channels/main.go +++ b/channels/cmd/channels/main.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/channels/pkg/cmd" ) diff --git a/channels/pkg/channels/BUILD.bazel b/channels/pkg/channels/BUILD.bazel index c205cfd8fe..e47ace8a27 100644 --- a/channels/pkg/channels/BUILD.bazel +++ b/channels/pkg/channels/BUILD.bazel @@ -20,7 +20,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/channels/pkg/channels/addon.go b/channels/pkg/channels/addon.go index ee772cea90..35426a84e8 100644 --- a/channels/pkg/channels/addon.go +++ b/channels/pkg/channels/addon.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/channels/pkg/api" ) diff --git a/channels/pkg/channels/addons.go b/channels/pkg/channels/addons.go index 431fbd083a..16a1fff8c7 100644 --- a/channels/pkg/channels/addons.go +++ b/channels/pkg/channels/addons.go @@ -22,7 +22,7 @@ import ( "strings" "github.com/blang/semver/v4" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/channels/pkg/api" "k8s.io/kops/upup/pkg/fi/utils" "k8s.io/kops/util/pkg/vfs" diff --git a/channels/pkg/channels/apply.go b/channels/pkg/channels/apply.go index f47925d892..245c08ed62 100644 --- a/channels/pkg/channels/apply.go +++ b/channels/pkg/channels/apply.go @@ -24,7 +24,7 @@ import ( "path" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/util/pkg/vfs" ) diff --git a/channels/pkg/channels/channel_version.go b/channels/pkg/channels/channel_version.go index 0402f02fa6..b729f9266c 100644 --- a/channels/pkg/channels/channel_version.go +++ b/channels/pkg/channels/channel_version.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" ) const AnnotationPrefix = "addons.k8s.io/" diff --git a/cloudmock/aws/mockautoscaling/BUILD.bazel b/cloudmock/aws/mockautoscaling/BUILD.bazel index 4623cd9d2d..37e2c943a2 100644 --- a/cloudmock/aws/mockautoscaling/BUILD.bazel +++ b/cloudmock/aws/mockautoscaling/BUILD.bazel @@ -19,6 +19,6 @@ go_library( "//vendor/github.com/aws/aws-sdk-go/service/autoscaling/autoscalingiface:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/ec2/ec2iface:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/cloudmock/aws/mockautoscaling/attach.go b/cloudmock/aws/mockautoscaling/attach.go index cb28e1688e..d168944ce7 100644 --- a/cloudmock/aws/mockautoscaling/attach.go +++ b/cloudmock/aws/mockautoscaling/attach.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/autoscaling" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockAutoscaling) AttachLoadBalancers(request *autoscaling.AttachLoadBalancersInput) (*autoscaling.AttachLoadBalancersOutput, error) { diff --git a/cloudmock/aws/mockautoscaling/group.go b/cloudmock/aws/mockautoscaling/group.go index 35a229cabc..95de147a4c 100644 --- a/cloudmock/aws/mockautoscaling/group.go +++ b/cloudmock/aws/mockautoscaling/group.go @@ -23,7 +23,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/autoscaling" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockAutoscaling) AttachInstances(input *autoscaling.AttachInstancesInput) (*autoscaling.AttachInstancesOutput, error) { diff --git a/cloudmock/aws/mockautoscaling/launchconfigurations.go b/cloudmock/aws/mockautoscaling/launchconfigurations.go index c48215983f..b77d682f9a 100644 --- a/cloudmock/aws/mockautoscaling/launchconfigurations.go +++ b/cloudmock/aws/mockautoscaling/launchconfigurations.go @@ -23,7 +23,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/autoscaling" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockAutoscaling) DescribeLaunchConfigurations(*autoscaling.DescribeLaunchConfigurationsInput) (*autoscaling.DescribeLaunchConfigurationsOutput, error) { diff --git a/cloudmock/aws/mockautoscaling/tags.go b/cloudmock/aws/mockautoscaling/tags.go index 04edd074d8..f3ca923d54 100644 --- a/cloudmock/aws/mockautoscaling/tags.go +++ b/cloudmock/aws/mockautoscaling/tags.go @@ -20,7 +20,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/autoscaling" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockAutoscaling) DescribeTags(request *autoscaling.DescribeTagsInput) (*autoscaling.DescribeTagsOutput, error) { diff --git a/cloudmock/aws/mockec2/BUILD.bazel b/cloudmock/aws/mockec2/BUILD.bazel index 7281db347e..21ce36f750 100644 --- a/cloudmock/aws/mockec2/BUILD.bazel +++ b/cloudmock/aws/mockec2/BUILD.bazel @@ -28,6 +28,6 @@ go_library( "//vendor/github.com/aws/aws-sdk-go/aws/request:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/ec2/ec2iface:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/cloudmock/aws/mockec2/address.go b/cloudmock/aws/mockec2/address.go index 64c06318f8..4ac144547b 100644 --- a/cloudmock/aws/mockec2/address.go +++ b/cloudmock/aws/mockec2/address.go @@ -24,7 +24,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockEC2) AllocateAddressRequest(*ec2.AllocateAddressInput) (*request.Request, *ec2.AllocateAddressOutput) { diff --git a/cloudmock/aws/mockec2/dhcpoptions.go b/cloudmock/aws/mockec2/dhcpoptions.go index c3924ccf48..93b6bc97ee 100644 --- a/cloudmock/aws/mockec2/dhcpoptions.go +++ b/cloudmock/aws/mockec2/dhcpoptions.go @@ -23,7 +23,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockEC2) DescribeDhcpOptions(request *ec2.DescribeDhcpOptionsInput) (*ec2.DescribeDhcpOptionsOutput, error) { diff --git a/cloudmock/aws/mockec2/images.go b/cloudmock/aws/mockec2/images.go index 71a79c80de..1c5dfffd9f 100644 --- a/cloudmock/aws/mockec2/images.go +++ b/cloudmock/aws/mockec2/images.go @@ -23,7 +23,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockEC2) DescribeImageAttributeRequest(*ec2.DescribeImageAttributeInput) (*request.Request, *ec2.DescribeImageAttributeOutput) { diff --git a/cloudmock/aws/mockec2/instances.go b/cloudmock/aws/mockec2/instances.go index a4e482fc91..551ff1a6d9 100644 --- a/cloudmock/aws/mockec2/instances.go +++ b/cloudmock/aws/mockec2/instances.go @@ -20,7 +20,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockEC2) DescribeInstances(*ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error) { diff --git a/cloudmock/aws/mockec2/internetgateways.go b/cloudmock/aws/mockec2/internetgateways.go index 930e268241..74c98ee56d 100644 --- a/cloudmock/aws/mockec2/internetgateways.go +++ b/cloudmock/aws/mockec2/internetgateways.go @@ -23,7 +23,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockEC2) FindInternetGateway(id string) *ec2.InternetGateway { diff --git a/cloudmock/aws/mockec2/keypairs.go b/cloudmock/aws/mockec2/keypairs.go index 2ed115961f..1f0ee6226f 100644 --- a/cloudmock/aws/mockec2/keypairs.go +++ b/cloudmock/aws/mockec2/keypairs.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/pki" ) diff --git a/cloudmock/aws/mockec2/natgateway.go b/cloudmock/aws/mockec2/natgateway.go index 2bbdc63345..0fd62192b6 100644 --- a/cloudmock/aws/mockec2/natgateway.go +++ b/cloudmock/aws/mockec2/natgateway.go @@ -23,7 +23,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockEC2) CreateNatGatewayWithId(request *ec2.CreateNatGatewayInput, id string) (*ec2.CreateNatGatewayOutput, error) { diff --git a/cloudmock/aws/mockec2/routetable.go b/cloudmock/aws/mockec2/routetable.go index 907a3e956d..4d2b6b7653 100644 --- a/cloudmock/aws/mockec2/routetable.go +++ b/cloudmock/aws/mockec2/routetable.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockEC2) AddRouteTable(rt *ec2.RouteTable) { diff --git a/cloudmock/aws/mockec2/securitygroups.go b/cloudmock/aws/mockec2/securitygroups.go index d5b9134928..b5ced6349c 100644 --- a/cloudmock/aws/mockec2/securitygroups.go +++ b/cloudmock/aws/mockec2/securitygroups.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockEC2) CreateSecurityGroupRequest(*ec2.CreateSecurityGroupInput) (*request.Request, *ec2.CreateSecurityGroupOutput) { diff --git a/cloudmock/aws/mockec2/subnets.go b/cloudmock/aws/mockec2/subnets.go index cfc3b0c35c..0196914e94 100644 --- a/cloudmock/aws/mockec2/subnets.go +++ b/cloudmock/aws/mockec2/subnets.go @@ -23,7 +23,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" ) type subnetInfo struct { diff --git a/cloudmock/aws/mockec2/tags.go b/cloudmock/aws/mockec2/tags.go index 6f71dc122b..832244edf6 100644 --- a/cloudmock/aws/mockec2/tags.go +++ b/cloudmock/aws/mockec2/tags.go @@ -24,7 +24,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockEC2) CreateTagsRequest(*ec2.CreateTagsInput) (*request.Request, *ec2.CreateTagsOutput) { diff --git a/cloudmock/aws/mockec2/volumes.go b/cloudmock/aws/mockec2/volumes.go index a8b6046848..5a1b279a86 100644 --- a/cloudmock/aws/mockec2/volumes.go +++ b/cloudmock/aws/mockec2/volumes.go @@ -23,7 +23,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockEC2) CreateVolume(request *ec2.CreateVolumeInput) (*ec2.Volume, error) { diff --git a/cloudmock/aws/mockec2/vpcs.go b/cloudmock/aws/mockec2/vpcs.go index a8c8e0d3f4..1b7563a94e 100644 --- a/cloudmock/aws/mockec2/vpcs.go +++ b/cloudmock/aws/mockec2/vpcs.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" ) type vpcInfo struct { diff --git a/cloudmock/aws/mockelb/BUILD.bazel b/cloudmock/aws/mockelb/BUILD.bazel index 45e0203912..bbe7d50a14 100644 --- a/cloudmock/aws/mockelb/BUILD.bazel +++ b/cloudmock/aws/mockelb/BUILD.bazel @@ -14,6 +14,6 @@ go_library( "//vendor/github.com/aws/aws-sdk-go/aws:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/elb:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/elb/elbiface:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/cloudmock/aws/mockelb/api.go b/cloudmock/aws/mockelb/api.go index 502be8ba95..bbf1e7e9d5 100644 --- a/cloudmock/aws/mockelb/api.go +++ b/cloudmock/aws/mockelb/api.go @@ -24,7 +24,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/elb" "github.com/aws/aws-sdk-go/service/elb/elbiface" - "k8s.io/klog" + "k8s.io/klog/v2" ) const elbZoneID = "FAKEZONE-CLOUDMOCK-ELB" diff --git a/cloudmock/aws/mockelb/attributes.go b/cloudmock/aws/mockelb/attributes.go index 244fc87411..002cd6807c 100644 --- a/cloudmock/aws/mockelb/attributes.go +++ b/cloudmock/aws/mockelb/attributes.go @@ -21,7 +21,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/elb" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockELB) ModifyLoadBalancerAttributes(request *elb.ModifyLoadBalancerAttributesInput) (*elb.ModifyLoadBalancerAttributesOutput, error) { diff --git a/cloudmock/aws/mockelb/healthcheck.go b/cloudmock/aws/mockelb/healthcheck.go index 10fc3e8e8f..4fc3efb6e6 100644 --- a/cloudmock/aws/mockelb/healthcheck.go +++ b/cloudmock/aws/mockelb/healthcheck.go @@ -21,7 +21,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/elb" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockELB) ConfigureHealthCheck(request *elb.ConfigureHealthCheckInput) (*elb.ConfigureHealthCheckOutput, error) { diff --git a/cloudmock/aws/mockelb/tags.go b/cloudmock/aws/mockelb/tags.go index ead8f46b11..bbe803db78 100644 --- a/cloudmock/aws/mockelb/tags.go +++ b/cloudmock/aws/mockelb/tags.go @@ -21,7 +21,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/elb" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockELB) DescribeTags(request *elb.DescribeTagsInput) (*elb.DescribeTagsOutput, error) { diff --git a/cloudmock/aws/mockelbv2/BUILD.bazel b/cloudmock/aws/mockelbv2/BUILD.bazel index efdb046781..6a13758f4f 100644 --- a/cloudmock/aws/mockelbv2/BUILD.bazel +++ b/cloudmock/aws/mockelbv2/BUILD.bazel @@ -9,6 +9,6 @@ go_library( "//vendor/github.com/aws/aws-sdk-go/aws:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/elbv2:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/elbv2/elbv2iface:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/cloudmock/aws/mockelbv2/api.go b/cloudmock/aws/mockelbv2/api.go index e6b9b4f190..afb79e8022 100644 --- a/cloudmock/aws/mockelbv2/api.go +++ b/cloudmock/aws/mockelbv2/api.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/elbv2" "github.com/aws/aws-sdk-go/service/elbv2/elbv2iface" - "k8s.io/klog" + "k8s.io/klog/v2" ) type MockELBV2 struct { diff --git a/cloudmock/aws/mockiam/BUILD.bazel b/cloudmock/aws/mockiam/BUILD.bazel index 2327c9081b..0fb773872a 100644 --- a/cloudmock/aws/mockiam/BUILD.bazel +++ b/cloudmock/aws/mockiam/BUILD.bazel @@ -17,6 +17,6 @@ go_library( "//vendor/github.com/aws/aws-sdk-go/aws/request:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/iam:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/iam/iamiface:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/cloudmock/aws/mockiam/iaminstanceprofile.go b/cloudmock/aws/mockiam/iaminstanceprofile.go index 99ac3ad11c..2eb14b9af8 100644 --- a/cloudmock/aws/mockiam/iaminstanceprofile.go +++ b/cloudmock/aws/mockiam/iaminstanceprofile.go @@ -23,7 +23,7 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/iam" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockIAM) GetInstanceProfile(request *iam.GetInstanceProfileInput) (*iam.GetInstanceProfileOutput, error) { diff --git a/cloudmock/aws/mockiam/iamrole.go b/cloudmock/aws/mockiam/iamrole.go index 5a3d9852fd..d47a6dd37f 100644 --- a/cloudmock/aws/mockiam/iamrole.go +++ b/cloudmock/aws/mockiam/iamrole.go @@ -23,7 +23,7 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/iam" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockIAM) GetRole(request *iam.GetRoleInput) (*iam.GetRoleOutput, error) { diff --git a/cloudmock/aws/mockiam/iamrolepolicy.go b/cloudmock/aws/mockiam/iamrolepolicy.go index c5b054415f..65891dc726 100644 --- a/cloudmock/aws/mockiam/iamrolepolicy.go +++ b/cloudmock/aws/mockiam/iamrolepolicy.go @@ -23,7 +23,7 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/iam" - "k8s.io/klog" + "k8s.io/klog/v2" ) type rolePolicy struct { diff --git a/cloudmock/aws/mockiam/oidcprovider.go b/cloudmock/aws/mockiam/oidcprovider.go index ff0b4f7cc7..e7b15b7e8f 100644 --- a/cloudmock/aws/mockiam/oidcprovider.go +++ b/cloudmock/aws/mockiam/oidcprovider.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/iam" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockIAM) ListOpenIDConnectProviders(request *iam.ListOpenIDConnectProvidersInput) (*iam.ListOpenIDConnectProvidersOutput, error) { diff --git a/cloudmock/aws/mockroute53/BUILD.bazel b/cloudmock/aws/mockroute53/BUILD.bazel index 8ab29a1ec7..eb9ed130ac 100644 --- a/cloudmock/aws/mockroute53/BUILD.bazel +++ b/cloudmock/aws/mockroute53/BUILD.bazel @@ -14,6 +14,6 @@ go_library( "//vendor/github.com/aws/aws-sdk-go/aws/request:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/route53:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/route53/route53iface:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/cloudmock/aws/mockroute53/records.go b/cloudmock/aws/mockroute53/records.go index 3e79b6d559..b8b35adaea 100644 --- a/cloudmock/aws/mockroute53/records.go +++ b/cloudmock/aws/mockroute53/records.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/route53" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockRoute53) ListResourceRecordSetsRequest(*route53.ListResourceRecordSetsInput) (*request.Request, *route53.ListResourceRecordSetsOutput) { diff --git a/cloudmock/aws/mockroute53/zones.go b/cloudmock/aws/mockroute53/zones.go index 0bcbf46418..f3a116ac7d 100644 --- a/cloudmock/aws/mockroute53/zones.go +++ b/cloudmock/aws/mockroute53/zones.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/route53" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (m *MockRoute53) GetHostedZoneRequest(*route53.GetHostedZoneInput) (*request.Request, *route53.GetHostedZoneOutput) { diff --git a/cmd/kops-controller/BUILD.bazel b/cmd/kops-controller/BUILD.bazel index 6e921b82d0..04817859b0 100644 --- a/cmd/kops-controller/BUILD.bazel +++ b/cmd/kops-controller/BUILD.bazel @@ -19,8 +19,8 @@ go_library( "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/client-go/plugin/pkg/client/auth/gcp:go_default_library", - "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/klog/klogr:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/sigs.k8s.io/controller-runtime:go_default_library", "//vendor/sigs.k8s.io/controller-runtime/pkg/manager:go_default_library", "//vendor/sigs.k8s.io/yaml:go_default_library", diff --git a/cmd/kops-controller/controllers/BUILD.bazel b/cmd/kops-controller/controllers/BUILD.bazel index 981e708a60..1946b49f64 100644 --- a/cmd/kops-controller/controllers/BUILD.bazel +++ b/cmd/kops-controller/controllers/BUILD.bazel @@ -18,7 +18,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/sigs.k8s.io/controller-runtime:go_default_library", "//vendor/sigs.k8s.io/controller-runtime/pkg/client:go_default_library", "//vendor/sigs.k8s.io/controller-runtime/pkg/manager:go_default_library", diff --git a/cmd/kops-controller/controllers/node_controller.go b/cmd/kops-controller/controllers/node_controller.go index 6be564002d..a5c5cd03bb 100644 --- a/cmd/kops-controller/controllers/node_controller.go +++ b/cmd/kops-controller/controllers/node_controller.go @@ -28,7 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/registry" "k8s.io/kops/pkg/nodeidentity" diff --git a/cmd/kops-controller/main.go b/cmd/kops-controller/main.go index 0ff547323c..ff428fe090 100644 --- a/cmd/kops-controller/main.go +++ b/cmd/kops-controller/main.go @@ -25,8 +25,8 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" - "k8s.io/klog" "k8s.io/klog/klogr" + "k8s.io/klog/v2" "k8s.io/kops/cmd/kops-controller/controllers" "k8s.io/kops/cmd/kops-controller/pkg/config" "k8s.io/kops/cmd/kops-controller/pkg/server" diff --git a/cmd/kops/BUILD.bazel b/cmd/kops/BUILD.bazel index 29bbfbd4b0..bdf0004b2f 100644 --- a/cmd/kops/BUILD.bazel +++ b/cmd/kops/BUILD.bazel @@ -111,7 +111,7 @@ go_library( "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library", "//vendor/k8s.io/client-go/util/homedir:go_default_library", "//vendor/k8s.io/helm/pkg/strvals:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//vendor/k8s.io/kubectl/pkg/cmd/util/editor:go_default_library", "//vendor/k8s.io/kubectl/pkg/util/i18n:go_default_library", diff --git a/cmd/kops/create.go b/cmd/kops/create.go index 5c59911e62..8f3548e699 100644 --- a/cmd/kops/create.go +++ b/cmd/kops/create.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/cobra" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/cmd/kops/util" kopsapi "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/kopscodecs" diff --git a/cmd/kops/create_cluster.go b/cmd/kops/create_cluster.go index 3ef87b70af..e345e4724d 100644 --- a/cmd/kops/create_cluster.go +++ b/cmd/kops/create_cluster.go @@ -29,7 +29,7 @@ import ( "github.com/spf13/cobra" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/cmd/kops/util" api "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/registry" diff --git a/cmd/kops/create_ig.go b/cmd/kops/create_ig.go index 264d79056b..ad79793f51 100644 --- a/cmd/kops/create_ig.go +++ b/cmd/kops/create_ig.go @@ -28,7 +28,7 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/cmd/kops/util" kopsapi "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/validation" diff --git a/cmd/kops/create_secret_keypair_ca.go b/cmd/kops/create_secret_keypair_ca.go index ff279e6de1..d6f7846723 100644 --- a/cmd/kops/create_secret_keypair_ca.go +++ b/cmd/kops/create_secret_keypair_ca.go @@ -24,7 +24,7 @@ import ( "os" "github.com/spf13/cobra" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/cmd/kops/util" "k8s.io/kops/pkg/pki" diff --git a/cmd/kops/delete.go b/cmd/kops/delete.go index a4d04f38ea..1e2d06775b 100644 --- a/cmd/kops/delete.go +++ b/cmd/kops/delete.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/cmd/kops/util" kopsapi "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/kopscodecs" diff --git a/cmd/kops/delete_cluster.go b/cmd/kops/delete_cluster.go index 90e54caff4..1cdd175ac3 100644 --- a/cmd/kops/delete_cluster.go +++ b/cmd/kops/delete_cluster.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" "k8s.io/client-go/tools/clientcmd" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/cmd/kops/util" kopsapi "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/kubeconfig" diff --git a/cmd/kops/edit_instancegroup.go b/cmd/kops/edit_instancegroup.go index 79abbfa015..0edb7e0c7b 100644 --- a/cmd/kops/edit_instancegroup.go +++ b/cmd/kops/edit_instancegroup.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/cmd/kops/util" api "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/validation" diff --git a/cmd/kops/get_secrets.go b/cmd/kops/get_secrets.go index d6c763cb8c..f41893293c 100644 --- a/cmd/kops/get_secrets.go +++ b/cmd/kops/get_secrets.go @@ -24,7 +24,7 @@ import ( "strings" "github.com/spf13/cobra" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/cmd/kops/util" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/sshcredentials" diff --git a/cmd/kops/replace.go b/cmd/kops/replace.go index 1cc3df26cc..28d314eae5 100644 --- a/cmd/kops/replace.go +++ b/cmd/kops/replace.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/cmd/kops/util" kopsapi "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/commands" diff --git a/cmd/kops/root.go b/cmd/kops/root.go index ee04e6528b..5a9e53a1dd 100644 --- a/cmd/kops/root.go +++ b/cmd/kops/root.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/util/homedir" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/cmd/kops/util" kopsapi "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/client/simple" diff --git a/cmd/kops/toolbox_dump.go b/cmd/kops/toolbox_dump.go index baf4339f85..da009efe73 100644 --- a/cmd/kops/toolbox_dump.go +++ b/cmd/kops/toolbox_dump.go @@ -32,7 +32,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/cmd/kops/util" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/dump" diff --git a/cmd/kops/update_cluster.go b/cmd/kops/update_cluster.go index 5d2cb331dd..cc74570c27 100644 --- a/cmd/kops/update_cluster.go +++ b/cmd/kops/update_cluster.go @@ -29,7 +29,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" "k8s.io/client-go/tools/clientcmd" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/cmd/kops/util" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/commands" diff --git a/cmd/kops/upgrade_cluster.go b/cmd/kops/upgrade_cluster.go index ab98150449..e077341078 100644 --- a/cmd/kops/upgrade_cluster.go +++ b/cmd/kops/upgrade_cluster.go @@ -24,7 +24,7 @@ import ( "github.com/blang/semver/v4" "github.com/spf13/cobra" - "k8s.io/klog" + "k8s.io/klog/v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kops" diff --git a/cmd/kops/util/BUILD.bazel b/cmd/kops/util/BUILD.bazel index 90f75f09e8..7f664142d5 100644 --- a/cmd/kops/util/BUILD.bazel +++ b/cmd/kops/util/BUILD.bazel @@ -15,6 +15,6 @@ go_library( "//util/pkg/vfs:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/cmd/kops/util/factory.go b/cmd/kops/util/factory.go index 34a44be9f5..b027328bf5 100644 --- a/cmd/kops/util/factory.go +++ b/cmd/kops/util/factory.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/client-go/tools/clientcmd" - "k8s.io/klog" + "k8s.io/klog/v2" gceacls "k8s.io/kops/pkg/acls/gce" s3acls "k8s.io/kops/pkg/acls/s3" kopsclient "k8s.io/kops/pkg/client/clientset_generated/clientset" diff --git a/cmd/kops/validate_cluster.go b/cmd/kops/validate_cluster.go index a36bef26c0..79d2c4c792 100644 --- a/cmd/kops/validate_cluster.go +++ b/cmd/kops/validate_cluster.go @@ -35,7 +35,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/cmd/kops/util" kopsapi "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/validation" diff --git a/cmd/kube-apiserver-healthcheck/BUILD.bazel b/cmd/kube-apiserver-healthcheck/BUILD.bazel index bf5c7fae53..fe0291ef4b 100644 --- a/cmd/kube-apiserver-healthcheck/BUILD.bazel +++ b/cmd/kube-apiserver-healthcheck/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:private"], deps = [ "//pkg/wellknownports:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/cmd/kube-apiserver-healthcheck/main.go b/cmd/kube-apiserver-healthcheck/main.go index 9ca0436702..1168123f08 100644 --- a/cmd/kube-apiserver-healthcheck/main.go +++ b/cmd/kube-apiserver-healthcheck/main.go @@ -27,7 +27,7 @@ import ( "net/url" "os" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/wellknownports" ) diff --git a/cmd/nodeup/BUILD.bazel b/cmd/nodeup/BUILD.bazel index 23356b3086..539b2b9360 100644 --- a/cmd/nodeup/BUILD.bazel +++ b/cmd/nodeup/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "//:go_default_library", "//nodeup/pkg/bootstrap:go_default_library", "//upup/pkg/fi/nodeup:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/cmd/nodeup/main.go b/cmd/nodeup/main.go index 62b5c6f078..d65a418b03 100644 --- a/cmd/nodeup/main.go +++ b/cmd/nodeup/main.go @@ -22,7 +22,7 @@ import ( "os" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops" "k8s.io/kops/nodeup/pkg/bootstrap" "k8s.io/kops/upup/pkg/fi/nodeup" diff --git a/dns-controller/cmd/dns-controller/BUILD.bazel b/dns-controller/cmd/dns-controller/BUILD.bazel index 2776396a72..a9517bcb5f 100644 --- a/dns-controller/cmd/dns-controller/BUILD.bazel +++ b/dns-controller/cmd/dns-controller/BUILD.bazel @@ -26,7 +26,7 @@ go_library( "//vendor/k8s.io/client-go/kubernetes:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/component-base/metrics/prometheus/restclient:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/dns-controller/cmd/dns-controller/main.go b/dns-controller/cmd/dns-controller/main.go index 1a2023b0f5..a3ae999123 100644 --- a/dns-controller/cmd/dns-controller/main.go +++ b/dns-controller/cmd/dns-controller/main.go @@ -31,7 +31,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" _ "k8s.io/component-base/metrics/prometheus/restclient" // for client metric registration - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dns-controller/pkg/dns" "k8s.io/kops/dns-controller/pkg/watchers" diff --git a/dns-controller/pkg/dns/BUILD.bazel b/dns-controller/pkg/dns/BUILD.bazel index ca96a6096e..d211fb63b6 100644 --- a/dns-controller/pkg/dns/BUILD.bazel +++ b/dns-controller/pkg/dns/BUILD.bazel @@ -16,7 +16,7 @@ go_library( "//dnsprovider/pkg/dnsprovider:go_default_library", "//dnsprovider/pkg/dnsprovider/providers/coredns:go_default_library", "//dnsprovider/pkg/dnsprovider/rrstype:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/dns-controller/pkg/dns/dnscache.go b/dns-controller/pkg/dns/dnscache.go index ff50cc1098..78ee65a8b3 100644 --- a/dns-controller/pkg/dns/dnscache.go +++ b/dns-controller/pkg/dns/dnscache.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dnsprovider/pkg/dnsprovider" ) diff --git a/dns-controller/pkg/dns/dnscontroller.go b/dns-controller/pkg/dns/dnscontroller.go index 03cd872f4d..5ac673c71f 100644 --- a/dns-controller/pkg/dns/dnscontroller.go +++ b/dns-controller/pkg/dns/dnscontroller.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "sort" "strings" diff --git a/dns-controller/pkg/dns/zonespec.go b/dns-controller/pkg/dns/zonespec.go index 076f65b6fa..3e3c4d1e01 100644 --- a/dns-controller/pkg/dns/zonespec.go +++ b/dns-controller/pkg/dns/zonespec.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dnsprovider/pkg/dnsprovider" ) diff --git a/dns-controller/pkg/util/BUILD.bazel b/dns-controller/pkg/util/BUILD.bazel index 2fd7f34872..806f0c392c 100644 --- a/dns-controller/pkg/util/BUILD.bazel +++ b/dns-controller/pkg/util/BUILD.bazel @@ -8,7 +8,7 @@ go_library( ], importpath = "k8s.io/kops/dns-controller/pkg/util", visibility = ["//visibility:public"], - deps = ["//vendor/k8s.io/klog:go_default_library"], + deps = ["//vendor/k8s.io/klog/v2:go_default_library"], ) go_test( diff --git a/dns-controller/pkg/util/stoppable.go b/dns-controller/pkg/util/stoppable.go index bcf1063d8d..df1c40cf0d 100644 --- a/dns-controller/pkg/util/stoppable.go +++ b/dns-controller/pkg/util/stoppable.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "k8s.io/klog" + "k8s.io/klog/v2" ) // Stoppable implements the standard stop / shutdown logic diff --git a/dns-controller/pkg/watchers/BUILD.bazel b/dns-controller/pkg/watchers/BUILD.bazel index a4cc571504..2f2e22e3e1 100644 --- a/dns-controller/pkg/watchers/BUILD.bazel +++ b/dns-controller/pkg/watchers/BUILD.bazel @@ -20,6 +20,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/dns-controller/pkg/watchers/ingress.go b/dns-controller/pkg/watchers/ingress.go index cf489a03b3..2afc493be8 100644 --- a/dns-controller/pkg/watchers/ingress.go +++ b/dns-controller/pkg/watchers/ingress.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dns-controller/pkg/dns" "k8s.io/kops/dns-controller/pkg/util" diff --git a/dns-controller/pkg/watchers/node.go b/dns-controller/pkg/watchers/node.go index 88fd9933eb..fc519d2436 100644 --- a/dns-controller/pkg/watchers/node.go +++ b/dns-controller/pkg/watchers/node.go @@ -29,7 +29,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" ) // NodeController watches for nodes diff --git a/dns-controller/pkg/watchers/pod.go b/dns-controller/pkg/watchers/pod.go index fbdddf358d..5d7e76be4a 100644 --- a/dns-controller/pkg/watchers/pod.go +++ b/dns-controller/pkg/watchers/pod.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "k8s.io/klog" + "k8s.io/klog/v2" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/dns-controller/pkg/watchers/service.go b/dns-controller/pkg/watchers/service.go index 78576fa28a..945c66a837 100644 --- a/dns-controller/pkg/watchers/service.go +++ b/dns-controller/pkg/watchers/service.go @@ -29,7 +29,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" ) // ServiceController watches for services with dns annotations diff --git a/dnsprovider/pkg/dnsprovider/BUILD.bazel b/dnsprovider/pkg/dnsprovider/BUILD.bazel index 8ae40f1e36..1085e5a3c4 100644 --- a/dnsprovider/pkg/dnsprovider/BUILD.bazel +++ b/dnsprovider/pkg/dnsprovider/BUILD.bazel @@ -11,7 +11,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//dnsprovider/pkg/dnsprovider/rrstype:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/dnsprovider/pkg/dnsprovider/plugins.go b/dnsprovider/pkg/dnsprovider/plugins.go index 44d5edb566..17c9aa35c2 100644 --- a/dnsprovider/pkg/dnsprovider/plugins.go +++ b/dnsprovider/pkg/dnsprovider/plugins.go @@ -22,7 +22,7 @@ import ( "os" "sync" - "k8s.io/klog" + "k8s.io/klog/v2" ) // Factory is a function that returns a dnsprovider.Interface. diff --git a/dnsprovider/pkg/dnsprovider/providers/aws/route53/BUILD.bazel b/dnsprovider/pkg/dnsprovider/providers/aws/route53/BUILD.bazel index c6c63a9693..91f2d60c15 100644 --- a/dnsprovider/pkg/dnsprovider/providers/aws/route53/BUILD.bazel +++ b/dnsprovider/pkg/dnsprovider/providers/aws/route53/BUILD.bazel @@ -22,7 +22,7 @@ go_library( "//vendor/github.com/aws/aws-sdk-go/aws/session:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/route53:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/dnsprovider/pkg/dnsprovider/providers/aws/route53/route53.go b/dnsprovider/pkg/dnsprovider/providers/aws/route53/route53.go index 4b210e512b..2cf2c9eb92 100644 --- a/dnsprovider/pkg/dnsprovider/providers/aws/route53/route53.go +++ b/dnsprovider/pkg/dnsprovider/providers/aws/route53/route53.go @@ -24,7 +24,7 @@ import ( "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/route53" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dnsprovider/pkg/dnsprovider" ) diff --git a/dnsprovider/pkg/dnsprovider/providers/aws/route53/rrchangeset.go b/dnsprovider/pkg/dnsprovider/providers/aws/route53/rrchangeset.go index 0b34a7b54f..335118d135 100644 --- a/dnsprovider/pkg/dnsprovider/providers/aws/route53/rrchangeset.go +++ b/dnsprovider/pkg/dnsprovider/providers/aws/route53/rrchangeset.go @@ -23,7 +23,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/route53" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dnsprovider/pkg/dnsprovider" ) @@ -139,7 +139,7 @@ func (c *ResourceRecordChangeset) Apply(ctx context.Context) error { break } - if klog.V(8) { + if klog.V(8).Enabled() { var sb bytes.Buffer for _, change := range batch { sb.WriteString(fmt.Sprintf("\t%s %s %s\n", aws.StringValue(change.Action), aws.StringValue(change.ResourceRecordSet.Type), aws.StringValue(change.ResourceRecordSet.Name))) diff --git a/dnsprovider/pkg/dnsprovider/providers/coredns/BUILD.bazel b/dnsprovider/pkg/dnsprovider/providers/coredns/BUILD.bazel index e593ec6e7d..bac7969986 100644 --- a/dnsprovider/pkg/dnsprovider/providers/coredns/BUILD.bazel +++ b/dnsprovider/pkg/dnsprovider/providers/coredns/BUILD.bazel @@ -20,7 +20,7 @@ go_library( "//vendor/github.com/coreos/etcd/client:go_default_library", "//vendor/github.com/miekg/coredns/middleware/etcd/msg:go_default_library", "//vendor/gopkg.in/gcfg.v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/dnsprovider/pkg/dnsprovider/providers/coredns/coredns.go b/dnsprovider/pkg/dnsprovider/providers/coredns/coredns.go index b70eeb87cc..2a84cfef25 100644 --- a/dnsprovider/pkg/dnsprovider/providers/coredns/coredns.go +++ b/dnsprovider/pkg/dnsprovider/providers/coredns/coredns.go @@ -25,7 +25,7 @@ import ( etcdc "github.com/coreos/etcd/client" gcfg "gopkg.in/gcfg.v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dnsprovider/pkg/dnsprovider" ) diff --git a/dnsprovider/pkg/dnsprovider/providers/coredns/rrsets.go b/dnsprovider/pkg/dnsprovider/providers/coredns/rrsets.go index 444c1159b0..25bd6dd89a 100644 --- a/dnsprovider/pkg/dnsprovider/providers/coredns/rrsets.go +++ b/dnsprovider/pkg/dnsprovider/providers/coredns/rrsets.go @@ -24,7 +24,7 @@ import ( etcdc "github.com/coreos/etcd/client" dnsmsg "github.com/miekg/coredns/middleware/etcd/msg" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dnsprovider/pkg/dnsprovider" "k8s.io/kops/dnsprovider/pkg/dnsprovider/rrstype" ) diff --git a/dnsprovider/pkg/dnsprovider/providers/google/clouddns/BUILD.bazel b/dnsprovider/pkg/dnsprovider/providers/google/clouddns/BUILD.bazel index e77d6de94a..7eab42e1cc 100644 --- a/dnsprovider/pkg/dnsprovider/providers/google/clouddns/BUILD.bazel +++ b/dnsprovider/pkg/dnsprovider/providers/google/clouddns/BUILD.bazel @@ -26,7 +26,7 @@ go_library( "//vendor/google.golang.org/api/dns/v1:go_default_library", "//vendor/google.golang.org/api/option:go_default_library", "//vendor/gopkg.in/gcfg.v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/k8s.io/legacy-cloud-providers/gce:go_default_library", ], ) diff --git a/dnsprovider/pkg/dnsprovider/providers/google/clouddns/clouddns.go b/dnsprovider/pkg/dnsprovider/providers/google/clouddns/clouddns.go index 3acdac678e..62bbcfdb68 100644 --- a/dnsprovider/pkg/dnsprovider/providers/google/clouddns/clouddns.go +++ b/dnsprovider/pkg/dnsprovider/providers/google/clouddns/clouddns.go @@ -28,7 +28,7 @@ import ( dns "google.golang.org/api/dns/v1" "google.golang.org/api/option" gcfg "gopkg.in/gcfg.v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dnsprovider/pkg/dnsprovider" "k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/google/clouddns/internal" diff --git a/dnsprovider/pkg/dnsprovider/providers/openstack/designate/BUILD.bazel b/dnsprovider/pkg/dnsprovider/providers/openstack/designate/BUILD.bazel index b88f90a04b..c5d8fafe46 100644 --- a/dnsprovider/pkg/dnsprovider/providers/openstack/designate/BUILD.bazel +++ b/dnsprovider/pkg/dnsprovider/providers/openstack/designate/BUILD.bazel @@ -22,7 +22,7 @@ go_library( "//vendor/github.com/gophercloud/gophercloud/openstack/dns/v2/recordsets:go_default_library", "//vendor/github.com/gophercloud/gophercloud/openstack/dns/v2/zones:go_default_library", "//vendor/github.com/gophercloud/gophercloud/pagination:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/dnsprovider/pkg/dnsprovider/providers/openstack/designate/designate.go b/dnsprovider/pkg/dnsprovider/providers/openstack/designate/designate.go index f3961ba58a..16e6754fc1 100644 --- a/dnsprovider/pkg/dnsprovider/providers/openstack/designate/designate.go +++ b/dnsprovider/pkg/dnsprovider/providers/openstack/designate/designate.go @@ -23,7 +23,7 @@ import ( "net/http" "github.com/gophercloud/gophercloud/openstack" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dnsprovider/pkg/dnsprovider" "k8s.io/kops/util/pkg/vfs" ) diff --git a/docs/cli/kops.md b/docs/cli/kops.md index 8e52aa28ba..dab11089ff 100644 --- a/docs/cli/kops.md +++ b/docs/cli/kops.md @@ -16,7 +16,7 @@ kops is Kubernetes ops. ### Options ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) -h, --help help for kops diff --git a/docs/cli/kops_completion.md b/docs/cli/kops_completion.md index 09eeb86a44..25e897b249 100644 --- a/docs/cli/kops_completion.md +++ b/docs/cli/kops_completion.md @@ -49,7 +49,7 @@ kops completion [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_create.md b/docs/cli/kops_create.md index 47e56bc039..42c4de5703 100644 --- a/docs/cli/kops_create.md +++ b/docs/cli/kops_create.md @@ -56,7 +56,7 @@ kops create -f FILENAME [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_create_cluster.md b/docs/cli/kops_create_cluster.md index 13e035096d..558fe685b9 100644 --- a/docs/cli/kops_create_cluster.md +++ b/docs/cli/kops_create_cluster.md @@ -125,7 +125,7 @@ kops create cluster [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_create_instancegroup.md b/docs/cli/kops_create_instancegroup.md index 5ad1e8b874..9c92167ef8 100644 --- a/docs/cli/kops_create_instancegroup.md +++ b/docs/cli/kops_create_instancegroup.md @@ -43,7 +43,7 @@ kops create instancegroup [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_create_secret.md b/docs/cli/kops_create_secret.md index 3bf8724647..5406791afa 100644 --- a/docs/cli/kops_create_secret.md +++ b/docs/cli/kops_create_secret.md @@ -32,7 +32,7 @@ Create a secret ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_create_secret_ciliumpassword.md b/docs/cli/kops_create_secret_ciliumpassword.md index cf2ce77132..534e13ad5b 100644 --- a/docs/cli/kops_create_secret_ciliumpassword.md +++ b/docs/cli/kops_create_secret_ciliumpassword.md @@ -39,7 +39,7 @@ kops create secret ciliumpassword [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_create_secret_dockerconfig.md b/docs/cli/kops_create_secret_dockerconfig.md index c7d3a68e73..c8a7e82b96 100644 --- a/docs/cli/kops_create_secret_dockerconfig.md +++ b/docs/cli/kops_create_secret_dockerconfig.md @@ -38,7 +38,7 @@ kops create secret dockerconfig [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_create_secret_encryptionconfig.md b/docs/cli/kops_create_secret_encryptionconfig.md index cdc0f30835..8831c55527 100644 --- a/docs/cli/kops_create_secret_encryptionconfig.md +++ b/docs/cli/kops_create_secret_encryptionconfig.md @@ -38,7 +38,7 @@ kops create secret encryptionconfig [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_create_secret_keypair.md b/docs/cli/kops_create_secret_keypair.md index d956a3aee0..ff469b0e2e 100644 --- a/docs/cli/kops_create_secret_keypair.md +++ b/docs/cli/kops_create_secret_keypair.md @@ -27,7 +27,7 @@ Create a secret keypair ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_create_secret_keypair_ca.md b/docs/cli/kops_create_secret_keypair_ca.md index 1d11a18fdf..34da8cb61e 100644 --- a/docs/cli/kops_create_secret_keypair_ca.md +++ b/docs/cli/kops_create_secret_keypair_ca.md @@ -33,7 +33,7 @@ kops create secret keypair ca [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_create_secret_sshpublickey.md b/docs/cli/kops_create_secret_sshpublickey.md index 522d530b54..9ecee81d73 100644 --- a/docs/cli/kops_create_secret_sshpublickey.md +++ b/docs/cli/kops_create_secret_sshpublickey.md @@ -31,7 +31,7 @@ kops create secret sshpublickey [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_create_secret_weavepassword.md b/docs/cli/kops_create_secret_weavepassword.md index 4a68127481..599eaf45ca 100644 --- a/docs/cli/kops_create_secret_weavepassword.md +++ b/docs/cli/kops_create_secret_weavepassword.md @@ -45,7 +45,7 @@ kops create secret weavepassword [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_delete.md b/docs/cli/kops_delete.md index ecfdc0ad75..0a3bfc6a71 100644 --- a/docs/cli/kops_delete.md +++ b/docs/cli/kops_delete.md @@ -41,7 +41,7 @@ kops delete -f FILENAME [--yes] [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_delete_cluster.md b/docs/cli/kops_delete_cluster.md index 260596d2d1..8c0bd4fe50 100644 --- a/docs/cli/kops_delete_cluster.md +++ b/docs/cli/kops_delete_cluster.md @@ -34,7 +34,7 @@ kops delete cluster CLUSTERNAME [--yes] [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_delete_instancegroup.md b/docs/cli/kops_delete_instancegroup.md index 24c004cfd4..69bcbf71e7 100644 --- a/docs/cli/kops_delete_instancegroup.md +++ b/docs/cli/kops_delete_instancegroup.md @@ -32,7 +32,7 @@ kops delete instancegroup [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_delete_secret.md b/docs/cli/kops_delete_secret.md index 8d7ef993fc..398d3965cd 100644 --- a/docs/cli/kops_delete_secret.md +++ b/docs/cli/kops_delete_secret.md @@ -30,7 +30,7 @@ kops delete secret [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_describe.md b/docs/cli/kops_describe.md index 0c34e4ce01..92784269e6 100644 --- a/docs/cli/kops_describe.md +++ b/docs/cli/kops_describe.md @@ -24,7 +24,7 @@ Get additional information about cloud and cluster resources. ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_describe_secrets.md b/docs/cli/kops_describe_secrets.md index 90b0e82014..b9504d7ab7 100644 --- a/docs/cli/kops_describe_secrets.md +++ b/docs/cli/kops_describe_secrets.md @@ -30,7 +30,7 @@ kops describe secrets [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_edit.md b/docs/cli/kops_edit.md index 329011a10e..cb0a554ea3 100644 --- a/docs/cli/kops_edit.md +++ b/docs/cli/kops_edit.md @@ -34,7 +34,7 @@ Edit a resource configuration. This command changes the desired configuration in ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_edit_cluster.md b/docs/cli/kops_edit_cluster.md index 2bf04c1c62..80166d5430 100644 --- a/docs/cli/kops_edit_cluster.md +++ b/docs/cli/kops_edit_cluster.md @@ -36,7 +36,7 @@ kops edit cluster [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_edit_instancegroup.md b/docs/cli/kops_edit_instancegroup.md index 36871e3196..278fa6ff79 100644 --- a/docs/cli/kops_edit_instancegroup.md +++ b/docs/cli/kops_edit_instancegroup.md @@ -36,7 +36,7 @@ kops edit instancegroup [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_export.md b/docs/cli/kops_export.md index 533bb55d64..f14598c90e 100644 --- a/docs/cli/kops_export.md +++ b/docs/cli/kops_export.md @@ -25,7 +25,7 @@ Export configurations from a cluster. ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_export_kubecfg.md b/docs/cli/kops_export_kubecfg.md index b20ed8359e..c59d587aea 100644 --- a/docs/cli/kops_export_kubecfg.md +++ b/docs/cli/kops_export_kubecfg.md @@ -36,7 +36,7 @@ kops export kubecfg CLUSTERNAME [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_get.md b/docs/cli/kops_get.md index 8fbf32e0a4..d7735b365e 100644 --- a/docs/cli/kops_get.md +++ b/docs/cli/kops_get.md @@ -49,7 +49,7 @@ kops get [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_get_clusters.md b/docs/cli/kops_get_clusters.md index d270802afd..eecb261204 100644 --- a/docs/cli/kops_get_clusters.md +++ b/docs/cli/kops_get_clusters.md @@ -39,7 +39,7 @@ kops get clusters [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_get_instancegroups.md b/docs/cli/kops_get_instancegroups.md index fa710d80f9..520e58a85f 100644 --- a/docs/cli/kops_get_instancegroups.md +++ b/docs/cli/kops_get_instancegroups.md @@ -35,7 +35,7 @@ kops get instancegroups [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_get_secrets.md b/docs/cli/kops_get_secrets.md index 5a3fc20473..5bee721063 100644 --- a/docs/cli/kops_get_secrets.md +++ b/docs/cli/kops_get_secrets.md @@ -33,7 +33,7 @@ kops get secrets [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_import.md b/docs/cli/kops_import.md index 9f2173f7bf..4d3158154a 100644 --- a/docs/cli/kops_import.md +++ b/docs/cli/kops_import.md @@ -26,7 +26,7 @@ Imports a kubernetes cluster created by kube-up.sh into a state store. This com ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_import_cluster.md b/docs/cli/kops_import_cluster.md index 8853cb4d3d..64b36c6482 100644 --- a/docs/cli/kops_import_cluster.md +++ b/docs/cli/kops_import_cluster.md @@ -31,7 +31,7 @@ kops import cluster [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_replace.md b/docs/cli/kops_replace.md index 8a5b37303e..3163513d0e 100644 --- a/docs/cli/kops_replace.md +++ b/docs/cli/kops_replace.md @@ -37,7 +37,7 @@ kops replace -f FILENAME [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_rolling-update.md b/docs/cli/kops_rolling-update.md index efae13a7e4..2c76dd478d 100644 --- a/docs/cli/kops_rolling-update.md +++ b/docs/cli/kops_rolling-update.md @@ -70,7 +70,7 @@ Note: terraform users will need to run all of the following commands from the sa ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_rolling-update_cluster.md b/docs/cli/kops_rolling-update_cluster.md index 06724f3e57..9169da653c 100644 --- a/docs/cli/kops_rolling-update_cluster.md +++ b/docs/cli/kops_rolling-update_cluster.md @@ -88,7 +88,7 @@ kops rolling-update cluster [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_set.md b/docs/cli/kops_set.md index 1b48137112..76ae7ec439 100644 --- a/docs/cli/kops_set.md +++ b/docs/cli/kops_set.md @@ -27,7 +27,7 @@ Set a configuration field. ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_set_cluster.md b/docs/cli/kops_set_cluster.md index 0fad4daba3..a6715649a2 100644 --- a/docs/cli/kops_set_cluster.md +++ b/docs/cli/kops_set_cluster.md @@ -33,7 +33,7 @@ kops set cluster [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_toolbox.md b/docs/cli/kops_toolbox.md index 58ad5edbe4..30ef1d381e 100644 --- a/docs/cli/kops_toolbox.md +++ b/docs/cli/kops_toolbox.md @@ -25,7 +25,7 @@ Misc infrequently used commands. ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_toolbox_convert-imported.md b/docs/cli/kops_toolbox_convert-imported.md index 0f8406c688..496a701cb7 100644 --- a/docs/cli/kops_toolbox_convert-imported.md +++ b/docs/cli/kops_toolbox_convert-imported.md @@ -35,7 +35,7 @@ kops toolbox convert-imported [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_toolbox_dump.md b/docs/cli/kops_toolbox_dump.md index 2cdab0b516..51331b2f5e 100644 --- a/docs/cli/kops_toolbox_dump.md +++ b/docs/cli/kops_toolbox_dump.md @@ -32,7 +32,7 @@ kops toolbox dump [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_toolbox_instance-selector.md b/docs/cli/kops_toolbox_instance-selector.md index 17c2dcf27b..ce992d5d4f 100644 --- a/docs/cli/kops_toolbox_instance-selector.md +++ b/docs/cli/kops_toolbox_instance-selector.md @@ -70,7 +70,7 @@ kops toolbox instance-selector [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_toolbox_template.md b/docs/cli/kops_toolbox_template.md index fb13448abf..64f96b50d4 100644 --- a/docs/cli/kops_toolbox_template.md +++ b/docs/cli/kops_toolbox_template.md @@ -44,7 +44,7 @@ kops toolbox template [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_update.md b/docs/cli/kops_update.md index 4ad14434f7..4b01ce1aaf 100644 --- a/docs/cli/kops_update.md +++ b/docs/cli/kops_update.md @@ -25,7 +25,7 @@ Creates or updates cloud resources to match cluster desired configuration. ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_update_cluster.md b/docs/cli/kops_update_cluster.md index 288f67488e..6b11e705f1 100644 --- a/docs/cli/kops_update_cluster.md +++ b/docs/cli/kops_update_cluster.md @@ -41,7 +41,7 @@ kops update cluster [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_upgrade.md b/docs/cli/kops_upgrade.md index a2a091650d..221ae2eaeb 100644 --- a/docs/cli/kops_upgrade.md +++ b/docs/cli/kops_upgrade.md @@ -25,7 +25,7 @@ Automates checking for and applying Kubernetes updates. This upgrades a cluster ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_upgrade_cluster.md b/docs/cli/kops_upgrade_cluster.md index c70cce453e..ea3ede812c 100644 --- a/docs/cli/kops_upgrade_cluster.md +++ b/docs/cli/kops_upgrade_cluster.md @@ -31,7 +31,7 @@ kops upgrade cluster [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_validate.md b/docs/cli/kops_validate.md index e118bd95cf..7e5f8a3dcf 100644 --- a/docs/cli/kops_validate.md +++ b/docs/cli/kops_validate.md @@ -26,7 +26,7 @@ This command validates a cluster. See: kops validate cluster -h ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_validate_cluster.md b/docs/cli/kops_validate_cluster.md index b46fa17ad4..bd6bf5a9c4 100644 --- a/docs/cli/kops_validate_cluster.md +++ b/docs/cli/kops_validate_cluster.md @@ -39,7 +39,7 @@ kops validate cluster [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/docs/cli/kops_version.md b/docs/cli/kops_version.md index 8c487d7f0c..4b511134ae 100644 --- a/docs/cli/kops_version.md +++ b/docs/cli/kops_version.md @@ -29,7 +29,7 @@ kops version [flags] ### Options inherited from parent commands ``` - --add_dir_header If true, adds the file directory to the header + --add_dir_header If true, adds the file directory to the header of the log messages --alsologtostderr log to standard error as well as files --config string yaml config file (default is $HOME/.kops.yaml) --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) diff --git a/go.mod b/go.mod index ea88aa6934..e15b0aa9b8 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,7 @@ require ( github.com/ghodss/yaml v1.0.0 github.com/go-bindata/go-bindata v3.1.2+incompatible github.com/go-ini/ini v1.51.0 - github.com/go-logr/logr v0.1.0 + github.com/go-logr/logr v0.2.1-0.20200730175230-ee2de8da5be6 github.com/gogo/protobuf v1.3.1 github.com/golang/protobuf v1.4.2 // indirect github.com/google/uuid v1.1.1 @@ -119,7 +119,7 @@ require ( k8s.io/gengo v0.0.0-20200710205751-c0d492a0f3ca k8s.io/helm v2.9.0+incompatible k8s.io/klog v1.0.0 - k8s.io/klog/v2 v2.0.0 + k8s.io/klog/v2 v2.3.0 k8s.io/kubectl v0.0.0 k8s.io/legacy-cloud-providers v0.0.0 k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 diff --git a/go.sum b/go.sum index b0c2968afe..0dc95e31c4 100644 --- a/go.sum +++ b/go.sum @@ -236,6 +236,10 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/logr v0.2.0 h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY= +github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v0.2.1-0.20200730175230-ee2de8da5be6 h1:ZPVluSmhtMIHlqUDMZu70FgMpRzbQfl4h9oKCAXOVDE= +github.com/go-logr/logr v0.2.1-0.20200730175230-ee2de8da5be6/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/zapr v0.1.0 h1:h+WVe9j6HAA01niTJPA/kKH0i7e0rLZBCwauQFcRE54= github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= @@ -1183,6 +1187,8 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/klog/v2 v2.3.0 h1:WmkrnW7fdrm0/DMClc+HIxtftvxVIPAhlVwMQo5yLco= +k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/kube-aggregator v0.18.6/go.mod h1:MKm8inLHdeiXQJCl6UdmgMosRrqJgyxO2obTXOkey/s= k8s.io/kube-controller-manager v0.18.6/go.mod h1:T+Ayh47y1IrvwDSUAh4QT/aIrRcKWlvgdqV5PHrMwNs= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a h1:UcxjrRMyNx/i/y8G7kPvLyy7rfbeuf1PYyBf973pgyU= diff --git a/nodeup/pkg/bootstrap/BUILD.bazel b/nodeup/pkg/bootstrap/BUILD.bazel index 555f077ddd..71a1022d42 100644 --- a/nodeup/pkg/bootstrap/BUILD.bazel +++ b/nodeup/pkg/bootstrap/BUILD.bazel @@ -12,6 +12,6 @@ go_library( "//upup/pkg/fi/nodeup/local:go_default_library", "//upup/pkg/fi/nodeup/nodetasks:go_default_library", "//util/pkg/vfs:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/nodeup/pkg/bootstrap/install.go b/nodeup/pkg/bootstrap/install.go index 2e5349bb6f..c2067842a8 100644 --- a/nodeup/pkg/bootstrap/install.go +++ b/nodeup/pkg/bootstrap/install.go @@ -22,7 +22,7 @@ import ( "os" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/nodeup/pkg/distros" "k8s.io/kops/pkg/systemd" "k8s.io/kops/upup/pkg/fi" diff --git a/nodeup/pkg/distros/BUILD.bazel b/nodeup/pkg/distros/BUILD.bazel index 5d8fa86cdc..ac2cbad2e8 100644 --- a/nodeup/pkg/distros/BUILD.bazel +++ b/nodeup/pkg/distros/BUILD.bazel @@ -8,5 +8,5 @@ go_library( ], importpath = "k8s.io/kops/nodeup/pkg/distros", visibility = ["//visibility:public"], - deps = ["//vendor/k8s.io/klog:go_default_library"], + deps = ["//vendor/k8s.io/klog/v2:go_default_library"], ) diff --git a/nodeup/pkg/distros/distribution.go b/nodeup/pkg/distros/distribution.go index 2416361255..db09c5a9eb 100644 --- a/nodeup/pkg/distros/distribution.go +++ b/nodeup/pkg/distros/distribution.go @@ -17,7 +17,7 @@ limitations under the License. package distros import ( - "k8s.io/klog" + "k8s.io/klog/v2" ) type Distribution string diff --git a/nodeup/pkg/distros/identify.go b/nodeup/pkg/distros/identify.go index f154949c7f..7510a18121 100644 --- a/nodeup/pkg/distros/identify.go +++ b/nodeup/pkg/distros/identify.go @@ -23,7 +23,7 @@ import ( "path" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" ) // FindDistribution identifies the distribution on which we are running diff --git a/nodeup/pkg/model/BUILD.bazel b/nodeup/pkg/model/BUILD.bazel index 1c393a5055..92fb999489 100644 --- a/nodeup/pkg/model/BUILD.bazel +++ b/nodeup/pkg/model/BUILD.bazel @@ -76,7 +76,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library", "//vendor/k8s.io/utils/mount:go_default_library", "//vendor/sigs.k8s.io/yaml:go_default_library", @@ -122,6 +122,6 @@ go_test( "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/nodeup/pkg/model/containerd.go b/nodeup/pkg/model/containerd.go index 79593a6d84..c85e367d0e 100644 --- a/nodeup/pkg/model/containerd.go +++ b/nodeup/pkg/model/containerd.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/nodeup/pkg/distros" "k8s.io/kops/nodeup/pkg/model/resources" "k8s.io/kops/pkg/apis/kops" diff --git a/nodeup/pkg/model/context.go b/nodeup/pkg/model/context.go index 5733cfaba1..6dcf2d99f6 100644 --- a/nodeup/pkg/model/context.go +++ b/nodeup/pkg/model/context.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/nodeup/pkg/distros" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/model" diff --git a/nodeup/pkg/model/docker.go b/nodeup/pkg/model/docker.go index 0543cc8d7f..35f40ce28b 100644 --- a/nodeup/pkg/model/docker.go +++ b/nodeup/pkg/model/docker.go @@ -25,7 +25,7 @@ import ( "github.com/blang/semver/v4" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/nodeup/pkg/distros" "k8s.io/kops/nodeup/pkg/model/resources" "k8s.io/kops/pkg/apis/kops" diff --git a/nodeup/pkg/model/etcd.go b/nodeup/pkg/model/etcd.go index 94a91adc96..d6d0d3bf0d 100644 --- a/nodeup/pkg/model/etcd.go +++ b/nodeup/pkg/model/etcd.go @@ -22,7 +22,7 @@ import ( "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/nodetasks" - "k8s.io/klog" + "k8s.io/klog/v2" ) // EtcdBuilder installs etcd diff --git a/nodeup/pkg/model/firewall.go b/nodeup/pkg/model/firewall.go index c1ea9fd883..6453bdbe4e 100644 --- a/nodeup/pkg/model/firewall.go +++ b/nodeup/pkg/model/firewall.go @@ -17,7 +17,7 @@ limitations under the License. package model import ( - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/systemd" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/nodetasks" diff --git a/nodeup/pkg/model/hooks.go b/nodeup/pkg/model/hooks.go index 7a3f766e9e..082beadb2a 100644 --- a/nodeup/pkg/model/hooks.go +++ b/nodeup/pkg/model/hooks.go @@ -26,7 +26,7 @@ import ( "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/nodetasks" - "k8s.io/klog" + "k8s.io/klog/v2" ) // HookBuilder configures the hooks diff --git a/nodeup/pkg/model/kube_proxy.go b/nodeup/pkg/model/kube_proxy.go index 898045d069..f9553764fc 100644 --- a/nodeup/pkg/model/kube_proxy.go +++ b/nodeup/pkg/model/kube_proxy.go @@ -32,7 +32,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" ) // KubeProxyBuilder installs kube-proxy diff --git a/nodeup/pkg/model/kubectl.go b/nodeup/pkg/model/kubectl.go index 1c78a74bff..63a0c88d58 100644 --- a/nodeup/pkg/model/kubectl.go +++ b/nodeup/pkg/model/kubectl.go @@ -24,7 +24,7 @@ import ( "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/nodetasks" - "k8s.io/klog" + "k8s.io/klog/v2" ) // KubectlBuilder install kubectl diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go index 6bbaa44ad1..4da336a277 100644 --- a/nodeup/pkg/model/kubelet.go +++ b/nodeup/pkg/model/kubelet.go @@ -27,7 +27,7 @@ import ( "github.com/aws/aws-sdk-go/aws/session" v1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/nodeup/pkg/distros" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/flagbuilder" diff --git a/nodeup/pkg/model/kubelet_test.go b/nodeup/pkg/model/kubelet_test.go index a8dcbf51b3..590b2c2fee 100644 --- a/nodeup/pkg/model/kubelet_test.go +++ b/nodeup/pkg/model/kubelet_test.go @@ -21,7 +21,7 @@ import ( "path/filepath" "testing" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/nodeup" "k8s.io/kops/pkg/assets" diff --git a/nodeup/pkg/model/logrotate.go b/nodeup/pkg/model/logrotate.go index 64094a1b57..129efbd9df 100644 --- a/nodeup/pkg/model/logrotate.go +++ b/nodeup/pkg/model/logrotate.go @@ -26,7 +26,7 @@ import ( "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/nodetasks" - "k8s.io/klog" + "k8s.io/klog/v2" ) // LogrotateBuilder installs logrotate.d and configures log rotation for kubernetes logs diff --git a/nodeup/pkg/model/miscutils.go b/nodeup/pkg/model/miscutils.go index f47dfbb9c3..c6cdf28471 100644 --- a/nodeup/pkg/model/miscutils.go +++ b/nodeup/pkg/model/miscutils.go @@ -17,7 +17,7 @@ limitations under the License. package model import ( - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/nodeup/pkg/distros" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/nodetasks" diff --git a/nodeup/pkg/model/networking/BUILD.bazel b/nodeup/pkg/model/networking/BUILD.bazel index cfb025a846..df6fff01be 100644 --- a/nodeup/pkg/model/networking/BUILD.bazel +++ b/nodeup/pkg/model/networking/BUILD.bazel @@ -22,6 +22,6 @@ go_library( "//vendor/github.com/aws/aws-sdk-go/aws/session:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library", "//vendor/golang.org/x/sys/unix:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/nodeup/pkg/model/networking/lyft.go b/nodeup/pkg/model/networking/lyft.go index 3f63ee3fb4..a42551d757 100644 --- a/nodeup/pkg/model/networking/lyft.go +++ b/nodeup/pkg/model/networking/lyft.go @@ -28,7 +28,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "k8s.io/kops/upup/pkg/fi/nodeup/nodetasks" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/nodeup/pkg/model" api "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" diff --git a/nodeup/pkg/model/node_authorizer.go b/nodeup/pkg/model/node_authorizer.go index a3fdfa546a..1bbceff779 100644 --- a/nodeup/pkg/model/node_authorizer.go +++ b/nodeup/pkg/model/node_authorizer.go @@ -27,7 +27,7 @@ import ( "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/nodetasks" - "k8s.io/klog" + "k8s.io/klog/v2" ) // NodeAuthorizationBuilder is responsible for node authorization diff --git a/nodeup/pkg/model/ntp.go b/nodeup/pkg/model/ntp.go index f3b66e7c6b..2abdd85e75 100644 --- a/nodeup/pkg/model/ntp.go +++ b/nodeup/pkg/model/ntp.go @@ -17,7 +17,7 @@ limitations under the License. package model import ( - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/nodeup/pkg/distros" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/nodetasks" diff --git a/nodeup/pkg/model/packages.go b/nodeup/pkg/model/packages.go index 0d790a4373..e8c59b23d8 100644 --- a/nodeup/pkg/model/packages.go +++ b/nodeup/pkg/model/packages.go @@ -21,7 +21,7 @@ import ( "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/nodetasks" - "k8s.io/klog" + "k8s.io/klog/v2" ) // PackagesBuilder adds miscellaneous OS packages that we need diff --git a/nodeup/pkg/model/protokube.go b/nodeup/pkg/model/protokube.go index ff6daac4fb..e75eaa0392 100644 --- a/nodeup/pkg/model/protokube.go +++ b/nodeup/pkg/model/protokube.go @@ -36,7 +36,7 @@ import ( "k8s.io/kops/util/pkg/proxy" "github.com/blang/semver/v4" - "k8s.io/klog" + "k8s.io/klog/v2" ) // ProtokubeBuilder configures protokube diff --git a/nodeup/pkg/model/update_service.go b/nodeup/pkg/model/update_service.go index 2915f756a4..8d204be2d4 100644 --- a/nodeup/pkg/model/update_service.go +++ b/nodeup/pkg/model/update_service.go @@ -23,7 +23,7 @@ import ( "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/nodetasks" - "k8s.io/klog" + "k8s.io/klog/v2" ) // UpdateServiceBuilder enables/disables the OS automatic updates. diff --git a/nodeup/pkg/model/volumes.go b/nodeup/pkg/model/volumes.go index 97611bacf2..04c0ef6c43 100644 --- a/nodeup/pkg/model/volumes.go +++ b/nodeup/pkg/model/volumes.go @@ -21,7 +21,7 @@ import ( "k8s.io/kops/upup/pkg/fi" - "k8s.io/klog" + "k8s.io/klog/v2" utilexec "k8s.io/utils/exec" "k8s.io/utils/mount" ) diff --git a/pkg/acls/gce/BUILD.bazel b/pkg/acls/gce/BUILD.bazel index 5cdcd19b69..75d41ff38d 100644 --- a/pkg/acls/gce/BUILD.bazel +++ b/pkg/acls/gce/BUILD.bazel @@ -12,6 +12,6 @@ go_library( "//upup/pkg/fi/cloudup/gce:go_default_library", "//util/pkg/vfs:go_default_library", "//vendor/google.golang.org/api/storage/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/acls/gce/storage.go b/pkg/acls/gce/storage.go index 8f16b557eb..a74588b9c4 100644 --- a/pkg/acls/gce/storage.go +++ b/pkg/acls/gce/storage.go @@ -20,7 +20,7 @@ import ( "fmt" storage "google.golang.org/api/storage/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/acls" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi/cloudup" diff --git a/pkg/acls/s3/BUILD.bazel b/pkg/acls/s3/BUILD.bazel index 084d684498..9eb628e3d6 100644 --- a/pkg/acls/s3/BUILD.bazel +++ b/pkg/acls/s3/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "//pkg/apis/kops:go_default_library", "//pkg/values:go_default_library", "//util/pkg/vfs:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/acls/s3/storage.go b/pkg/acls/s3/storage.go index 895ccabb11..a79a10567d 100644 --- a/pkg/acls/s3/storage.go +++ b/pkg/acls/s3/storage.go @@ -22,7 +22,7 @@ import ( "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/acls" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/values" diff --git a/pkg/apis/kops/BUILD.bazel b/pkg/apis/kops/BUILD.bazel index 9d755d57ff..9cbb0a3647 100644 --- a/pkg/apis/kops/BUILD.bazel +++ b/pkg/apis/kops/BUILD.bazel @@ -33,7 +33,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/apis/kops/channel.go b/pkg/apis/kops/channel.go index 3db640ae8a..24320cccf5 100644 --- a/pkg/apis/kops/channel.go +++ b/pkg/apis/kops/channel.go @@ -22,7 +22,7 @@ import ( "github.com/blang/semver/v4" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops/util" "k8s.io/kops/util/pkg/vfs" ) diff --git a/pkg/apis/kops/instancegroup.go b/pkg/apis/kops/instancegroup.go index 931ce83fa7..27665f66ae 100644 --- a/pkg/apis/kops/instancegroup.go +++ b/pkg/apis/kops/instancegroup.go @@ -18,7 +18,7 @@ package kops import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" ) const ( diff --git a/pkg/apis/kops/status.go b/pkg/apis/kops/status.go index ae2b05de81..a9c278abff 100644 --- a/pkg/apis/kops/status.go +++ b/pkg/apis/kops/status.go @@ -17,7 +17,7 @@ limitations under the License. package kops import ( - "k8s.io/klog" + "k8s.io/klog/v2" ) // StatusStore abstracts the key status functions; and lets us introduce status gradually diff --git a/pkg/apis/kops/util/BUILD.bazel b/pkg/apis/kops/util/BUILD.bazel index c5e7196b12..b3b4dfdb46 100644 --- a/pkg/apis/kops/util/BUILD.bazel +++ b/pkg/apis/kops/util/BUILD.bazel @@ -11,7 +11,7 @@ go_library( deps = [ "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/apis/kops/util/versions.go b/pkg/apis/kops/util/versions.go index f406398c21..158a4e7363 100644 --- a/pkg/apis/kops/util/versions.go +++ b/pkg/apis/kops/util/versions.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/blang/semver/v4" - "k8s.io/klog" + "k8s.io/klog/v2" ) func ParseKubernetesVersion(version string) (*semver.Version, error) { diff --git a/pkg/apis/kops/v1alpha2/BUILD.bazel b/pkg/apis/kops/v1alpha2/BUILD.bazel index 83715fdd75..201bf8adad 100644 --- a/pkg/apis/kops/v1alpha2/BUILD.bazel +++ b/pkg/apis/kops/v1alpha2/BUILD.bazel @@ -30,6 +30,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/apis/kops/v1alpha2/defaults.go b/pkg/apis/kops/v1alpha2/defaults.go index 4d97f424b7..96667377db 100644 --- a/pkg/apis/kops/v1alpha2/defaults.go +++ b/pkg/apis/kops/v1alpha2/defaults.go @@ -18,7 +18,7 @@ package v1alpha2 import ( "k8s.io/apimachinery/pkg/runtime" - "k8s.io/klog" + "k8s.io/klog/v2" ) func addDefaultingFuncs(scheme *runtime.Scheme) error { diff --git a/pkg/assets/BUILD.bazel b/pkg/assets/BUILD.bazel index 3c72b16051..95aa44ccce 100644 --- a/pkg/assets/BUILD.bazel +++ b/pkg/assets/BUILD.bazel @@ -15,7 +15,7 @@ go_library( "//util/pkg/vfs:go_default_library", "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/assets/builder.go b/pkg/assets/builder.go index febac67ef0..a7310b4dcf 100644 --- a/pkg/assets/builder.go +++ b/pkg/assets/builder.go @@ -27,7 +27,7 @@ import ( "github.com/blang/semver/v4" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/util" "k8s.io/kops/pkg/featureflag" diff --git a/pkg/backoff/BUILD.bazel b/pkg/backoff/BUILD.bazel index 64c28689be..cb75b45ce3 100644 --- a/pkg/backoff/BUILD.bazel +++ b/pkg/backoff/BUILD.bazel @@ -5,7 +5,7 @@ go_library( srcs = ["global.go"], importpath = "k8s.io/kops/pkg/backoff", visibility = ["//visibility:public"], - deps = ["//vendor/k8s.io/klog:go_default_library"], + deps = ["//vendor/k8s.io/klog/v2:go_default_library"], ) go_test( diff --git a/pkg/backoff/global.go b/pkg/backoff/global.go index 6160e7839b..f95fa14271 100644 --- a/pkg/backoff/global.go +++ b/pkg/backoff/global.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "k8s.io/klog" + "k8s.io/klog/v2" ) // globalBackoffMutex guards globalBackoff diff --git a/pkg/client/simple/api/BUILD.bazel b/pkg/client/simple/api/BUILD.bazel index e3a9f19e06..d6bbfcf15a 100644 --- a/pkg/client/simple/api/BUILD.bazel +++ b/pkg/client/simple/api/BUILD.bazel @@ -16,6 +16,6 @@ go_library( "//util/pkg/vfs:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/client/simple/api/clientset.go b/pkg/client/simple/api/clientset.go index f69042c82b..44cda7d152 100644 --- a/pkg/client/simple/api/clientset.go +++ b/pkg/client/simple/api/clientset.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/registry" "k8s.io/kops/pkg/apis/kops/validation" diff --git a/pkg/client/simple/vfsclientset/BUILD.bazel b/pkg/client/simple/vfsclientset/BUILD.bazel index c1bf3b83dd..0ad4c48f2d 100644 --- a/pkg/client/simple/vfsclientset/BUILD.bazel +++ b/pkg/client/simple/vfsclientset/BUILD.bazel @@ -32,7 +32,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/client/simple/vfsclientset/clientset.go b/pkg/client/simple/vfsclientset/clientset.go index be9c52b9f2..40e2233949 100644 --- a/pkg/client/simple/vfsclientset/clientset.go +++ b/pkg/client/simple/vfsclientset/clientset.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kops/pkg/apis/kops" diff --git a/pkg/client/simple/vfsclientset/cluster.go b/pkg/client/simple/vfsclientset/cluster.go index f35e194d55..31ecc36f22 100644 --- a/pkg/client/simple/vfsclientset/cluster.go +++ b/pkg/client/simple/vfsclientset/cluster.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/watch" - "k8s.io/klog" + "k8s.io/klog/v2" api "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/registry" "k8s.io/kops/pkg/apis/kops/validation" diff --git a/pkg/client/simple/vfsclientset/commonvfs.go b/pkg/client/simple/vfsclientset/commonvfs.go index 1573da4dd1..9a52c376cd 100644 --- a/pkg/client/simple/vfsclientset/commonvfs.go +++ b/pkg/client/simple/vfsclientset/commonvfs.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/acls" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/v1alpha2" diff --git a/pkg/client/simple/vfsclientset/instancegroup.go b/pkg/client/simple/vfsclientset/instancegroup.go index d227d72a5d..5e88b3f10a 100644 --- a/pkg/client/simple/vfsclientset/instancegroup.go +++ b/pkg/client/simple/vfsclientset/instancegroup.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" - "k8s.io/klog" + "k8s.io/klog/v2" kopsapi "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/validation" kopsinternalversion "k8s.io/kops/pkg/client/clientset_generated/clientset/typed/kops/internalversion" diff --git a/pkg/cloudinstances/BUILD.bazel b/pkg/cloudinstances/BUILD.bazel index 8b899a0d9e..659d17a3f5 100644 --- a/pkg/cloudinstances/BUILD.bazel +++ b/pkg/cloudinstances/BUILD.bazel @@ -8,6 +8,6 @@ go_library( deps = [ "//pkg/apis/kops:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/cloudinstances/cloud_instance_group.go b/pkg/cloudinstances/cloud_instance_group.go index 62ad3e366c..15cda9a9b8 100644 --- a/pkg/cloudinstances/cloud_instance_group.go +++ b/pkg/cloudinstances/cloud_instance_group.go @@ -21,7 +21,7 @@ import ( "strings" v1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" kopsapi "k8s.io/kops/pkg/apis/kops" ) diff --git a/pkg/configbuilder/BUILD.bazel b/pkg/configbuilder/BUILD.bazel index 9c18771803..a163688509 100644 --- a/pkg/configbuilder/BUILD.bazel +++ b/pkg/configbuilder/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "//util/pkg/reflectutils:go_default_library", "//vendor/gopkg.in/yaml.v2:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/configbuilder/buildconfigfile.go b/pkg/configbuilder/buildconfigfile.go index f65d47bb85..2001a635fd 100644 --- a/pkg/configbuilder/buildconfigfile.go +++ b/pkg/configbuilder/buildconfigfile.go @@ -25,7 +25,7 @@ import ( "gopkg.in/yaml.v2" "k8s.io/apimachinery/pkg/api/resource" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/util/pkg/reflectutils" ) diff --git a/pkg/diff/BUILD.bazel b/pkg/diff/BUILD.bazel index d1db78a0ed..898e83c82c 100644 --- a/pkg/diff/BUILD.bazel +++ b/pkg/diff/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//vendor/github.com/sergi/go-diff/diffmatchpatch:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/diff/diff.go b/pkg/diff/diff.go index b3e968da86..fadcce8fd5 100644 --- a/pkg/diff/diff.go +++ b/pkg/diff/diff.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/sergi/go-diff/diffmatchpatch" - "k8s.io/klog" + "k8s.io/klog/v2" ) func FormatDiff(lString, rString string) string { diff --git a/pkg/dump/BUILD.bazel b/pkg/dump/BUILD.bazel index da58f9643e..6f82c02f2f 100644 --- a/pkg/dump/BUILD.bazel +++ b/pkg/dump/BUILD.bazel @@ -8,6 +8,6 @@ go_library( deps = [ "//vendor/golang.org/x/crypto/ssh:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/dump/dumper.go b/pkg/dump/dumper.go index 680ac400eb..d5619a5551 100644 --- a/pkg/dump/dumper.go +++ b/pkg/dump/dumper.go @@ -29,7 +29,7 @@ import ( "golang.org/x/crypto/ssh" corev1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" ) // logDumper gets all the nodes from a kubernetes cluster and dumps a well-known set of logs diff --git a/pkg/featureflag/BUILD.bazel b/pkg/featureflag/BUILD.bazel index 04905e4e2e..413fa9c309 100644 --- a/pkg/featureflag/BUILD.bazel +++ b/pkg/featureflag/BUILD.bazel @@ -5,12 +5,12 @@ go_library( srcs = ["featureflag.go"], importpath = "k8s.io/kops/pkg/featureflag", visibility = ["//visibility:public"], - deps = ["//vendor/k8s.io/klog:go_default_library"], + deps = ["//vendor/k8s.io/klog/v2:go_default_library"], ) go_test( name = "go_default_test", srcs = ["featureflag_test.go"], embed = [":go_default_library"], - deps = ["//vendor/k8s.io/klog:go_default_library"], + deps = ["//vendor/k8s.io/klog/v2:go_default_library"], ) diff --git a/pkg/featureflag/featureflag.go b/pkg/featureflag/featureflag.go index a516976b9b..3ae14150ab 100644 --- a/pkg/featureflag/featureflag.go +++ b/pkg/featureflag/featureflag.go @@ -29,7 +29,7 @@ import ( "strings" "sync" - "k8s.io/klog" + "k8s.io/klog/v2" ) const ( diff --git a/pkg/featureflag/featureflag_test.go b/pkg/featureflag/featureflag_test.go index 347711d47f..98725f51aa 100644 --- a/pkg/featureflag/featureflag_test.go +++ b/pkg/featureflag/featureflag_test.go @@ -20,7 +20,7 @@ import ( "os" "testing" - "k8s.io/klog" + "k8s.io/klog/v2" ) func TestFlagToFalse(t *testing.T) { diff --git a/pkg/flagbuilder/BUILD.bazel b/pkg/flagbuilder/BUILD.bazel index efa928c224..7eef0ce078 100644 --- a/pkg/flagbuilder/BUILD.bazel +++ b/pkg/flagbuilder/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "//util/pkg/reflectutils:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/flagbuilder/build_flags.go b/pkg/flagbuilder/build_flags.go index b5d43e8ee0..7ad4c02df5 100644 --- a/pkg/flagbuilder/build_flags.go +++ b/pkg/flagbuilder/build_flags.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/util/pkg/reflectutils" ) diff --git a/pkg/formatter/BUILD.bazel b/pkg/formatter/BUILD.bazel index 45d959f512..924eb65a4b 100644 --- a/pkg/formatter/BUILD.bazel +++ b/pkg/formatter/BUILD.bazel @@ -8,7 +8,7 @@ go_library( deps = [ "//pkg/apis/kops:go_default_library", "//pkg/apis/kops/model:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/formatter/instancegroup.go b/pkg/formatter/instancegroup.go index a1e2b59956..ca003f1fe4 100644 --- a/pkg/formatter/instancegroup.go +++ b/pkg/formatter/instancegroup.go @@ -19,7 +19,7 @@ package formatter import ( "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/model" ) diff --git a/pkg/instancegroups/BUILD.bazel b/pkg/instancegroups/BUILD.bazel index d620841da7..be31d811c6 100644 --- a/pkg/instancegroups/BUILD.bazel +++ b/pkg/instancegroups/BUILD.bazel @@ -25,7 +25,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/json:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/k8s.io/kubectl/pkg/drain:go_default_library", ], ) diff --git a/pkg/instancegroups/delete.go b/pkg/instancegroups/delete.go index cc2f50fe3c..bc35a45ef3 100644 --- a/pkg/instancegroups/delete.go +++ b/pkg/instancegroups/delete.go @@ -21,7 +21,7 @@ import ( "fmt" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" api "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/client/simple" "k8s.io/kops/upup/pkg/fi" diff --git a/pkg/instancegroups/instancegroups.go b/pkg/instancegroups/instancegroups.go index ab811818cc..5c108eacd8 100644 --- a/pkg/instancegroups/instancegroups.go +++ b/pkg/instancegroups/instancegroups.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/json" "k8s.io/apimachinery/pkg/util/strategicpatch" - "k8s.io/klog" + "k8s.io/klog/v2" api "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/cloudinstances" "k8s.io/kubectl/pkg/drain" diff --git a/pkg/instancegroups/rollingupdate.go b/pkg/instancegroups/rollingupdate.go index 6d8fb2b595..472f0914ac 100644 --- a/pkg/instancegroups/rollingupdate.go +++ b/pkg/instancegroups/rollingupdate.go @@ -24,7 +24,7 @@ import ( "time" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" api "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/cloudinstances" "k8s.io/kops/pkg/validation" diff --git a/pkg/k8scodecs/BUILD.bazel b/pkg/k8scodecs/BUILD.bazel index 3b6c4a3acb..557c554623 100644 --- a/pkg/k8scodecs/BUILD.bazel +++ b/pkg/k8scodecs/BUILD.bazel @@ -11,7 +11,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/k8scodecs/codecs.go b/pkg/k8scodecs/codecs.go index 2b2f86fea7..555b63b563 100644 --- a/pkg/k8scodecs/codecs.go +++ b/pkg/k8scodecs/codecs.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer" - "k8s.io/klog" + "k8s.io/klog/v2" ) var Scheme = runtime.NewScheme() diff --git a/pkg/kopscodecs/BUILD.bazel b/pkg/kopscodecs/BUILD.bazel index 72299ad809..5d5684e2ed 100644 --- a/pkg/kopscodecs/BUILD.bazel +++ b/pkg/kopscodecs/BUILD.bazel @@ -13,7 +13,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/kopscodecs/codecs.go b/pkg/kopscodecs/codecs.go index e4a6d9d811..38b0d938c0 100644 --- a/pkg/kopscodecs/codecs.go +++ b/pkg/kopscodecs/codecs.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/install" "k8s.io/kops/pkg/apis/kops/v1alpha2" diff --git a/pkg/kubeconfig/BUILD.bazel b/pkg/kubeconfig/BUILD.bazel index c5fb5ebc47..ef854141b9 100644 --- a/pkg/kubeconfig/BUILD.bazel +++ b/pkg/kubeconfig/BUILD.bazel @@ -19,7 +19,7 @@ go_library( "//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library", "//vendor/k8s.io/client-go/tools/clientcmd/api:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/kubeconfig/create_kubecfg.go b/pkg/kubeconfig/create_kubecfg.go index 3ada5210fe..294954c448 100644 --- a/pkg/kubeconfig/create_kubecfg.go +++ b/pkg/kubeconfig/create_kubecfg.go @@ -23,7 +23,7 @@ import ( "time" "k8s.io/client-go/tools/clientcmd" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/util" "k8s.io/kops/pkg/dns" diff --git a/pkg/kubeconfig/kubecfg_builder.go b/pkg/kubeconfig/kubecfg_builder.go index e5c3d3c21c..e5f26ca18a 100644 --- a/pkg/kubeconfig/kubecfg_builder.go +++ b/pkg/kubeconfig/kubecfg_builder.go @@ -22,7 +22,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - "k8s.io/klog" + "k8s.io/klog/v2" ) // KubeconfigBuilder builds a kubecfg file diff --git a/pkg/kubemanifest/BUILD.bazel b/pkg/kubemanifest/BUILD.bazel index 818a3f5dcd..b97ff85a3f 100644 --- a/pkg/kubemanifest/BUILD.bazel +++ b/pkg/kubemanifest/BUILD.bazel @@ -16,6 +16,6 @@ go_library( "//util/pkg/text:go_default_library", "//vendor/github.com/ghodss/yaml:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/kubemanifest/images.go b/pkg/kubemanifest/images.go index 80ff43496a..419ead1bfd 100644 --- a/pkg/kubemanifest/images.go +++ b/pkg/kubemanifest/images.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" ) type ImageRemapFunction func(image string) (string, error) diff --git a/pkg/kubemanifest/manifest.go b/pkg/kubemanifest/manifest.go index d86a69665e..8c689a6aac 100644 --- a/pkg/kubemanifest/manifest.go +++ b/pkg/kubemanifest/manifest.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/ghodss/yaml" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/util/pkg/text" ) diff --git a/pkg/kubemanifest/visitor.go b/pkg/kubemanifest/visitor.go index 25c6d1f2dd..1779cdaf9f 100644 --- a/pkg/kubemanifest/visitor.go +++ b/pkg/kubemanifest/visitor.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" ) type visitorBase struct { diff --git a/pkg/model/BUILD.bazel b/pkg/model/BUILD.bazel index 08da1553e7..e980f7d118 100644 --- a/pkg/model/BUILD.bazel +++ b/pkg/model/BUILD.bazel @@ -57,7 +57,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/yaml:go_default_library", "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/k8s.io/legacy-cloud-providers/aws:go_default_library", ], ) diff --git a/pkg/model/alimodel/BUILD.bazel b/pkg/model/alimodel/BUILD.bazel index cbc4fab7b3..8109c31bde 100644 --- a/pkg/model/alimodel/BUILD.bazel +++ b/pkg/model/alimodel/BUILD.bazel @@ -27,6 +27,6 @@ go_library( "//upup/pkg/fi/cloudup/alitasks:go_default_library", "//util/pkg/vfs:go_default_library", "//vendor/github.com/denverdino/aliyungo/ram:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/model/alimodel/context.go b/pkg/model/alimodel/context.go index 57714bd6ab..a6969b7d73 100644 --- a/pkg/model/alimodel/context.go +++ b/pkg/model/alimodel/context.go @@ -19,7 +19,7 @@ package alimodel import ( "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/model" "k8s.io/kops/upup/pkg/fi/cloudup/alitasks" diff --git a/pkg/model/alimodel/external_access.go b/pkg/model/alimodel/external_access.go index cc092c1d10..a517b10a0d 100644 --- a/pkg/model/alimodel/external_access.go +++ b/pkg/model/alimodel/external_access.go @@ -19,7 +19,7 @@ package alimodel import ( "strconv" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/alitasks" diff --git a/pkg/model/alimodel/policy_builder.go b/pkg/model/alimodel/policy_builder.go index d8948705c2..0c50d9c289 100644 --- a/pkg/model/alimodel/policy_builder.go +++ b/pkg/model/alimodel/policy_builder.go @@ -24,7 +24,7 @@ import ( "sort" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/model/iam" "k8s.io/kops/pkg/util/stringorslice" diff --git a/pkg/model/awsmodel/BUILD.bazel b/pkg/model/awsmodel/BUILD.bazel index 97059adaeb..50ece125ed 100644 --- a/pkg/model/awsmodel/BUILD.bazel +++ b/pkg/model/awsmodel/BUILD.bazel @@ -20,7 +20,7 @@ go_library( "//upup/pkg/fi/cloudup/awstasks:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/model/awsmodel/api_loadbalancer.go b/pkg/model/awsmodel/api_loadbalancer.go index 437018e0f2..0f2d1498e6 100644 --- a/pkg/model/awsmodel/api_loadbalancer.go +++ b/pkg/model/awsmodel/api_loadbalancer.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/dns" "k8s.io/kops/pkg/featureflag" diff --git a/pkg/model/awsmodel/autoscalinggroup.go b/pkg/model/awsmodel/autoscalinggroup.go index ed332341f1..8156f54a2a 100644 --- a/pkg/model/awsmodel/autoscalinggroup.go +++ b/pkg/model/awsmodel/autoscalinggroup.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/featureflag" "k8s.io/kops/pkg/model" diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go index 4040b16c20..cc71e6d4ab 100644 --- a/pkg/model/bootstrapscript.go +++ b/pkg/model/bootstrapscript.go @@ -28,7 +28,7 @@ import ( "text/template" "github.com/ghodss/yaml" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi/utils" "k8s.io/kops/pkg/apis/kops" diff --git a/pkg/model/components/BUILD.bazel b/pkg/model/components/BUILD.bazel index 6d5426db37..f800296e6f 100644 --- a/pkg/model/components/BUILD.bazel +++ b/pkg/model/components/BUILD.bazel @@ -34,7 +34,7 @@ go_library( "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/model/components/containerd.go b/pkg/model/components/containerd.go index 4933171e64..c49804a9c3 100644 --- a/pkg/model/components/containerd.go +++ b/pkg/model/components/containerd.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/loader" diff --git a/pkg/model/components/context.go b/pkg/model/components/context.go index bf9c643334..1203aa6320 100644 --- a/pkg/model/components/context.go +++ b/pkg/model/components/context.go @@ -31,7 +31,7 @@ import ( "k8s.io/kops/util/pkg/vfs" "github.com/blang/semver/v4" - "k8s.io/klog" + "k8s.io/klog/v2" ) // OptionsContext is the context object for options builders diff --git a/pkg/model/components/etcdmanager/BUILD.bazel b/pkg/model/components/etcdmanager/BUILD.bazel index 7d1b6d67e8..ca493d932a 100644 --- a/pkg/model/components/etcdmanager/BUILD.bazel +++ b/pkg/model/components/etcdmanager/BUILD.bazel @@ -32,7 +32,7 @@ go_library( "//util/pkg/exec:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go index bf3b0d9485..7b22ef22c6 100644 --- a/pkg/model/components/etcdmanager/model.go +++ b/pkg/model/components/etcdmanager/model.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/assets" "k8s.io/kops/pkg/dns" diff --git a/pkg/model/components/etcdmanager/options.go b/pkg/model/components/etcdmanager/options.go index ed6ce1a46d..1a3b8c281e 100644 --- a/pkg/model/components/etcdmanager/options.go +++ b/pkg/model/components/etcdmanager/options.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/featureflag" "k8s.io/kops/pkg/model/components" diff --git a/pkg/model/components/kubecontrollermanager.go b/pkg/model/components/kubecontrollermanager.go index 68f90fa4d9..394e5178e5 100644 --- a/pkg/model/components/kubecontrollermanager.go +++ b/pkg/model/components/kubecontrollermanager.go @@ -21,7 +21,7 @@ import ( "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/gce" diff --git a/pkg/model/components/kubelet.go b/pkg/model/components/kubelet.go index 856449e025..2ed9464d3c 100644 --- a/pkg/model/components/kubelet.go +++ b/pkg/model/components/kubelet.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/loader" diff --git a/pkg/model/context.go b/pkg/model/context.go index e51f28de7d..a357eb4227 100644 --- a/pkg/model/context.go +++ b/pkg/model/context.go @@ -35,7 +35,7 @@ import ( "github.com/blang/semver/v4" utilnet "k8s.io/apimachinery/pkg/util/net" - "k8s.io/klog" + "k8s.io/klog/v2" ) const ( diff --git a/pkg/model/external_access.go b/pkg/model/external_access.go index 91166f210c..a89d37fdc6 100644 --- a/pkg/model/external_access.go +++ b/pkg/model/external_access.go @@ -19,7 +19,7 @@ package model import ( "fmt" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awstasks" diff --git a/pkg/model/firewall.go b/pkg/model/firewall.go index af60fd48ad..604089f8ee 100644 --- a/pkg/model/firewall.go +++ b/pkg/model/firewall.go @@ -24,7 +24,7 @@ import ( "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awstasks" - "k8s.io/klog" + "k8s.io/klog/v2" ) type Protocol int diff --git a/pkg/model/gcemodel/BUILD.bazel b/pkg/model/gcemodel/BUILD.bazel index e32a094c92..0751f888ac 100644 --- a/pkg/model/gcemodel/BUILD.bazel +++ b/pkg/model/gcemodel/BUILD.bazel @@ -27,6 +27,6 @@ go_library( "//upup/pkg/fi/cloudup/gcetasks:go_default_library", "//util/pkg/vfs:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/model/gcemodel/autoscalinggroup.go b/pkg/model/gcemodel/autoscalinggroup.go index 7ab312142f..23a9c6d964 100644 --- a/pkg/model/gcemodel/autoscalinggroup.go +++ b/pkg/model/gcemodel/autoscalinggroup.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/model" "k8s.io/kops/pkg/model/defaults" diff --git a/pkg/model/gcemodel/external_access.go b/pkg/model/gcemodel/external_access.go index 275a069cf6..c6a4ae280c 100644 --- a/pkg/model/gcemodel/external_access.go +++ b/pkg/model/gcemodel/external_access.go @@ -17,7 +17,7 @@ limitations under the License. package gcemodel import ( - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/gcetasks" diff --git a/pkg/model/gcemodel/firewall.go b/pkg/model/gcemodel/firewall.go index c989b7ac08..472ad28195 100644 --- a/pkg/model/gcemodel/firewall.go +++ b/pkg/model/gcemodel/firewall.go @@ -17,7 +17,7 @@ limitations under the License. package gcemodel import ( - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/gcetasks" diff --git a/pkg/model/gcemodel/storageacl.go b/pkg/model/gcemodel/storageacl.go index 8db2c21c3f..f545a70913 100644 --- a/pkg/model/gcemodel/storageacl.go +++ b/pkg/model/gcemodel/storageacl.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/featureflag" "k8s.io/kops/pkg/model/iam" diff --git a/pkg/model/iam.go b/pkg/model/iam.go index a18e610fdb..ae6fdce0a1 100644 --- a/pkg/model/iam.go +++ b/pkg/model/iam.go @@ -21,7 +21,7 @@ import ( "strings" "text/template" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/model/iam" "k8s.io/kops/upup/pkg/fi" diff --git a/pkg/model/iam/BUILD.bazel b/pkg/model/iam/BUILD.bazel index dd2060d457..7b715453fb 100644 --- a/pkg/model/iam/BUILD.bazel +++ b/pkg/model/iam/BUILD.bazel @@ -16,7 +16,7 @@ go_library( "//upup/pkg/fi/cloudup/awstasks:go_default_library", "//util/pkg/vfs:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/model/iam/iam_builder.go b/pkg/model/iam/iam_builder.go index aa58a252d8..05ec75ca1c 100644 --- a/pkg/model/iam/iam_builder.go +++ b/pkg/model/iam/iam_builder.go @@ -34,7 +34,7 @@ import ( "strings" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops/model" "k8s.io/kops/pkg/apis/kops" diff --git a/pkg/model/manifests.go b/pkg/model/manifests.go index 02662d27b1..8a31a3be2e 100644 --- a/pkg/model/manifests.go +++ b/pkg/model/manifests.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/yaml" scheme "k8s.io/client-go/kubernetes/scheme" - "k8s.io/klog" + "k8s.io/klog/v2" ) // ParseManifest parses a set of objects from a []byte diff --git a/pkg/model/names.go b/pkg/model/names.go index ef50412db5..04251c4477 100644 --- a/pkg/model/names.go +++ b/pkg/model/names.go @@ -25,7 +25,7 @@ import ( "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awstasks" - "k8s.io/klog" + "k8s.io/klog/v2" ) // SecurityGroupName returns the security group name for the specific role diff --git a/pkg/model/network.go b/pkg/model/network.go index bc58ecb8db..314189e5be 100644 --- a/pkg/model/network.go +++ b/pkg/model/network.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awstasks" diff --git a/pkg/model/openstackmodel/BUILD.bazel b/pkg/model/openstackmodel/BUILD.bazel index be1ae3df96..8b4f1ee25d 100644 --- a/pkg/model/openstackmodel/BUILD.bazel +++ b/pkg/model/openstackmodel/BUILD.bazel @@ -22,7 +22,7 @@ go_library( "//upup/pkg/fi/cloudup/openstacktasks:go_default_library", "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules:go_default_library", "//vendor/k8s.io/cloud-provider-openstack/pkg/util/openstack:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/model/openstackmodel/context.go b/pkg/model/openstackmodel/context.go index 0b5edd86e3..d049fe205f 100644 --- a/pkg/model/openstackmodel/context.go +++ b/pkg/model/openstackmodel/context.go @@ -20,7 +20,7 @@ import ( "fmt" openstackutil "k8s.io/cloud-provider-openstack/pkg/util/openstack" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/model" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/openstack" diff --git a/pkg/model/openstackmodel/firewall.go b/pkg/model/openstackmodel/firewall.go index de7e1139eb..1b28987994 100644 --- a/pkg/model/openstackmodel/firewall.go +++ b/pkg/model/openstackmodel/firewall.go @@ -22,7 +22,7 @@ import ( "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/openstacktasks" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/dns" "k8s.io/kops/pkg/wellknownports" ) diff --git a/pkg/model/openstackmodel/servergroup.go b/pkg/model/openstackmodel/servergroup.go index b459c77b8f..9de7c7938d 100644 --- a/pkg/model/openstackmodel/servergroup.go +++ b/pkg/model/openstackmodel/servergroup.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/dns" "k8s.io/kops/pkg/model" diff --git a/pkg/model/spotinstmodel/BUILD.bazel b/pkg/model/spotinstmodel/BUILD.bazel index 2a65d6eb58..1c44334e73 100644 --- a/pkg/model/spotinstmodel/BUILD.bazel +++ b/pkg/model/spotinstmodel/BUILD.bazel @@ -14,6 +14,6 @@ go_library( "//upup/pkg/fi/cloudup/awstasks:go_default_library", "//upup/pkg/fi/cloudup/spotinsttasks:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/model/spotinstmodel/instance_group.go b/pkg/model/spotinstmodel/instance_group.go index 38776f4d62..855e9f1f63 100644 --- a/pkg/model/spotinstmodel/instance_group.go +++ b/pkg/model/spotinstmodel/instance_group.go @@ -22,7 +22,7 @@ import ( "strings" corev1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/featureflag" "k8s.io/kops/pkg/model" diff --git a/pkg/nodeidentity/aws/BUILD.bazel b/pkg/nodeidentity/aws/BUILD.bazel index f25a1a182e..de186af6ce 100644 --- a/pkg/nodeidentity/aws/BUILD.bazel +++ b/pkg/nodeidentity/aws/BUILD.bazel @@ -14,6 +14,6 @@ go_library( "//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/ec2/ec2iface:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/nodeidentity/aws/identify.go b/pkg/nodeidentity/aws/identify.go index 177b365aff..c680756bb0 100644 --- a/pkg/nodeidentity/aws/identify.go +++ b/pkg/nodeidentity/aws/identify.go @@ -28,7 +28,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" corev1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/nodeidentity" ) diff --git a/pkg/nodeidentity/gce/BUILD.bazel b/pkg/nodeidentity/gce/BUILD.bazel index 8c3f6b1a2d..019c2ed26c 100644 --- a/pkg/nodeidentity/gce/BUILD.bazel +++ b/pkg/nodeidentity/gce/BUILD.bazel @@ -10,6 +10,6 @@ go_library( "//vendor/cloud.google.com/go/compute/metadata:go_default_library", "//vendor/google.golang.org/api/compute/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/nodeidentity/gce/identify.go b/pkg/nodeidentity/gce/identify.go index 4c8850f444..22167b7c8e 100644 --- a/pkg/nodeidentity/gce/identify.go +++ b/pkg/nodeidentity/gce/identify.go @@ -26,7 +26,7 @@ import ( "cloud.google.com/go/compute/metadata" compute "google.golang.org/api/compute/v1" corev1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/nodeidentity" ) diff --git a/pkg/pki/BUILD.bazel b/pkg/pki/BUILD.bazel index e8fc7e55ae..579f3c1e9a 100644 --- a/pkg/pki/BUILD.bazel +++ b/pkg/pki/BUILD.bazel @@ -14,7 +14,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//vendor/golang.org/x/crypto/ssh:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/pki/cert_utils.go b/pkg/pki/cert_utils.go index 195cdcc886..72b28404c7 100644 --- a/pkg/pki/cert_utils.go +++ b/pkg/pki/cert_utils.go @@ -24,7 +24,7 @@ import ( "sort" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" ) func PkixNameToString(name *pkix.Name) string { diff --git a/pkg/pki/certificate.go b/pkg/pki/certificate.go index 8615e9b7e3..c9f8c5511c 100644 --- a/pkg/pki/certificate.go +++ b/pkg/pki/certificate.go @@ -28,7 +28,7 @@ import ( "io" "os" - "k8s.io/klog" + "k8s.io/klog/v2" ) type Certificate struct { diff --git a/pkg/pki/csr.go b/pkg/pki/csr.go index b8bad02f67..6de5478a07 100644 --- a/pkg/pki/csr.go +++ b/pkg/pki/csr.go @@ -24,7 +24,7 @@ import ( "math/big" "time" - "k8s.io/klog" + "k8s.io/klog/v2" ) // BuildPKISerial produces a serial number for certs that is vanishingly unlikely to collide diff --git a/pkg/pki/privatekey.go b/pkg/pki/privatekey.go index 0d29428280..b75f7b4fd5 100644 --- a/pkg/pki/privatekey.go +++ b/pkg/pki/privatekey.go @@ -30,7 +30,7 @@ import ( "os" "strconv" - "k8s.io/klog" + "k8s.io/klog/v2" ) // DefaultPrivateKeySize is the key size to use when generating private keys diff --git a/pkg/resources/BUILD.bazel b/pkg/resources/BUILD.bazel index 4d41510707..6f849da4cc 100644 --- a/pkg/resources/BUILD.bazel +++ b/pkg/resources/BUILD.bazel @@ -11,6 +11,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//upup/pkg/fi:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/resources/ali/BUILD.bazel b/pkg/resources/ali/BUILD.bazel index b2524aa9f5..bfb383f66f 100644 --- a/pkg/resources/ali/BUILD.bazel +++ b/pkg/resources/ali/BUILD.bazel @@ -15,6 +15,6 @@ go_library( "//vendor/github.com/denverdino/aliyungo/ess:go_default_library", "//vendor/github.com/denverdino/aliyungo/ram:go_default_library", "//vendor/github.com/denverdino/aliyungo/slb:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/resources/ali/ali.go b/pkg/resources/ali/ali.go index b85cf2ef06..af6c4eb434 100644 --- a/pkg/resources/ali/ali.go +++ b/pkg/resources/ali/ali.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" common "github.com/denverdino/aliyungo/common" ecs "github.com/denverdino/aliyungo/ecs" diff --git a/pkg/resources/aws/BUILD.bazel b/pkg/resources/aws/BUILD.bazel index 1ff6a6be17..c76a5031fb 100644 --- a/pkg/resources/aws/BUILD.bazel +++ b/pkg/resources/aws/BUILD.bazel @@ -32,7 +32,7 @@ go_library( "//vendor/github.com/aws/aws-sdk-go/service/iam:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/route53:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/resources/aws/aws.go b/pkg/resources/aws/aws.go index c826395cc6..00c1b28dd4 100644 --- a/pkg/resources/aws/aws.go +++ b/pkg/resources/aws/aws.go @@ -31,7 +31,7 @@ import ( "github.com/aws/aws-sdk-go/service/iam" "github.com/aws/aws-sdk-go/service/route53" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/dns" "k8s.io/kops/pkg/featureflag" "k8s.io/kops/pkg/resources" diff --git a/pkg/resources/aws/errors.go b/pkg/resources/aws/errors.go index 375622600c..bb7cf6ed9d 100644 --- a/pkg/resources/aws/errors.go +++ b/pkg/resources/aws/errors.go @@ -17,7 +17,7 @@ limitations under the License. package aws import ( - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" ) diff --git a/pkg/resources/aws/routetable.go b/pkg/resources/aws/routetable.go index b14dae8a65..26905a46cb 100644 --- a/pkg/resources/aws/routetable.go +++ b/pkg/resources/aws/routetable.go @@ -21,7 +21,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/resources" "k8s.io/kops/upup/pkg/fi" diff --git a/pkg/resources/aws/securitygroup.go b/pkg/resources/aws/securitygroup.go index 456d0c0d84..5445075c06 100644 --- a/pkg/resources/aws/securitygroup.go +++ b/pkg/resources/aws/securitygroup.go @@ -21,7 +21,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/resources" "k8s.io/kops/upup/pkg/fi" diff --git a/pkg/resources/aws/tags.go b/pkg/resources/aws/tags.go index 1b984f4a18..0c4d2e4ffb 100644 --- a/pkg/resources/aws/tags.go +++ b/pkg/resources/aws/tags.go @@ -19,7 +19,7 @@ package aws import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" ) diff --git a/pkg/resources/aws/vpc.go b/pkg/resources/aws/vpc.go index 764e75fbc6..f6fdc16a77 100644 --- a/pkg/resources/aws/vpc.go +++ b/pkg/resources/aws/vpc.go @@ -21,7 +21,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/resources" "k8s.io/kops/upup/pkg/fi" diff --git a/pkg/resources/digitalocean/BUILD.bazel b/pkg/resources/digitalocean/BUILD.bazel index c12152f22a..0683ec059f 100644 --- a/pkg/resources/digitalocean/BUILD.bazel +++ b/pkg/resources/digitalocean/BUILD.bazel @@ -20,6 +20,6 @@ go_library( "//vendor/github.com/digitalocean/godo:go_default_library", "//vendor/golang.org/x/oauth2:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/resources/digitalocean/cloud.go b/pkg/resources/digitalocean/cloud.go index 369a50ecf5..4b0b74a3ca 100644 --- a/pkg/resources/digitalocean/cloud.go +++ b/pkg/resources/digitalocean/cloud.go @@ -26,7 +26,7 @@ import ( "github.com/digitalocean/godo" "golang.org/x/oauth2" - "k8s.io/klog" + "k8s.io/klog/v2" v1 "k8s.io/api/core/v1" "k8s.io/kops/dnsprovider/pkg/dnsprovider" diff --git a/pkg/resources/digitalocean/dns/BUILD.bazel b/pkg/resources/digitalocean/dns/BUILD.bazel index 1db603a392..1b053337c7 100644 --- a/pkg/resources/digitalocean/dns/BUILD.bazel +++ b/pkg/resources/digitalocean/dns/BUILD.bazel @@ -11,7 +11,7 @@ go_library( "//dnsprovider/pkg/dnsprovider/rrstype:go_default_library", "//vendor/github.com/digitalocean/godo:go_default_library", "//vendor/golang.org/x/oauth2:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/resources/digitalocean/dns/dns.go b/pkg/resources/digitalocean/dns/dns.go index a1a38bf4ff..39936b6b2a 100644 --- a/pkg/resources/digitalocean/dns/dns.go +++ b/pkg/resources/digitalocean/dns/dns.go @@ -26,7 +26,7 @@ import ( "github.com/digitalocean/godo" "golang.org/x/oauth2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dns-controller/pkg/dns" "k8s.io/kops/dnsprovider/pkg/dnsprovider" diff --git a/pkg/resources/digitalocean/resources.go b/pkg/resources/digitalocean/resources.go index 3954c0032f..1951fcc582 100644 --- a/pkg/resources/digitalocean/resources.go +++ b/pkg/resources/digitalocean/resources.go @@ -26,7 +26,7 @@ import ( "github.com/digitalocean/godo" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dns-controller/pkg/dns" "k8s.io/kops/pkg/resources" "k8s.io/kops/upup/pkg/fi" diff --git a/pkg/resources/dump.go b/pkg/resources/dump.go index 4495ff6a91..b43d58968d 100644 --- a/pkg/resources/dump.go +++ b/pkg/resources/dump.go @@ -21,7 +21,7 @@ import ( "fmt" "sort" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" ) diff --git a/pkg/resources/gce/BUILD.bazel b/pkg/resources/gce/BUILD.bazel index ef6da93d92..2ecb10b71d 100644 --- a/pkg/resources/gce/BUILD.bazel +++ b/pkg/resources/gce/BUILD.bazel @@ -16,7 +16,7 @@ go_library( "//vendor/google.golang.org/api/compute/v1:go_default_library", "//vendor/google.golang.org/api/dns/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/resources/gce/dump.go b/pkg/resources/gce/dump.go index 19f785fab3..fc77b27aab 100644 --- a/pkg/resources/gce/dump.go +++ b/pkg/resources/gce/dump.go @@ -22,7 +22,7 @@ import ( "sync" compute "google.golang.org/api/compute/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/resources" gce "k8s.io/kops/upup/pkg/fi/cloudup/gce" ) diff --git a/pkg/resources/gce/gce.go b/pkg/resources/gce/gce.go index 01bd0d7cf6..1464ebf59c 100644 --- a/pkg/resources/gce/gce.go +++ b/pkg/resources/gce/gce.go @@ -24,7 +24,7 @@ import ( compute "google.golang.org/api/compute/v1" clouddns "google.golang.org/api/dns/v1" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/dns" "k8s.io/kops/pkg/resources" "k8s.io/kops/upup/pkg/fi" diff --git a/pkg/resources/openstack/BUILD.bazel b/pkg/resources/openstack/BUILD.bazel index 01ed6352af..2ec1b15740 100644 --- a/pkg/resources/openstack/BUILD.bazel +++ b/pkg/resources/openstack/BUILD.bazel @@ -34,6 +34,6 @@ go_library( "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/networks:go_default_library", "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/ports:go_default_library", "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/subnets:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/resources/openstack/lb.go b/pkg/resources/openstack/lb.go index d0d6c157f2..ecc6c2c3ef 100644 --- a/pkg/resources/openstack/lb.go +++ b/pkg/resources/openstack/lb.go @@ -23,7 +23,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers" "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors" "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/resources" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/openstack" diff --git a/pkg/resources/ops/BUILD.bazel b/pkg/resources/ops/BUILD.bazel index c8eb38a5b7..f49c132d9a 100644 --- a/pkg/resources/ops/BUILD.bazel +++ b/pkg/resources/ops/BUILD.bazel @@ -21,6 +21,6 @@ go_library( "//upup/pkg/fi/cloudup/awsup:go_default_library", "//upup/pkg/fi/cloudup/gce:go_default_library", "//upup/pkg/fi/cloudup/openstack:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/resources/ops/delete.go b/pkg/resources/ops/delete.go index 7f788e1105..5abf2f510e 100644 --- a/pkg/resources/ops/delete.go +++ b/pkg/resources/ops/delete.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/resources" awsresources "k8s.io/kops/pkg/resources/aws" "k8s.io/kops/upup/pkg/fi" diff --git a/pkg/resources/spotinst/BUILD.bazel b/pkg/resources/spotinst/BUILD.bazel index 715e8e0b30..2da127d680 100644 --- a/pkg/resources/spotinst/BUILD.bazel +++ b/pkg/resources/spotinst/BUILD.bazel @@ -25,6 +25,6 @@ go_library( "//vendor/github.com/spotinst/spotinst-sdk-go/spotinst/log:go_default_library", "//vendor/github.com/spotinst/spotinst-sdk-go/spotinst/session:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/resources/spotinst/resources.go b/pkg/resources/spotinst/resources.go index 089f9b5861..3beb3c3a73 100644 --- a/pkg/resources/spotinst/resources.go +++ b/pkg/resources/spotinst/resources.go @@ -24,7 +24,7 @@ import ( "time" v1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/cloudinstances" "k8s.io/kops/pkg/resources" diff --git a/pkg/resources/spotinst/spotinst.go b/pkg/resources/spotinst/spotinst.go index 04a9329c19..37622113cc 100644 --- a/pkg/resources/spotinst/spotinst.go +++ b/pkg/resources/spotinst/spotinst.go @@ -27,7 +27,7 @@ import ( "github.com/spotinst/spotinst-sdk-go/spotinst/credentials" "github.com/spotinst/spotinst-sdk-go/spotinst/log" "github.com/spotinst/spotinst-sdk-go/spotinst/session" - "k8s.io/klog" + "k8s.io/klog/v2" kopsv "k8s.io/kops" "k8s.io/kops/pkg/apis/kops" ) diff --git a/pkg/systemd/BUILD.bazel b/pkg/systemd/BUILD.bazel index 34ff141b3e..dd63749109 100644 --- a/pkg/systemd/BUILD.bazel +++ b/pkg/systemd/BUILD.bazel @@ -9,7 +9,7 @@ go_library( ], importpath = "k8s.io/kops/pkg/systemd", visibility = ["//visibility:public"], - deps = ["//vendor/k8s.io/klog:go_default_library"], + deps = ["//vendor/k8s.io/klog/v2:go_default_library"], ) go_test( diff --git a/pkg/systemd/escaping.go b/pkg/systemd/escaping.go index 5b801623d6..463206cde8 100644 --- a/pkg/systemd/escaping.go +++ b/pkg/systemd/escaping.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" ) // EscapeCommand is used to escape a command diff --git a/pkg/templates/BUILD.bazel b/pkg/templates/BUILD.bazel index 4c9ffdedfc..0740a8d738 100644 --- a/pkg/templates/BUILD.bazel +++ b/pkg/templates/BUILD.bazel @@ -9,6 +9,6 @@ go_library( "//pkg/apis/kops:go_default_library", "//upup/pkg/fi:go_default_library", "//util/pkg/vfs:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/templates/templates.go b/pkg/templates/templates.go index 8c92208fb7..18c08a5dce 100644 --- a/pkg/templates/templates.go +++ b/pkg/templates/templates.go @@ -24,7 +24,7 @@ import ( "strings" "text/template" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/util/pkg/vfs" diff --git a/pkg/testutils/BUILD.bazel b/pkg/testutils/BUILD.bazel index 8c1b275515..6b3d58f2a5 100644 --- a/pkg/testutils/BUILD.bazel +++ b/pkg/testutils/BUILD.bazel @@ -42,6 +42,6 @@ go_library( "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/networks:go_default_library", "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/subnets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/testutils/integrationtestharness.go b/pkg/testutils/integrationtestharness.go index 28d3aae4fa..d807e03a80 100644 --- a/pkg/testutils/integrationtestharness.go +++ b/pkg/testutils/integrationtestharness.go @@ -32,7 +32,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/external" "github.com/gophercloud/gophercloud/openstack/networking/v2/networks" "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" - "k8s.io/klog" + "k8s.io/klog/v2" kopsroot "k8s.io/kops" "k8s.io/kops/cloudmock/aws/mockautoscaling" "k8s.io/kops/cloudmock/aws/mockec2" diff --git a/pkg/try/BUILD.bazel b/pkg/try/BUILD.bazel index d528e630fd..8a79e47a5c 100644 --- a/pkg/try/BUILD.bazel +++ b/pkg/try/BUILD.bazel @@ -5,5 +5,5 @@ go_library( srcs = ["files.go"], importpath = "k8s.io/kops/pkg/try", visibility = ["//visibility:public"], - deps = ["//vendor/k8s.io/klog:go_default_library"], + deps = ["//vendor/k8s.io/klog/v2:go_default_library"], ) diff --git a/pkg/try/files.go b/pkg/try/files.go index c17e40b8a8..d0af7dc469 100644 --- a/pkg/try/files.go +++ b/pkg/try/files.go @@ -19,7 +19,7 @@ package try import ( "os" - "k8s.io/klog" + "k8s.io/klog/v2" ) // RemoveFile will try to os.Remove the file, logging an error if it fails diff --git a/pkg/util/stringorslice/BUILD.bazel b/pkg/util/stringorslice/BUILD.bazel index 2d49bbc23f..4eb7d78d2f 100644 --- a/pkg/util/stringorslice/BUILD.bazel +++ b/pkg/util/stringorslice/BUILD.bazel @@ -11,5 +11,5 @@ go_test( name = "go_default_test", srcs = ["stringorslice_test.go"], embed = [":go_default_library"], - deps = ["//vendor/k8s.io/klog:go_default_library"], + deps = ["//vendor/k8s.io/klog/v2:go_default_library"], ) diff --git a/pkg/util/stringorslice/stringorslice_test.go b/pkg/util/stringorslice/stringorslice_test.go index 71f9f2f8aa..25d13ca156 100644 --- a/pkg/util/stringorslice/stringorslice_test.go +++ b/pkg/util/stringorslice/stringorslice_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "testing" - "k8s.io/klog" + "k8s.io/klog/v2" ) func TestRoundTrip(t *testing.T) { diff --git a/pkg/validation/BUILD.bazel b/pkg/validation/BUILD.bazel index 4687848b7b..e0589e1900 100644 --- a/pkg/validation/BUILD.bazel +++ b/pkg/validation/BUILD.bazel @@ -19,7 +19,7 @@ go_library( "//vendor/k8s.io/client-go/kubernetes:go_default_library", "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library", "//vendor/k8s.io/client-go/tools/pager:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/pkg/validation/node_conditions.go b/pkg/validation/node_conditions.go index a095dbd451..e890ff91e6 100644 --- a/pkg/validation/node_conditions.go +++ b/pkg/validation/node_conditions.go @@ -18,7 +18,7 @@ package validation import ( v1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" ) func getNodeReadyStatus(node *v1.Node) v1.ConditionStatus { diff --git a/pkg/validation/validate_cluster.go b/pkg/validation/validate_cluster.go index 8d237bbc7e..17ea0c42de 100644 --- a/pkg/validation/validate_cluster.go +++ b/pkg/validation/validate_cluster.go @@ -31,7 +31,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/cloudinstances" "k8s.io/kops/pkg/dns" diff --git a/protokube/cmd/protokube/BUILD.bazel b/protokube/cmd/protokube/BUILD.bazel index c6be450c21..644e3cb101 100644 --- a/protokube/cmd/protokube/BUILD.bazel +++ b/protokube/cmd/protokube/BUILD.bazel @@ -23,7 +23,7 @@ go_library( "//protokube/pkg/gossip/mesh:go_default_library", "//protokube/pkg/protokube:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/protokube/cmd/protokube/dns_cleanup.go b/protokube/cmd/protokube/dns_cleanup.go index a9f1694ba5..d939213d56 100644 --- a/protokube/cmd/protokube/dns_cleanup.go +++ b/protokube/cmd/protokube/dns_cleanup.go @@ -20,7 +20,7 @@ import ( "strings" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dns-controller/pkg/dns" "k8s.io/kops/protokube/pkg/protokube" ) diff --git a/protokube/cmd/protokube/main.go b/protokube/cmd/protokube/main.go index 631ea9c314..1358ee7418 100644 --- a/protokube/cmd/protokube/main.go +++ b/protokube/cmd/protokube/main.go @@ -27,7 +27,7 @@ import ( "strings" "github.com/spf13/pflag" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dns-controller/pkg/dns" "k8s.io/kops/dnsprovider/pkg/dnsprovider" "k8s.io/kops/pkg/wellknownports" diff --git a/protokube/pkg/gossip/dns/BUILD.bazel b/protokube/pkg/gossip/dns/BUILD.bazel index 2c54f1e521..e3a009568c 100644 --- a/protokube/pkg/gossip/dns/BUILD.bazel +++ b/protokube/pkg/gossip/dns/BUILD.bazel @@ -11,6 +11,6 @@ go_library( deps = [ "//protokube/pkg/gossip:go_default_library", "//protokube/pkg/gossip/dns/hosts:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/protokube/pkg/gossip/dns/dns.go b/protokube/pkg/gossip/dns/dns.go index 36d0691f72..9c89652592 100644 --- a/protokube/pkg/gossip/dns/dns.go +++ b/protokube/pkg/gossip/dns/dns.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/protokube/pkg/gossip" ) diff --git a/protokube/pkg/gossip/dns/hosts.go b/protokube/pkg/gossip/dns/hosts.go index 8966e9ac3b..210f735419 100644 --- a/protokube/pkg/gossip/dns/hosts.go +++ b/protokube/pkg/gossip/dns/hosts.go @@ -17,7 +17,7 @@ limitations under the License. package dns import ( - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/protokube/pkg/gossip/dns/hosts" ) diff --git a/protokube/pkg/gossip/dns/hosts/BUILD.bazel b/protokube/pkg/gossip/dns/hosts/BUILD.bazel index f471fe84be..0982a70cdd 100644 --- a/protokube/pkg/gossip/dns/hosts/BUILD.bazel +++ b/protokube/pkg/gossip/dns/hosts/BUILD.bazel @@ -5,7 +5,7 @@ go_library( srcs = ["hosts.go"], importpath = "k8s.io/kops/protokube/pkg/gossip/dns/hosts", visibility = ["//visibility:public"], - deps = ["//vendor/k8s.io/klog:go_default_library"], + deps = ["//vendor/k8s.io/klog/v2:go_default_library"], ) go_test( diff --git a/protokube/pkg/gossip/dns/hosts/hosts.go b/protokube/pkg/gossip/dns/hosts/hosts.go index 51778b2f9e..990c270c01 100644 --- a/protokube/pkg/gossip/dns/hosts/hosts.go +++ b/protokube/pkg/gossip/dns/hosts/hosts.go @@ -27,7 +27,7 @@ import ( "sync" "time" - "k8s.io/klog" + "k8s.io/klog/v2" ) const ( diff --git a/protokube/pkg/gossip/do/BUILD.bazel b/protokube/pkg/gossip/do/BUILD.bazel index ec66b0eca4..2436f75cd5 100644 --- a/protokube/pkg/gossip/do/BUILD.bazel +++ b/protokube/pkg/gossip/do/BUILD.bazel @@ -8,6 +8,6 @@ go_library( deps = [ "//pkg/resources/digitalocean:go_default_library", "//protokube/pkg/gossip:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/protokube/pkg/gossip/do/seeds.go b/protokube/pkg/gossip/do/seeds.go index 8c7e35d94a..25c4027791 100644 --- a/protokube/pkg/gossip/do/seeds.go +++ b/protokube/pkg/gossip/do/seeds.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/resources/digitalocean" "k8s.io/kops/protokube/pkg/gossip" ) diff --git a/protokube/pkg/gossip/gce/BUILD.bazel b/protokube/pkg/gossip/gce/BUILD.bazel index 22a92eb235..e64b9352f2 100644 --- a/protokube/pkg/gossip/gce/BUILD.bazel +++ b/protokube/pkg/gossip/gce/BUILD.bazel @@ -8,6 +8,6 @@ go_library( deps = [ "//protokube/pkg/gossip:go_default_library", "//vendor/google.golang.org/api/compute/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/protokube/pkg/gossip/gce/seeds.go b/protokube/pkg/gossip/gce/seeds.go index c4011dd5ea..05209c9366 100644 --- a/protokube/pkg/gossip/gce/seeds.go +++ b/protokube/pkg/gossip/gce/seeds.go @@ -21,7 +21,7 @@ import ( "strings" compute "google.golang.org/api/compute/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/protokube/pkg/gossip" ) diff --git a/protokube/pkg/gossip/memberlist/BUILD.bazel b/protokube/pkg/gossip/memberlist/BUILD.bazel index 2a7d861dcf..bbb4585356 100644 --- a/protokube/pkg/gossip/memberlist/BUILD.bazel +++ b/protokube/pkg/gossip/memberlist/BUILD.bazel @@ -14,6 +14,6 @@ go_library( "//vendor/github.com/gogo/protobuf/proto:go_default_library", "//vendor/github.com/jacksontj/memberlistmesh:go_default_library", "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/protokube/pkg/gossip/memberlist/gossip.go b/protokube/pkg/gossip/memberlist/gossip.go index b4bb0d441c..46ba02615e 100644 --- a/protokube/pkg/gossip/memberlist/gossip.go +++ b/protokube/pkg/gossip/memberlist/gossip.go @@ -26,7 +26,7 @@ import ( cluster "github.com/jacksontj/memberlistmesh" "github.com/prometheus/client_golang/prometheus" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/protokube/pkg/gossip" ) diff --git a/protokube/pkg/gossip/memberlist/state.go b/protokube/pkg/gossip/memberlist/state.go index 7d33242e09..7398a448a4 100644 --- a/protokube/pkg/gossip/memberlist/state.go +++ b/protokube/pkg/gossip/memberlist/state.go @@ -21,7 +21,7 @@ import ( "time" "github.com/gogo/protobuf/proto" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/protokube/pkg/gossip" "k8s.io/kops/protokube/pkg/gossip/mesh" ) diff --git a/protokube/pkg/gossip/mesh/BUILD.bazel b/protokube/pkg/gossip/mesh/BUILD.bazel index c63b50d1fc..5a4668ef12 100644 --- a/protokube/pkg/gossip/mesh/BUILD.bazel +++ b/protokube/pkg/gossip/mesh/BUILD.bazel @@ -17,6 +17,6 @@ go_library( "//vendor/github.com/gogo/protobuf/proto:go_default_library", "//vendor/github.com/gogo/protobuf/sortkeys:go_default_library", "//vendor/github.com/weaveworks/mesh:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/protokube/pkg/gossip/mesh/glogger.go b/protokube/pkg/gossip/mesh/glogger.go index 54a628b9d1..72bfb5fd2e 100644 --- a/protokube/pkg/gossip/mesh/glogger.go +++ b/protokube/pkg/gossip/mesh/glogger.go @@ -18,7 +18,7 @@ package mesh import ( "github.com/weaveworks/mesh" - "k8s.io/klog" + "k8s.io/klog/v2" ) // glogLogger sends mesh log messages to glog diff --git a/protokube/pkg/gossip/mesh/gossip.go b/protokube/pkg/gossip/mesh/gossip.go index 84cf4b4748..efe3b48d7b 100644 --- a/protokube/pkg/gossip/mesh/gossip.go +++ b/protokube/pkg/gossip/mesh/gossip.go @@ -24,7 +24,7 @@ import ( "time" "github.com/weaveworks/mesh" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/protokube/pkg/gossip" ) diff --git a/protokube/pkg/gossip/mesh/peer.go b/protokube/pkg/gossip/mesh/peer.go index 8a894156b1..cb5fda52c2 100644 --- a/protokube/pkg/gossip/mesh/peer.go +++ b/protokube/pkg/gossip/mesh/peer.go @@ -18,7 +18,7 @@ package mesh import ( "github.com/weaveworks/mesh" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/protokube/pkg/gossip" ) diff --git a/protokube/pkg/gossip/openstack/BUILD.bazel b/protokube/pkg/gossip/openstack/BUILD.bazel index a5e37f7e45..75a65e86bc 100644 --- a/protokube/pkg/gossip/openstack/BUILD.bazel +++ b/protokube/pkg/gossip/openstack/BUILD.bazel @@ -11,6 +11,6 @@ go_library( "//vendor/github.com/gophercloud/gophercloud:go_default_library", "//vendor/github.com/gophercloud/gophercloud/openstack/compute/v2/servers:go_default_library", "//vendor/github.com/gophercloud/gophercloud/pagination:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/protokube/pkg/gossip/openstack/seeds.go b/protokube/pkg/gossip/openstack/seeds.go index 761124898f..6433dd1b18 100644 --- a/protokube/pkg/gossip/openstack/seeds.go +++ b/protokube/pkg/gossip/openstack/seeds.go @@ -22,7 +22,7 @@ import ( "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" "github.com/gophercloud/gophercloud/pagination" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/protokube/pkg/gossip" "k8s.io/kops/upup/pkg/fi/cloudup/openstack" ) diff --git a/protokube/pkg/hostmount/BUILD.bazel b/protokube/pkg/hostmount/BUILD.bazel index babb61e608..6840c4777e 100644 --- a/protokube/pkg/hostmount/BUILD.bazel +++ b/protokube/pkg/hostmount/BUILD.bazel @@ -10,7 +10,7 @@ go_library( visibility = ["//visibility:public"], deps = select({ "@io_bazel_rules_go//go/platform:android": [ - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/k8s.io/utils/mount:go_default_library", "//vendor/k8s.io/utils/nsenter:go_default_library", ], @@ -31,7 +31,7 @@ go_library( "//vendor/k8s.io/utils/nsenter:go_default_library", ], "@io_bazel_rules_go//go/platform:linux": [ - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/k8s.io/utils/mount:go_default_library", "//vendor/k8s.io/utils/nsenter:go_default_library", ], diff --git a/protokube/pkg/hostmount/nsenter_linux.go b/protokube/pkg/hostmount/nsenter_linux.go index 62e06e8697..572dad7d9e 100644 --- a/protokube/pkg/hostmount/nsenter_linux.go +++ b/protokube/pkg/hostmount/nsenter_linux.go @@ -21,7 +21,7 @@ package hostmount import ( "fmt" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/utils/mount" "k8s.io/utils/nsenter" ) diff --git a/protokube/pkg/protokube/BUILD.bazel b/protokube/pkg/protokube/BUILD.bazel index f3559b94dc..0175325ff2 100644 --- a/protokube/pkg/protokube/BUILD.bazel +++ b/protokube/pkg/protokube/BUILD.bazel @@ -70,7 +70,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library", "//vendor/k8s.io/utils/mount:go_default_library", "//vendor/k8s.io/utils/nsenter:go_default_library", diff --git a/protokube/pkg/protokube/ali_volume.go b/protokube/pkg/protokube/ali_volume.go index 988db24240..0eecc2e481 100644 --- a/protokube/pkg/protokube/ali_volume.go +++ b/protokube/pkg/protokube/ali_volume.go @@ -26,7 +26,7 @@ import ( "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/ecs" "github.com/denverdino/aliyungo/metadata" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/protokube/pkg/etcd" "k8s.io/kops/protokube/pkg/gossip" gossipali "k8s.io/kops/protokube/pkg/gossip/ali" diff --git a/protokube/pkg/protokube/aws_volume.go b/protokube/pkg/protokube/aws_volume.go index 91a4f92358..e2f31bd59b 100644 --- a/protokube/pkg/protokube/aws_volume.go +++ b/protokube/pkg/protokube/aws_volume.go @@ -30,7 +30,7 @@ import ( "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/protokube/pkg/etcd" "k8s.io/kops/protokube/pkg/gossip" gossipaws "k8s.io/kops/protokube/pkg/gossip/aws" diff --git a/protokube/pkg/protokube/channels.go b/protokube/pkg/protokube/channels.go index d829f5b657..9a221ed23a 100644 --- a/protokube/pkg/protokube/channels.go +++ b/protokube/pkg/protokube/channels.go @@ -22,7 +22,7 @@ import ( "os/exec" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" ) // applyChannel is responsible for applying the channel manifests diff --git a/protokube/pkg/protokube/etcd_cluster.go b/protokube/pkg/protokube/etcd_cluster.go index fc6815a1d6..48eb97c208 100644 --- a/protokube/pkg/protokube/etcd_cluster.go +++ b/protokube/pkg/protokube/etcd_cluster.go @@ -26,7 +26,7 @@ import ( "time" "k8s.io/apimachinery/pkg/api/resource" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/k8scodecs" "k8s.io/kops/protokube/pkg/etcd" ) diff --git a/protokube/pkg/protokube/gce_volume.go b/protokube/pkg/protokube/gce_volume.go index 247452e721..9e76ddefc4 100644 --- a/protokube/pkg/protokube/gce_volume.go +++ b/protokube/pkg/protokube/gce_volume.go @@ -25,7 +25,7 @@ import ( "cloud.google.com/go/compute/metadata" compute "google.golang.org/api/compute/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/protokube/pkg/etcd" "k8s.io/kops/protokube/pkg/gossip" gossipgce "k8s.io/kops/protokube/pkg/gossip/gce" diff --git a/protokube/pkg/protokube/kube_boot.go b/protokube/pkg/protokube/kube_boot.go index 69eea1573a..bdca65cae3 100644 --- a/protokube/pkg/protokube/kube_boot.go +++ b/protokube/pkg/protokube/kube_boot.go @@ -22,7 +22,7 @@ import ( "path/filepath" "time" - "k8s.io/klog" + "k8s.io/klog/v2" ) var ( diff --git a/protokube/pkg/protokube/kube_boot_task.go b/protokube/pkg/protokube/kube_boot_task.go index a02d7e5cac..c93465a9b1 100644 --- a/protokube/pkg/protokube/kube_boot_task.go +++ b/protokube/pkg/protokube/kube_boot_task.go @@ -20,7 +20,7 @@ package protokube //import ( // "encoding/json" // "fmt" -// "k8s.io/klog" +// "k8s.io/klog/v2" // "io" // "io/ioutil" // "os" diff --git a/protokube/pkg/protokube/kube_dns.go b/protokube/pkg/protokube/kube_dns.go index e4e5095382..f5e4527e94 100644 --- a/protokube/pkg/protokube/kube_dns.go +++ b/protokube/pkg/protokube/kube_dns.go @@ -19,7 +19,7 @@ package protokube import ( "time" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dns-controller/pkg/dns" ) diff --git a/protokube/pkg/protokube/labeler.go b/protokube/pkg/protokube/labeler.go index be4d274e50..e2d4a9c7e2 100644 --- a/protokube/pkg/protokube/labeler.go +++ b/protokube/pkg/protokube/labeler.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/klog" + "k8s.io/klog/v2" ) // bootstrapMasterNodeLabels applies labels to the current node so that it acts as a master diff --git a/protokube/pkg/protokube/openstack_volume.go b/protokube/pkg/protokube/openstack_volume.go index 9170234754..95ae1630df 100644 --- a/protokube/pkg/protokube/openstack_volume.go +++ b/protokube/pkg/protokube/openstack_volume.go @@ -27,7 +27,7 @@ import ( cinderv3 "github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes" "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/volumeattach" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/protokube/pkg/etcd" "k8s.io/kops/protokube/pkg/gossip" gossipos "k8s.io/kops/protokube/pkg/gossip/openstack" diff --git a/protokube/pkg/protokube/rbac.go b/protokube/pkg/protokube/rbac.go index 9d95a1db23..9292d8d333 100644 --- a/protokube/pkg/protokube/rbac.go +++ b/protokube/pkg/protokube/rbac.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" ) // applyRBAC is responsible for initializing RBAC diff --git a/protokube/pkg/protokube/tainter.go b/protokube/pkg/protokube/tainter.go index 1d8da5fe82..ecc070279b 100644 --- a/protokube/pkg/protokube/tainter.go +++ b/protokube/pkg/protokube/tainter.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/types" - "k8s.io/klog" + "k8s.io/klog/v2" ) type nodePatch struct { diff --git a/protokube/pkg/protokube/volume_mounter.go b/protokube/pkg/protokube/volume_mounter.go index bc36717127..9aac941873 100644 --- a/protokube/pkg/protokube/volume_mounter.go +++ b/protokube/pkg/protokube/volume_mounter.go @@ -23,7 +23,7 @@ import ( "time" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/protokube/pkg/hostmount" utilexec "k8s.io/utils/exec" "k8s.io/utils/mount" diff --git a/upup/pkg/fi/BUILD.bazel b/upup/pkg/fi/BUILD.bazel index f8a7e2db0b..a05e82c9df 100644 --- a/upup/pkg/fi/BUILD.bazel +++ b/upup/pkg/fi/BUILD.bazel @@ -60,7 +60,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/assetstore.go b/upup/pkg/fi/assetstore.go index 146143c7a8..9123d461a7 100644 --- a/upup/pkg/fi/assetstore.go +++ b/upup/pkg/fi/assetstore.go @@ -28,7 +28,7 @@ import ( "strings" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi/utils" "k8s.io/kops/util/pkg/hashing" ) diff --git a/upup/pkg/fi/assettasks/BUILD.bazel b/upup/pkg/fi/assettasks/BUILD.bazel index fe095da205..585ee736da 100644 --- a/upup/pkg/fi/assettasks/BUILD.bazel +++ b/upup/pkg/fi/assettasks/BUILD.bazel @@ -19,7 +19,7 @@ go_library( "//util/pkg/vfs:go_default_library", "//vendor/github.com/docker/engine-api/client:go_default_library", "//vendor/github.com/docker/engine-api/types:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/assettasks/copydockerimage.go b/upup/pkg/fi/assettasks/copydockerimage.go index 94837011cd..081b4a1725 100644 --- a/upup/pkg/fi/assettasks/copydockerimage.go +++ b/upup/pkg/fi/assettasks/copydockerimage.go @@ -19,7 +19,7 @@ package assettasks import ( "fmt" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" ) diff --git a/upup/pkg/fi/assettasks/copyfile.go b/upup/pkg/fi/assettasks/copyfile.go index 035c51b596..544697ed69 100644 --- a/upup/pkg/fi/assettasks/copyfile.go +++ b/upup/pkg/fi/assettasks/copyfile.go @@ -23,7 +23,7 @@ import ( "os" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/acls" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/util/pkg/hashing" diff --git a/upup/pkg/fi/assettasks/docker_api.go b/upup/pkg/fi/assettasks/docker_api.go index 5befbed0b8..213b75c589 100644 --- a/upup/pkg/fi/assettasks/docker_api.go +++ b/upup/pkg/fi/assettasks/docker_api.go @@ -22,7 +22,7 @@ import ( "github.com/docker/engine-api/client" "github.com/docker/engine-api/types" - "k8s.io/klog" + "k8s.io/klog/v2" ) // dockerAPI encapsulates access to docker via the API diff --git a/upup/pkg/fi/assettasks/docker_cli.go b/upup/pkg/fi/assettasks/docker_cli.go index 8f7a2b8385..5a9b6e50c8 100644 --- a/upup/pkg/fi/assettasks/docker_cli.go +++ b/upup/pkg/fi/assettasks/docker_cli.go @@ -20,7 +20,7 @@ import ( "fmt" "os/exec" - "k8s.io/klog" + "k8s.io/klog/v2" ) // dockerCLI encapsulates access to docker via the CLI diff --git a/upup/pkg/fi/changes.go b/upup/pkg/fi/changes.go index 6cb9ec4d93..c26c737adb 100644 --- a/upup/pkg/fi/changes.go +++ b/upup/pkg/fi/changes.go @@ -19,7 +19,7 @@ package fi import ( "reflect" - "k8s.io/klog" + "k8s.io/klog/v2" ) // An important part of our state synchronization is to compare two tasks, to see what has changed diff --git a/upup/pkg/fi/clientset_castore.go b/upup/pkg/fi/clientset_castore.go index 9320e3e800..3bac591722 100644 --- a/upup/pkg/fi/clientset_castore.go +++ b/upup/pkg/fi/clientset_castore.go @@ -25,7 +25,7 @@ import ( "golang.org/x/crypto/ssh" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" kopsinternalversion "k8s.io/kops/pkg/client/clientset_generated/clientset/typed/kops/internalversion" "k8s.io/kops/pkg/pki" diff --git a/upup/pkg/fi/cloudup/BUILD.bazel b/upup/pkg/fi/cloudup/BUILD.bazel index a6bf89f782..41e47789c7 100644 --- a/upup/pkg/fi/cloudup/BUILD.bazel +++ b/upup/pkg/fi/cloudup/BUILD.bazel @@ -85,7 +85,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) @@ -128,6 +128,6 @@ go_test( "//util/pkg/vfs:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/cloudup/alitasks/BUILD.bazel b/upup/pkg/fi/cloudup/alitasks/BUILD.bazel index ca21850b26..32af1247cd 100644 --- a/upup/pkg/fi/cloudup/alitasks/BUILD.bazel +++ b/upup/pkg/fi/cloudup/alitasks/BUILD.bazel @@ -51,6 +51,6 @@ go_library( "//vendor/github.com/denverdino/aliyungo/ess:go_default_library", "//vendor/github.com/denverdino/aliyungo/ram:go_default_library", "//vendor/github.com/denverdino/aliyungo/slb:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/cloudup/alitasks/disk.go b/upup/pkg/fi/cloudup/alitasks/disk.go index 231cdb0ba5..a539e389dc 100644 --- a/upup/pkg/fi/cloudup/alitasks/disk.go +++ b/upup/pkg/fi/cloudup/alitasks/disk.go @@ -21,7 +21,7 @@ import ( "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/ecs" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/aliup" diff --git a/upup/pkg/fi/cloudup/alitasks/eip_natgateway_association.go b/upup/pkg/fi/cloudup/alitasks/eip_natgateway_association.go index bbe8511d17..dd4f9241dd 100644 --- a/upup/pkg/fi/cloudup/alitasks/eip_natgateway_association.go +++ b/upup/pkg/fi/cloudup/alitasks/eip_natgateway_association.go @@ -21,7 +21,7 @@ import ( "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/ecs" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/aliup" "k8s.io/kops/upup/pkg/fi/cloudup/terraform" diff --git a/upup/pkg/fi/cloudup/alitasks/launchconfiguration.go b/upup/pkg/fi/cloudup/alitasks/launchconfiguration.go index c1bc1bc7e4..c498948f3c 100644 --- a/upup/pkg/fi/cloudup/alitasks/launchconfiguration.go +++ b/upup/pkg/fi/cloudup/alitasks/launchconfiguration.go @@ -28,7 +28,7 @@ import ( "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/ess" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/featureflag" "k8s.io/kops/upup/pkg/fi" diff --git a/upup/pkg/fi/cloudup/alitasks/loadbalancer.go b/upup/pkg/fi/cloudup/alitasks/loadbalancer.go index e6a19f695d..2669b9de84 100644 --- a/upup/pkg/fi/cloudup/alitasks/loadbalancer.go +++ b/upup/pkg/fi/cloudup/alitasks/loadbalancer.go @@ -22,7 +22,7 @@ import ( "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/slb" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/aliup" diff --git a/upup/pkg/fi/cloudup/alitasks/loadbalanceracl.go b/upup/pkg/fi/cloudup/alitasks/loadbalanceracl.go index 1f71592a61..f445eb641e 100644 --- a/upup/pkg/fi/cloudup/alitasks/loadbalanceracl.go +++ b/upup/pkg/fi/cloudup/alitasks/loadbalanceracl.go @@ -21,7 +21,7 @@ import ( "fmt" "sort" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" slbnew "github.com/aliyun/alibaba-cloud-sdk-go/services/slb" diff --git a/upup/pkg/fi/cloudup/alitasks/loadbalancerlistener.go b/upup/pkg/fi/cloudup/alitasks/loadbalancerlistener.go index 3e20cb37d2..6ef0c479ba 100644 --- a/upup/pkg/fi/cloudup/alitasks/loadbalancerlistener.go +++ b/upup/pkg/fi/cloudup/alitasks/loadbalancerlistener.go @@ -20,7 +20,7 @@ import ( "fmt" "strconv" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/denverdino/aliyungo/slb" "k8s.io/kops/upup/pkg/fi" diff --git a/upup/pkg/fi/cloudup/alitasks/natgateway.go b/upup/pkg/fi/cloudup/alitasks/natgateway.go index cc92065a4a..6f3c34ff6a 100644 --- a/upup/pkg/fi/cloudup/alitasks/natgateway.go +++ b/upup/pkg/fi/cloudup/alitasks/natgateway.go @@ -21,7 +21,7 @@ import ( "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/ecs" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/aliup" "k8s.io/kops/upup/pkg/fi/cloudup/terraform" diff --git a/upup/pkg/fi/cloudup/alitasks/rampolicy.go b/upup/pkg/fi/cloudup/alitasks/rampolicy.go index 0835202aa3..68733909dd 100644 --- a/upup/pkg/fi/cloudup/alitasks/rampolicy.go +++ b/upup/pkg/fi/cloudup/alitasks/rampolicy.go @@ -23,7 +23,7 @@ import ( "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/ram" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/aliup" "k8s.io/kops/upup/pkg/fi/cloudup/terraform" diff --git a/upup/pkg/fi/cloudup/alitasks/ramrole.go b/upup/pkg/fi/cloudup/alitasks/ramrole.go index fa60576624..6d225c7cc0 100644 --- a/upup/pkg/fi/cloudup/alitasks/ramrole.go +++ b/upup/pkg/fi/cloudup/alitasks/ramrole.go @@ -23,7 +23,7 @@ import ( "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/ram" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/aliup" "k8s.io/kops/upup/pkg/fi/cloudup/terraform" diff --git a/upup/pkg/fi/cloudup/alitasks/scalinggroup.go b/upup/pkg/fi/cloudup/alitasks/scalinggroup.go index 028c40c91d..78e441270a 100644 --- a/upup/pkg/fi/cloudup/alitasks/scalinggroup.go +++ b/upup/pkg/fi/cloudup/alitasks/scalinggroup.go @@ -23,7 +23,7 @@ import ( "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/ess" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/aliup" diff --git a/upup/pkg/fi/cloudup/alitasks/securitygroup.go b/upup/pkg/fi/cloudup/alitasks/securitygroup.go index 0aa0d629e6..5bc09ce991 100644 --- a/upup/pkg/fi/cloudup/alitasks/securitygroup.go +++ b/upup/pkg/fi/cloudup/alitasks/securitygroup.go @@ -19,7 +19,7 @@ package alitasks import ( "fmt" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/ecs" diff --git a/upup/pkg/fi/cloudup/alitasks/securitygrouprule.go b/upup/pkg/fi/cloudup/alitasks/securitygrouprule.go index 046bea7335..9159c76e7e 100644 --- a/upup/pkg/fi/cloudup/alitasks/securitygrouprule.go +++ b/upup/pkg/fi/cloudup/alitasks/securitygrouprule.go @@ -22,7 +22,7 @@ import ( "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/ecs" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/aliup" diff --git a/upup/pkg/fi/cloudup/alitasks/sshkey.go b/upup/pkg/fi/cloudup/alitasks/sshkey.go index e3332b64a8..499250379a 100644 --- a/upup/pkg/fi/cloudup/alitasks/sshkey.go +++ b/upup/pkg/fi/cloudup/alitasks/sshkey.go @@ -23,7 +23,7 @@ import ( common "github.com/denverdino/aliyungo/common" ecs "github.com/denverdino/aliyungo/ecs" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/pki" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/aliup" diff --git a/upup/pkg/fi/cloudup/alitasks/vpc.go b/upup/pkg/fi/cloudup/alitasks/vpc.go index 847fe1caa9..7c285db480 100644 --- a/upup/pkg/fi/cloudup/alitasks/vpc.go +++ b/upup/pkg/fi/cloudup/alitasks/vpc.go @@ -21,7 +21,7 @@ import ( "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/ecs" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/aliup" "k8s.io/kops/upup/pkg/fi/cloudup/terraform" diff --git a/upup/pkg/fi/cloudup/alitasks/vswitch.go b/upup/pkg/fi/cloudup/alitasks/vswitch.go index a3bc16dfff..896f23c7b5 100644 --- a/upup/pkg/fi/cloudup/alitasks/vswitch.go +++ b/upup/pkg/fi/cloudup/alitasks/vswitch.go @@ -19,7 +19,7 @@ package alitasks import ( "fmt" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/ecs" diff --git a/upup/pkg/fi/cloudup/alitasks/vswitchSNAT.go b/upup/pkg/fi/cloudup/alitasks/vswitchSNAT.go index 8db86fb6ae..53f997e98f 100644 --- a/upup/pkg/fi/cloudup/alitasks/vswitchSNAT.go +++ b/upup/pkg/fi/cloudup/alitasks/vswitchSNAT.go @@ -19,7 +19,7 @@ package alitasks import ( "fmt" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/ecs" diff --git a/upup/pkg/fi/cloudup/aliup/BUILD.bazel b/upup/pkg/fi/cloudup/aliup/BUILD.bazel index 09542f75fa..78f41b444d 100644 --- a/upup/pkg/fi/cloudup/aliup/BUILD.bazel +++ b/upup/pkg/fi/cloudup/aliup/BUILD.bazel @@ -26,7 +26,7 @@ go_library( "//vendor/github.com/denverdino/aliyungo/ram:go_default_library", "//vendor/github.com/denverdino/aliyungo/slb:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/cloudup/aliup/ali_cloud.go b/upup/pkg/fi/cloudup/aliup/ali_cloud.go index 4f6cc3eb9e..ce1fe19261 100644 --- a/upup/pkg/fi/cloudup/aliup/ali_cloud.go +++ b/upup/pkg/fi/cloudup/aliup/ali_cloud.go @@ -22,7 +22,7 @@ import ( "os" "time" - "k8s.io/klog" + "k8s.io/klog/v2" alicloud "github.com/aliyun/alibaba-cloud-sdk-go/sdk" "github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth/credentials" diff --git a/upup/pkg/fi/cloudup/aliup/status.go b/upup/pkg/fi/cloudup/aliup/status.go index afc99ad4d0..fec6bce4e1 100644 --- a/upup/pkg/fi/cloudup/aliup/status.go +++ b/upup/pkg/fi/cloudup/aliup/status.go @@ -25,7 +25,7 @@ import ( "github.com/denverdino/aliyungo/ecs" "github.com/denverdino/aliyungo/ess" v1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/cloudinstances" "k8s.io/kops/protokube/pkg/etcd" diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index adf2553f12..ed65eb69d6 100644 --- a/upup/pkg/fi/cloudup/apply_cluster.go +++ b/upup/pkg/fi/cloudup/apply_cluster.go @@ -27,7 +27,7 @@ import ( "github.com/blang/semver/v4" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" kopsbase "k8s.io/kops" "k8s.io/kops/pkg/acls" "k8s.io/kops/pkg/apis/kops" diff --git a/upup/pkg/fi/cloudup/awstasks/BUILD.bazel b/upup/pkg/fi/cloudup/awstasks/BUILD.bazel index 6df0cd32a1..6b1363ac4c 100644 --- a/upup/pkg/fi/cloudup/awstasks/BUILD.bazel +++ b/upup/pkg/fi/cloudup/awstasks/BUILD.bazel @@ -99,7 +99,7 @@ go_library( "//vendor/github.com/aws/aws-sdk-go/service/route53:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go b/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go index af7dce36d7..997f0d860b 100644 --- a/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go +++ b/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go @@ -32,7 +32,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/autoscaling" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" ) // CloudTagInstanceGroupRolePrefix is a cloud tag that defines the instance role diff --git a/upup/pkg/fi/cloudup/awstasks/dhcp_options.go b/upup/pkg/fi/cloudup/awstasks/dhcp_options.go index 0ab4bb4f5a..e77a6d720d 100644 --- a/upup/pkg/fi/cloudup/awstasks/dhcp_options.go +++ b/upup/pkg/fi/cloudup/awstasks/dhcp_options.go @@ -23,7 +23,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awstasks/dnsname.go b/upup/pkg/fi/cloudup/awstasks/dnsname.go index eef3e0208e..49185cb0f5 100644 --- a/upup/pkg/fi/cloudup/awstasks/dnsname.go +++ b/upup/pkg/fi/cloudup/awstasks/dnsname.go @@ -23,7 +23,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/route53" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awstasks/dnszone.go b/upup/pkg/fi/cloudup/awstasks/dnszone.go index 715e5bd4e9..53d85210e4 100644 --- a/upup/pkg/fi/cloudup/awstasks/dnszone.go +++ b/upup/pkg/fi/cloudup/awstasks/dnszone.go @@ -26,7 +26,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/route53" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awstasks/ebsvolume.go b/upup/pkg/fi/cloudup/awstasks/ebsvolume.go index ab988da5ac..bddcd6bc53 100644 --- a/upup/pkg/fi/cloudup/awstasks/ebsvolume.go +++ b/upup/pkg/fi/cloudup/awstasks/ebsvolume.go @@ -25,7 +25,7 @@ import ( "k8s.io/kops/upup/pkg/fi/cloudup/terraform" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" ) // +kops:fitask diff --git a/upup/pkg/fi/cloudup/awstasks/elastic_ip.go b/upup/pkg/fi/cloudup/awstasks/elastic_ip.go index 90e1f65c5e..685f27bca1 100644 --- a/upup/pkg/fi/cloudup/awstasks/elastic_ip.go +++ b/upup/pkg/fi/cloudup/awstasks/elastic_ip.go @@ -21,7 +21,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" diff --git a/upup/pkg/fi/cloudup/awstasks/external_load_balancer_attachment.go b/upup/pkg/fi/cloudup/awstasks/external_load_balancer_attachment.go index ad78a29ff6..2b736ba03a 100644 --- a/upup/pkg/fi/cloudup/awstasks/external_load_balancer_attachment.go +++ b/upup/pkg/fi/cloudup/awstasks/external_load_balancer_attachment.go @@ -21,7 +21,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/autoscaling" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awstasks/external_target_group_attachment.go b/upup/pkg/fi/cloudup/awstasks/external_target_group_attachment.go index aa3efb2a53..3f5e8b5568 100644 --- a/upup/pkg/fi/cloudup/awstasks/external_target_group_attachment.go +++ b/upup/pkg/fi/cloudup/awstasks/external_target_group_attachment.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/autoscaling" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awstasks/iaminstanceprofile.go b/upup/pkg/fi/cloudup/awstasks/iaminstanceprofile.go index 8c08e7a113..4ee5ad6f9e 100644 --- a/upup/pkg/fi/cloudup/awstasks/iaminstanceprofile.go +++ b/upup/pkg/fi/cloudup/awstasks/iaminstanceprofile.go @@ -27,7 +27,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/iam" - "k8s.io/klog" + "k8s.io/klog/v2" ) // +kops:fitask diff --git a/upup/pkg/fi/cloudup/awstasks/iaminstanceprofilerole.go b/upup/pkg/fi/cloudup/awstasks/iaminstanceprofilerole.go index 19c71b8a8b..384c636fc2 100644 --- a/upup/pkg/fi/cloudup/awstasks/iaminstanceprofilerole.go +++ b/upup/pkg/fi/cloudup/awstasks/iaminstanceprofilerole.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/iam" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awstasks/iamoidcprovider.go b/upup/pkg/fi/cloudup/awstasks/iamoidcprovider.go index 879eba3e97..b2ff6d4ce4 100644 --- a/upup/pkg/fi/cloudup/awstasks/iamoidcprovider.go +++ b/upup/pkg/fi/cloudup/awstasks/iamoidcprovider.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awstasks/iamrole.go b/upup/pkg/fi/cloudup/awstasks/iamrole.go index f2d01714f1..bd31506d21 100644 --- a/upup/pkg/fi/cloudup/awstasks/iamrole.go +++ b/upup/pkg/fi/cloudup/awstasks/iamrole.go @@ -27,7 +27,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/iam" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/diff" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" diff --git a/upup/pkg/fi/cloudup/awstasks/iamrolepolicy.go b/upup/pkg/fi/cloudup/awstasks/iamrolepolicy.go index 837a220ce7..368908555a 100644 --- a/upup/pkg/fi/cloudup/awstasks/iamrolepolicy.go +++ b/upup/pkg/fi/cloudup/awstasks/iamrolepolicy.go @@ -26,7 +26,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/iam" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/diff" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" diff --git a/upup/pkg/fi/cloudup/awstasks/instance.go b/upup/pkg/fi/cloudup/awstasks/instance.go index fe0fa07ab3..2a6f41551a 100644 --- a/upup/pkg/fi/cloudup/awstasks/instance.go +++ b/upup/pkg/fi/cloudup/awstasks/instance.go @@ -24,7 +24,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/terraform" diff --git a/upup/pkg/fi/cloudup/awstasks/instance_elasticip_attachment.go b/upup/pkg/fi/cloudup/awstasks/instance_elasticip_attachment.go index af634d4ddb..2c98c593e5 100644 --- a/upup/pkg/fi/cloudup/awstasks/instance_elasticip_attachment.go +++ b/upup/pkg/fi/cloudup/awstasks/instance_elasticip_attachment.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" ) diff --git a/upup/pkg/fi/cloudup/awstasks/instance_volume_attachment.go b/upup/pkg/fi/cloudup/awstasks/instance_volume_attachment.go index 26b2e0d5d4..cc83ab48db 100644 --- a/upup/pkg/fi/cloudup/awstasks/instance_volume_attachment.go +++ b/upup/pkg/fi/cloudup/awstasks/instance_volume_attachment.go @@ -21,7 +21,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" ) diff --git a/upup/pkg/fi/cloudup/awstasks/internetgateway.go b/upup/pkg/fi/cloudup/awstasks/internetgateway.go index 828629cf84..5123d77acd 100644 --- a/upup/pkg/fi/cloudup/awstasks/internetgateway.go +++ b/upup/pkg/fi/cloudup/awstasks/internetgateway.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go b/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go index c3adbde268..c6fdbc56c3 100644 --- a/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go +++ b/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go @@ -33,7 +33,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/autoscaling" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/klog" + "k8s.io/klog/v2" ) // defaultRetainLaunchConfigurationCount is the number of launch configurations (matching the name prefix) that we should diff --git a/upup/pkg/fi/cloudup/awstasks/launchtemplate.go b/upup/pkg/fi/cloudup/awstasks/launchtemplate.go index dc6ead356c..9a8a95507c 100644 --- a/upup/pkg/fi/cloudup/awstasks/launchtemplate.go +++ b/upup/pkg/fi/cloudup/awstasks/launchtemplate.go @@ -24,7 +24,7 @@ import ( "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "github.com/aws/aws-sdk-go/aws" - "k8s.io/klog" + "k8s.io/klog/v2" ) // LaunchTemplate defines the specification for a launch template. diff --git a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go index a3eaa279c3..ff9c07d41e 100644 --- a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go +++ b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go @@ -27,7 +27,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" ) // RenderAWS is responsible for performing creating / updating the launch template diff --git a/upup/pkg/fi/cloudup/awstasks/load_balancer.go b/upup/pkg/fi/cloudup/awstasks/load_balancer.go index d443c18e6f..d0c6de9f91 100644 --- a/upup/pkg/fi/cloudup/awstasks/load_balancer.go +++ b/upup/pkg/fi/cloudup/awstasks/load_balancer.go @@ -26,7 +26,7 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/elb" "github.com/aws/aws-sdk-go/service/route53" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awstasks/load_balancer_attachment.go b/upup/pkg/fi/cloudup/awstasks/load_balancer_attachment.go index 8edefa3b31..46c840f54a 100644 --- a/upup/pkg/fi/cloudup/awstasks/load_balancer_attachment.go +++ b/upup/pkg/fi/cloudup/awstasks/load_balancer_attachment.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/autoscaling" "github.com/aws/aws-sdk-go/service/elb" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awstasks/loadbalancer_attributes.go b/upup/pkg/fi/cloudup/awstasks/loadbalancer_attributes.go index 8f00742c5d..cdfb782b7d 100644 --- a/upup/pkg/fi/cloudup/awstasks/loadbalancer_attributes.go +++ b/upup/pkg/fi/cloudup/awstasks/loadbalancer_attributes.go @@ -21,7 +21,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/elb" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" ) diff --git a/upup/pkg/fi/cloudup/awstasks/natgateway.go b/upup/pkg/fi/cloudup/awstasks/natgateway.go index f8f5aa73b2..bc5235d95d 100644 --- a/upup/pkg/fi/cloudup/awstasks/natgateway.go +++ b/upup/pkg/fi/cloudup/awstasks/natgateway.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "k8s.io/apimachinery/pkg/util/validation/field" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awstasks/route.go b/upup/pkg/fi/cloudup/awstasks/route.go index 312c6b3fbe..192b60c1ff 100644 --- a/upup/pkg/fi/cloudup/awstasks/route.go +++ b/upup/pkg/fi/cloudup/awstasks/route.go @@ -21,7 +21,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awstasks/routetable.go b/upup/pkg/fi/cloudup/awstasks/routetable.go index 0f4db5b589..5cc7cbdb32 100644 --- a/upup/pkg/fi/cloudup/awstasks/routetable.go +++ b/upup/pkg/fi/cloudup/awstasks/routetable.go @@ -21,7 +21,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awstasks/routetableassociation.go b/upup/pkg/fi/cloudup/awstasks/routetableassociation.go index 45101badde..a095c20dd5 100644 --- a/upup/pkg/fi/cloudup/awstasks/routetableassociation.go +++ b/upup/pkg/fi/cloudup/awstasks/routetableassociation.go @@ -21,7 +21,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awstasks/securitygroup.go b/upup/pkg/fi/cloudup/awstasks/securitygroup.go index beedba37fa..1c3aebc64f 100644 --- a/upup/pkg/fi/cloudup/awstasks/securitygroup.go +++ b/upup/pkg/fi/cloudup/awstasks/securitygroup.go @@ -23,7 +23,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awstasks/securitygrouprule.go b/upup/pkg/fi/cloudup/awstasks/securitygrouprule.go index 44c7655793..801f85834d 100644 --- a/upup/pkg/fi/cloudup/awstasks/securitygrouprule.go +++ b/upup/pkg/fi/cloudup/awstasks/securitygrouprule.go @@ -24,7 +24,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "k8s.io/apimachinery/pkg/util/validation/field" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awstasks/sshkey.go b/upup/pkg/fi/cloudup/awstasks/sshkey.go index 25e2b2ea17..9f7433c362 100644 --- a/upup/pkg/fi/cloudup/awstasks/sshkey.go +++ b/upup/pkg/fi/cloudup/awstasks/sshkey.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/pki" "k8s.io/kops/upup/pkg/fi" diff --git a/upup/pkg/fi/cloudup/awstasks/subnet.go b/upup/pkg/fi/cloudup/awstasks/subnet.go index 8c6377d4e3..e0ff3a39dd 100644 --- a/upup/pkg/fi/cloudup/awstasks/subnet.go +++ b/upup/pkg/fi/cloudup/awstasks/subnet.go @@ -21,7 +21,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "k8s.io/apimachinery/pkg/util/validation/field" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awstasks/vpc.go b/upup/pkg/fi/cloudup/awstasks/vpc.go index a5eb495ecd..d7d9d6f383 100644 --- a/upup/pkg/fi/cloudup/awstasks/vpc.go +++ b/upup/pkg/fi/cloudup/awstasks/vpc.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "k8s.io/apimachinery/pkg/util/validation/field" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/featureflag" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" diff --git a/upup/pkg/fi/cloudup/awstasks/vpc_dhcpoptions_association.go b/upup/pkg/fi/cloudup/awstasks/vpc_dhcpoptions_association.go index 606e06340d..df8825b299 100644 --- a/upup/pkg/fi/cloudup/awstasks/vpc_dhcpoptions_association.go +++ b/upup/pkg/fi/cloudup/awstasks/vpc_dhcpoptions_association.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" diff --git a/upup/pkg/fi/cloudup/awsup/BUILD.bazel b/upup/pkg/fi/cloudup/awsup/BUILD.bazel index 4d3dca315b..4dc2334358 100644 --- a/upup/pkg/fi/cloudup/awsup/BUILD.bazel +++ b/upup/pkg/fi/cloudup/awsup/BUILD.bazel @@ -49,7 +49,7 @@ go_library( "//vendor/github.com/aws/aws-sdk-go/service/sts:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/k8s.io/legacy-cloud-providers/aws:go_default_library", ], ) diff --git a/upup/pkg/fi/cloudup/awsup/aws_apitarget.go b/upup/pkg/fi/cloudup/awsup/aws_apitarget.go index 1577672fc4..02082ea220 100644 --- a/upup/pkg/fi/cloudup/awsup/aws_apitarget.go +++ b/upup/pkg/fi/cloudup/awsup/aws_apitarget.go @@ -21,7 +21,7 @@ import ( "time" "github.com/aws/aws-sdk-go/aws" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" ) diff --git a/upup/pkg/fi/cloudup/awsup/aws_cloud.go b/upup/pkg/fi/cloudup/awsup/aws_cloud.go index 60b9617425..a160a2d5ae 100644 --- a/upup/pkg/fi/cloudup/awsup/aws_cloud.go +++ b/upup/pkg/fi/cloudup/awsup/aws_cloud.go @@ -40,7 +40,7 @@ import ( "github.com/aws/aws-sdk-go/service/iam/iamiface" "github.com/aws/aws-sdk-go/service/route53" "github.com/aws/aws-sdk-go/service/route53/route53iface" - "k8s.io/klog" + "k8s.io/klog/v2" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/sets" diff --git a/upup/pkg/fi/cloudup/awsup/aws_utils.go b/upup/pkg/fi/cloudup/awsup/aws_utils.go index 115194c040..26e37c85ac 100644 --- a/upup/pkg/fi/cloudup/awsup/aws_utils.go +++ b/upup/pkg/fi/cloudup/awsup/aws_utils.go @@ -29,7 +29,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/elb" elbv2 "github.com/aws/aws-sdk-go/service/elbv2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" ) diff --git a/upup/pkg/fi/cloudup/awsup/instancegroups.go b/upup/pkg/fi/cloudup/awsup/instancegroups.go index e3e6028747..5bad5005b1 100644 --- a/upup/pkg/fi/cloudup/awsup/instancegroups.go +++ b/upup/pkg/fi/cloudup/awsup/instancegroups.go @@ -19,7 +19,7 @@ package awsup import ( "fmt" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" ) diff --git a/upup/pkg/fi/cloudup/awsup/logging_retryer.go b/upup/pkg/fi/cloudup/awsup/logging_retryer.go index 4ca98761e0..c9543fa742 100644 --- a/upup/pkg/fi/cloudup/awsup/logging_retryer.go +++ b/upup/pkg/fi/cloudup/awsup/logging_retryer.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws/client" "github.com/aws/aws-sdk-go/aws/request" - "k8s.io/klog" + "k8s.io/klog/v2" ) // LoggingRetryer adds some logging when we are retrying, so we have some idea what is happening diff --git a/upup/pkg/fi/cloudup/awsup/machine_types.go b/upup/pkg/fi/cloudup/awsup/machine_types.go index abc1fe2e65..a4b231b4ea 100644 --- a/upup/pkg/fi/cloudup/awsup/machine_types.go +++ b/upup/pkg/fi/cloudup/awsup/machine_types.go @@ -22,7 +22,7 @@ import ( "sync" "github.com/aws/aws-sdk-go/aws" - "k8s.io/klog" + "k8s.io/klog/v2" ) type AWSMachineTypeInfo struct { diff --git a/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go b/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go index 01b75ef145..073281172c 100644 --- a/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go +++ b/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go @@ -29,7 +29,7 @@ import ( "github.com/aws/aws-sdk-go/service/iam/iamiface" "github.com/aws/aws-sdk-go/service/route53/route53iface" v1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dnsprovider/pkg/dnsprovider" dnsproviderroute53 "k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/aws/route53" "k8s.io/kops/pkg/apis/kops" diff --git a/upup/pkg/fi/cloudup/awsup/request_logger.go b/upup/pkg/fi/cloudup/awsup/request_logger.go index 226926ea5e..7ea1e59324 100644 --- a/upup/pkg/fi/cloudup/awsup/request_logger.go +++ b/upup/pkg/fi/cloudup/awsup/request_logger.go @@ -18,7 +18,7 @@ package awsup import ( "github.com/aws/aws-sdk-go/aws/request" - "k8s.io/klog" + "k8s.io/klog/v2" ) // RequestLogger logs every AWS request diff --git a/upup/pkg/fi/cloudup/awsup/status.go b/upup/pkg/fi/cloudup/awsup/status.go index 042eb971d1..b34769d313 100644 --- a/upup/pkg/fi/cloudup/awsup/status.go +++ b/upup/pkg/fi/cloudup/awsup/status.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/protokube/pkg/etcd" "k8s.io/kops/upup/pkg/fi" diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 2f3f27df25..ffb19988a1 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -22,7 +22,7 @@ import ( "github.com/blang/semver/v4" - "k8s.io/klog" + "k8s.io/klog/v2" channelsapi "k8s.io/kops/channels/pkg/api" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/assets" diff --git a/upup/pkg/fi/cloudup/cloudformation/BUILD.bazel b/upup/pkg/fi/cloudup/cloudformation/BUILD.bazel index 8748115e2d..6330bbc3b0 100644 --- a/upup/pkg/fi/cloudup/cloudformation/BUILD.bazel +++ b/upup/pkg/fi/cloudup/cloudformation/BUILD.bazel @@ -10,6 +10,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//upup/pkg/fi:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/cloudup/cloudformation/target.go b/upup/pkg/fi/cloudup/cloudformation/target.go index 20fbf63097..9379fdce23 100644 --- a/upup/pkg/fi/cloudup/cloudformation/target.go +++ b/upup/pkg/fi/cloudup/cloudformation/target.go @@ -25,7 +25,7 @@ import ( "strings" "sync" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" ) diff --git a/upup/pkg/fi/cloudup/defaults.go b/upup/pkg/fi/cloudup/defaults.go index 61ec257097..fe9097263e 100644 --- a/upup/pkg/fi/cloudup/defaults.go +++ b/upup/pkg/fi/cloudup/defaults.go @@ -21,7 +21,7 @@ import ( "net" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi/cloudup/gce" "k8s.io/kops/util/pkg/vfs" diff --git a/upup/pkg/fi/cloudup/dns.go b/upup/pkg/fi/cloudup/dns.go index b6f308d4bc..7965a3053a 100644 --- a/upup/pkg/fi/cloudup/dns.go +++ b/upup/pkg/fi/cloudup/dns.go @@ -23,7 +23,7 @@ import ( "os" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dns-controller/pkg/dns" "k8s.io/kops/dnsprovider/pkg/dnsprovider" "k8s.io/kops/dnsprovider/pkg/dnsprovider/rrstype" diff --git a/upup/pkg/fi/cloudup/dotasks/BUILD.bazel b/upup/pkg/fi/cloudup/dotasks/BUILD.bazel index 4de9ebf319..e64264781e 100644 --- a/upup/pkg/fi/cloudup/dotasks/BUILD.bazel +++ b/upup/pkg/fi/cloudup/dotasks/BUILD.bazel @@ -18,7 +18,7 @@ go_library( "//upup/pkg/fi/cloudup/do:go_default_library", "//upup/pkg/fi/cloudup/terraform:go_default_library", "//vendor/github.com/digitalocean/godo:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/cloudup/dotasks/droplet.go b/upup/pkg/fi/cloudup/dotasks/droplet.go index fc04f92c00..b15dac9ad0 100644 --- a/upup/pkg/fi/cloudup/dotasks/droplet.go +++ b/upup/pkg/fi/cloudup/dotasks/droplet.go @@ -22,7 +22,7 @@ import ( "github.com/digitalocean/godo" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/resources/digitalocean" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/do" diff --git a/upup/pkg/fi/cloudup/dotasks/loadbalancer.go b/upup/pkg/fi/cloudup/dotasks/loadbalancer.go index 12f91c4c1d..f4cc299f3f 100644 --- a/upup/pkg/fi/cloudup/dotasks/loadbalancer.go +++ b/upup/pkg/fi/cloudup/dotasks/loadbalancer.go @@ -26,7 +26,7 @@ import ( "github.com/digitalocean/godo" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/resources/digitalocean" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/do" diff --git a/upup/pkg/fi/cloudup/dotasks/volume.go b/upup/pkg/fi/cloudup/dotasks/volume.go index da6ab72406..68a49462ad 100644 --- a/upup/pkg/fi/cloudup/dotasks/volume.go +++ b/upup/pkg/fi/cloudup/dotasks/volume.go @@ -22,7 +22,7 @@ import ( "github.com/digitalocean/godo" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/resources/digitalocean" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/do" diff --git a/upup/pkg/fi/cloudup/gce/BUILD.bazel b/upup/pkg/fi/cloudup/gce/BUILD.bazel index fab899a15b..351b2fdbbc 100644 --- a/upup/pkg/fi/cloudup/gce/BUILD.bazel +++ b/upup/pkg/fi/cloudup/gce/BUILD.bazel @@ -33,6 +33,6 @@ go_library( "//vendor/google.golang.org/api/storage/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/cloudup/gce/gce_cloud.go b/upup/pkg/fi/cloudup/gce/gce_cloud.go index 31444c04af..2f755ebc00 100644 --- a/upup/pkg/fi/cloudup/gce/gce_cloud.go +++ b/upup/pkg/fi/cloudup/gce/gce_cloud.go @@ -30,7 +30,7 @@ import ( "google.golang.org/api/iam/v1" oauth2 "google.golang.org/api/oauth2/v2" "google.golang.org/api/storage/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dnsprovider/pkg/dnsprovider" "k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/google/clouddns" "k8s.io/kops/pkg/apis/kops" diff --git a/upup/pkg/fi/cloudup/gce/instancegroups.go b/upup/pkg/fi/cloudup/gce/instancegroups.go index b0f7ed03ea..5392c7abe9 100644 --- a/upup/pkg/fi/cloudup/gce/instancegroups.go +++ b/upup/pkg/fi/cloudup/gce/instancegroups.go @@ -25,7 +25,7 @@ import ( compute "google.golang.org/api/compute/v1" v1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/cloudinstances" ) diff --git a/upup/pkg/fi/cloudup/gce/mock_gce_cloud.go b/upup/pkg/fi/cloudup/gce/mock_gce_cloud.go index d812b93e72..d47f1d6aa8 100644 --- a/upup/pkg/fi/cloudup/gce/mock_gce_cloud.go +++ b/upup/pkg/fi/cloudup/gce/mock_gce_cloud.go @@ -24,7 +24,7 @@ import ( "google.golang.org/api/iam/v1" "google.golang.org/api/storage/v1" v1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dnsprovider/pkg/dnsprovider" dnsproviderclouddns "k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/google/clouddns" "k8s.io/kops/pkg/apis/kops" diff --git a/upup/pkg/fi/cloudup/gce/network.go b/upup/pkg/fi/cloudup/gce/network.go index 5503ba4cfa..dc47fdefb5 100644 --- a/upup/pkg/fi/cloudup/gce/network.go +++ b/upup/pkg/fi/cloudup/gce/network.go @@ -23,7 +23,7 @@ import ( "net" compute "google.golang.org/api/compute/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" ) diff --git a/upup/pkg/fi/cloudup/gce/op.go b/upup/pkg/fi/cloudup/gce/op.go index 5ae300ab89..7d4ba32c44 100644 --- a/upup/pkg/fi/cloudup/gce/op.go +++ b/upup/pkg/fi/cloudup/gce/op.go @@ -26,7 +26,7 @@ import ( compute "google.golang.org/api/compute/v1" "google.golang.org/api/googleapi" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" ) const ( diff --git a/upup/pkg/fi/cloudup/gce/status.go b/upup/pkg/fi/cloudup/gce/status.go index 1a9bdd7029..0f1363c026 100644 --- a/upup/pkg/fi/cloudup/gce/status.go +++ b/upup/pkg/fi/cloudup/gce/status.go @@ -22,7 +22,7 @@ import ( "strings" compute "google.golang.org/api/compute/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/protokube/pkg/etcd" "k8s.io/kops/upup/pkg/fi" diff --git a/upup/pkg/fi/cloudup/gce/wrappers.go b/upup/pkg/fi/cloudup/gce/wrappers.go index e6c90e7852..606b40939f 100644 --- a/upup/pkg/fi/cloudup/gce/wrappers.go +++ b/upup/pkg/fi/cloudup/gce/wrappers.go @@ -21,7 +21,7 @@ import ( "fmt" compute "google.golang.org/api/compute/v1" - "k8s.io/klog" + "k8s.io/klog/v2" ) // DeleteInstanceGroupManager deletes the specified InstanceGroupManager in GCE diff --git a/upup/pkg/fi/cloudup/gcetasks/BUILD.bazel b/upup/pkg/fi/cloudup/gcetasks/BUILD.bazel index c12f62d561..9b442ebec7 100644 --- a/upup/pkg/fi/cloudup/gcetasks/BUILD.bazel +++ b/upup/pkg/fi/cloudup/gcetasks/BUILD.bazel @@ -40,6 +40,6 @@ go_library( "//upup/pkg/fi/cloudup/terraform:go_default_library", "//vendor/google.golang.org/api/compute/v1:go_default_library", "//vendor/google.golang.org/api/storage/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/cloudup/gcetasks/address.go b/upup/pkg/fi/cloudup/gcetasks/address.go index c2cd0c17a7..ab8bcf0b16 100644 --- a/upup/pkg/fi/cloudup/gcetasks/address.go +++ b/upup/pkg/fi/cloudup/gcetasks/address.go @@ -20,7 +20,7 @@ import ( "fmt" compute "google.golang.org/api/compute/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/gce" "k8s.io/kops/upup/pkg/fi/cloudup/terraform" diff --git a/upup/pkg/fi/cloudup/gcetasks/disk.go b/upup/pkg/fi/cloudup/gcetasks/disk.go index d3eb2c7bd9..c0fd68cc7d 100644 --- a/upup/pkg/fi/cloudup/gcetasks/disk.go +++ b/upup/pkg/fi/cloudup/gcetasks/disk.go @@ -21,7 +21,7 @@ import ( "reflect" compute "google.golang.org/api/compute/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/gce" "k8s.io/kops/upup/pkg/fi/cloudup/terraform" diff --git a/upup/pkg/fi/cloudup/gcetasks/forwardingrule.go b/upup/pkg/fi/cloudup/gcetasks/forwardingrule.go index e90e727418..15cd11b80d 100644 --- a/upup/pkg/fi/cloudup/gcetasks/forwardingrule.go +++ b/upup/pkg/fi/cloudup/gcetasks/forwardingrule.go @@ -20,7 +20,7 @@ import ( "fmt" compute "google.golang.org/api/compute/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/gce" "k8s.io/kops/upup/pkg/fi/cloudup/terraform" diff --git a/upup/pkg/fi/cloudup/gcetasks/instance.go b/upup/pkg/fi/cloudup/gcetasks/instance.go index 7e3b28869a..6a80dc1ce6 100644 --- a/upup/pkg/fi/cloudup/gcetasks/instance.go +++ b/upup/pkg/fi/cloudup/gcetasks/instance.go @@ -22,7 +22,7 @@ import ( "strings" compute "google.golang.org/api/compute/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/gce" "k8s.io/kops/upup/pkg/fi/cloudup/terraform" diff --git a/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go b/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go index 6b9e128369..65d2c2e40f 100644 --- a/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go +++ b/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go @@ -25,7 +25,7 @@ import ( "time" compute "google.golang.org/api/compute/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/diff" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/gce" @@ -368,7 +368,7 @@ func matches(l, r *compute.InstanceTemplate) bool { normalizedR := normalize(r) if !reflect.DeepEqual(normalizedL, normalizedR) { - if klog.V(10) { + if klog.V(10).Enabled() { ls := fi.DebugAsJsonStringIndent(normalizedL) rs := fi.DebugAsJsonStringIndent(normalizedR) klog.V(10).Infof("Not equal") diff --git a/upup/pkg/fi/cloudup/gcetasks/network.go b/upup/pkg/fi/cloudup/gcetasks/network.go index 3f611e0aaa..29d0c73b9e 100644 --- a/upup/pkg/fi/cloudup/gcetasks/network.go +++ b/upup/pkg/fi/cloudup/gcetasks/network.go @@ -21,7 +21,7 @@ import ( "reflect" compute "google.golang.org/api/compute/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/gce" "k8s.io/kops/upup/pkg/fi/cloudup/terraform" diff --git a/upup/pkg/fi/cloudup/gcetasks/storagebucketacl.go b/upup/pkg/fi/cloudup/gcetasks/storagebucketacl.go index 71233321a9..70b190ea52 100644 --- a/upup/pkg/fi/cloudup/gcetasks/storagebucketacl.go +++ b/upup/pkg/fi/cloudup/gcetasks/storagebucketacl.go @@ -20,7 +20,7 @@ import ( "fmt" "google.golang.org/api/storage/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/gce" "k8s.io/kops/upup/pkg/fi/cloudup/terraform" diff --git a/upup/pkg/fi/cloudup/gcetasks/storagebucketiam.go b/upup/pkg/fi/cloudup/gcetasks/storagebucketiam.go index def3a25fc6..ec869da2a8 100644 --- a/upup/pkg/fi/cloudup/gcetasks/storagebucketiam.go +++ b/upup/pkg/fi/cloudup/gcetasks/storagebucketiam.go @@ -20,7 +20,7 @@ import ( "fmt" "google.golang.org/api/storage/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/gce" "k8s.io/kops/upup/pkg/fi/cloudup/terraform" diff --git a/upup/pkg/fi/cloudup/gcetasks/storageobjectacl.go b/upup/pkg/fi/cloudup/gcetasks/storageobjectacl.go index 472cbdfc2f..39cb36698f 100644 --- a/upup/pkg/fi/cloudup/gcetasks/storageobjectacl.go +++ b/upup/pkg/fi/cloudup/gcetasks/storageobjectacl.go @@ -20,7 +20,7 @@ import ( "fmt" "google.golang.org/api/storage/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/gce" "k8s.io/kops/upup/pkg/fi/cloudup/terraform" diff --git a/upup/pkg/fi/cloudup/gcetasks/subnet.go b/upup/pkg/fi/cloudup/gcetasks/subnet.go index 8fb81f7023..6f2228dcd1 100644 --- a/upup/pkg/fi/cloudup/gcetasks/subnet.go +++ b/upup/pkg/fi/cloudup/gcetasks/subnet.go @@ -21,7 +21,7 @@ import ( "reflect" compute "google.golang.org/api/compute/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/gce" "k8s.io/kops/upup/pkg/fi/cloudup/terraform" diff --git a/upup/pkg/fi/cloudup/gcetasks/targetpool.go b/upup/pkg/fi/cloudup/gcetasks/targetpool.go index f55631eb82..f9c42404d6 100644 --- a/upup/pkg/fi/cloudup/gcetasks/targetpool.go +++ b/upup/pkg/fi/cloudup/gcetasks/targetpool.go @@ -20,7 +20,7 @@ import ( "fmt" compute "google.golang.org/api/compute/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/gce" "k8s.io/kops/upup/pkg/fi/cloudup/terraform" diff --git a/upup/pkg/fi/cloudup/loader.go b/upup/pkg/fi/cloudup/loader.go index 673b83de93..c9d9f0991d 100644 --- a/upup/pkg/fi/cloudup/loader.go +++ b/upup/pkg/fi/cloudup/loader.go @@ -25,7 +25,7 @@ import ( "text/template" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/klog" + "k8s.io/klog/v2" kopsapi "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/assets" "k8s.io/kops/upup/pkg/fi" diff --git a/upup/pkg/fi/cloudup/networking.go b/upup/pkg/fi/cloudup/networking.go index f45733d82d..a3919951a0 100644 --- a/upup/pkg/fi/cloudup/networking.go +++ b/upup/pkg/fi/cloudup/networking.go @@ -21,7 +21,7 @@ import ( "net/url" "os" - "k8s.io/klog" + "k8s.io/klog/v2" kopsapi "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/util" "k8s.io/kops/pkg/assets" diff --git a/upup/pkg/fi/cloudup/new_cluster.go b/upup/pkg/fi/cloudup/new_cluster.go index 0f4ff30a9d..0511dbe4e1 100644 --- a/upup/pkg/fi/cloudup/new_cluster.go +++ b/upup/pkg/fi/cloudup/new_cluster.go @@ -27,7 +27,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation/field" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops" api "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/model" diff --git a/upup/pkg/fi/cloudup/openstack/BUILD.bazel b/upup/pkg/fi/cloudup/openstack/BUILD.bazel index 3b421d791f..658823da7c 100644 --- a/upup/pkg/fi/cloudup/openstack/BUILD.bazel +++ b/upup/pkg/fi/cloudup/openstack/BUILD.bazel @@ -69,7 +69,7 @@ go_library( "//vendor/github.com/mitchellh/mapstructure:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/cloudup/openstack/cloud.go b/upup/pkg/fi/cloudup/openstack/cloud.go index bd3bdc5842..2c64b8deba 100644 --- a/upup/pkg/fi/cloudup/openstack/cloud.go +++ b/upup/pkg/fi/cloudup/openstack/cloud.go @@ -48,7 +48,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dnsprovider/pkg/dnsprovider" "k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/openstack/designate" "k8s.io/kops/pkg/apis/kops" diff --git a/upup/pkg/fi/cloudup/openstack/instance.go b/upup/pkg/fi/cloudup/openstack/instance.go index 72d70d722b..5879cfdaea 100644 --- a/upup/pkg/fi/cloudup/openstack/instance.go +++ b/upup/pkg/fi/cloudup/openstack/instance.go @@ -23,7 +23,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" "github.com/mitchellh/mapstructure" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/cloudinstances" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/util/pkg/vfs" diff --git a/upup/pkg/fi/cloudup/openstack/server_group.go b/upup/pkg/fi/cloudup/openstack/server_group.go index 36caf35ac7..f5d83fddac 100644 --- a/upup/pkg/fi/cloudup/openstack/server_group.go +++ b/upup/pkg/fi/cloudup/openstack/server_group.go @@ -24,7 +24,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/servergroups" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/cloudinstances" "k8s.io/kops/upup/pkg/fi" diff --git a/upup/pkg/fi/cloudup/openstack/status.go b/upup/pkg/fi/cloudup/openstack/status.go index b99a22a08a..646ffc77a9 100644 --- a/upup/pkg/fi/cloudup/openstack/status.go +++ b/upup/pkg/fi/cloudup/openstack/status.go @@ -34,7 +34,7 @@ import ( "strings" cinderv3 "github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/protokube/pkg/etcd" "k8s.io/kops/upup/pkg/fi" diff --git a/upup/pkg/fi/cloudup/openstack/volume.go b/upup/pkg/fi/cloudup/openstack/volume.go index 600017c45a..1029730fa4 100644 --- a/upup/pkg/fi/cloudup/openstack/volume.go +++ b/upup/pkg/fi/cloudup/openstack/volume.go @@ -22,7 +22,7 @@ import ( cinder "github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes" "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/volumeattach" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/util/pkg/vfs" ) diff --git a/upup/pkg/fi/cloudup/openstacktasks/BUILD.bazel b/upup/pkg/fi/cloudup/openstacktasks/BUILD.bazel index 1bcb509a2e..a338ae5e06 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/BUILD.bazel +++ b/upup/pkg/fi/cloudup/openstacktasks/BUILD.bazel @@ -62,7 +62,7 @@ go_library( "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/subnets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/cloud-provider-openstack/pkg/util/openstack:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/cloudup/openstacktasks/floatingip.go b/upup/pkg/fi/cloudup/openstacktasks/floatingip.go index 3d11177f1b..73e5013ce6 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/floatingip.go +++ b/upup/pkg/fi/cloudup/openstacktasks/floatingip.go @@ -22,7 +22,7 @@ import ( l3floatingip "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/openstack" "k8s.io/kops/util/pkg/vfs" diff --git a/upup/pkg/fi/cloudup/openstacktasks/instance.go b/upup/pkg/fi/cloudup/openstacktasks/instance.go index 8578386bbb..bb46e14daf 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/instance.go +++ b/upup/pkg/fi/cloudup/openstacktasks/instance.go @@ -25,7 +25,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs" "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/schedulerhints" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/openstack" ) diff --git a/upup/pkg/fi/cloudup/openstacktasks/lb.go b/upup/pkg/fi/cloudup/openstacktasks/lb.go index 67379d6508..ab1dc927a6 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/lb.go +++ b/upup/pkg/fi/cloudup/openstacktasks/lb.go @@ -26,7 +26,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers" "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/openstack" ) diff --git a/upup/pkg/fi/cloudup/openstacktasks/lblistener.go b/upup/pkg/fi/cloudup/openstacktasks/lblistener.go index 74372749da..8baf44176d 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/lblistener.go +++ b/upup/pkg/fi/cloudup/openstacktasks/lblistener.go @@ -19,7 +19,7 @@ package openstacktasks import ( "fmt" - "k8s.io/klog" + "k8s.io/klog/v2" // "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/floatingips" "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners" openstackutil "k8s.io/cloud-provider-openstack/pkg/util/openstack" diff --git a/upup/pkg/fi/cloudup/openstacktasks/lbpool.go b/upup/pkg/fi/cloudup/openstacktasks/lbpool.go index 84db970260..b3599793bd 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/lbpool.go +++ b/upup/pkg/fi/cloudup/openstacktasks/lbpool.go @@ -20,7 +20,7 @@ import ( "fmt" v2pools "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/openstack" ) diff --git a/upup/pkg/fi/cloudup/openstacktasks/network.go b/upup/pkg/fi/cloudup/openstacktasks/network.go index a13ab07473..7e5576d1a8 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/network.go +++ b/upup/pkg/fi/cloudup/openstacktasks/network.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/networking/v2/networks" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/openstack" ) diff --git a/upup/pkg/fi/cloudup/openstacktasks/poolassociation.go b/upup/pkg/fi/cloudup/openstacktasks/poolassociation.go index 44df6ef063..381a2ace0b 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/poolassociation.go +++ b/upup/pkg/fi/cloudup/openstacktasks/poolassociation.go @@ -23,7 +23,7 @@ import ( "github.com/gophercloud/gophercloud" v2pools "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/openstack" "k8s.io/kops/util/pkg/vfs" diff --git a/upup/pkg/fi/cloudup/openstacktasks/port.go b/upup/pkg/fi/cloudup/openstacktasks/port.go index cda20675cf..5fa4b05fb8 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/port.go +++ b/upup/pkg/fi/cloudup/openstacktasks/port.go @@ -21,7 +21,7 @@ import ( secgroup "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups" "github.com/gophercloud/gophercloud/openstack/networking/v2/ports" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/openstack" ) diff --git a/upup/pkg/fi/cloudup/openstacktasks/router.go b/upup/pkg/fi/cloudup/openstacktasks/router.go index 34de6f1d44..3dfcf0611e 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/router.go +++ b/upup/pkg/fi/cloudup/openstacktasks/router.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/openstack" ) diff --git a/upup/pkg/fi/cloudup/openstacktasks/routerinterface.go b/upup/pkg/fi/cloudup/openstacktasks/routerinterface.go index 17161434bf..8f1e1bb194 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/routerinterface.go +++ b/upup/pkg/fi/cloudup/openstacktasks/routerinterface.go @@ -21,7 +21,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers" "github.com/gophercloud/gophercloud/openstack/networking/v2/ports" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/openstack" ) diff --git a/upup/pkg/fi/cloudup/openstacktasks/securitygroup.go b/upup/pkg/fi/cloudup/openstacktasks/securitygroup.go index 117b30d4a8..23594aa38c 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/securitygroup.go +++ b/upup/pkg/fi/cloudup/openstacktasks/securitygroup.go @@ -23,7 +23,7 @@ import ( sg "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups" sgr "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/openstack" ) diff --git a/upup/pkg/fi/cloudup/openstacktasks/securitygrouprule.go b/upup/pkg/fi/cloudup/openstacktasks/securitygrouprule.go index f543b79798..d75346e7d9 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/securitygrouprule.go +++ b/upup/pkg/fi/cloudup/openstacktasks/securitygrouprule.go @@ -20,7 +20,7 @@ import ( "fmt" sgr "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/openstack" ) diff --git a/upup/pkg/fi/cloudup/openstacktasks/servergroup.go b/upup/pkg/fi/cloudup/openstacktasks/servergroup.go index c2cc874f4a..0acacd2f86 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/servergroup.go +++ b/upup/pkg/fi/cloudup/openstacktasks/servergroup.go @@ -22,7 +22,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/servergroups" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/openstack" ) diff --git a/upup/pkg/fi/cloudup/openstacktasks/sshkey.go b/upup/pkg/fi/cloudup/openstacktasks/sshkey.go index f8921a8127..bcc170e803 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/sshkey.go +++ b/upup/pkg/fi/cloudup/openstacktasks/sshkey.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/pki" "k8s.io/kops/upup/pkg/fi" diff --git a/upup/pkg/fi/cloudup/openstacktasks/subnet.go b/upup/pkg/fi/cloudup/openstacktasks/subnet.go index 6b3ca1fcfa..89057709f5 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/subnet.go +++ b/upup/pkg/fi/cloudup/openstacktasks/subnet.go @@ -21,7 +21,7 @@ import ( "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/openstack" ) diff --git a/upup/pkg/fi/cloudup/openstacktasks/volume.go b/upup/pkg/fi/cloudup/openstacktasks/volume.go index 40147d55b3..da4eb900bd 100644 --- a/upup/pkg/fi/cloudup/openstacktasks/volume.go +++ b/upup/pkg/fi/cloudup/openstacktasks/volume.go @@ -20,7 +20,7 @@ import ( "fmt" cinderv3 "github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/openstack" ) diff --git a/upup/pkg/fi/cloudup/populate_cluster_spec.go b/upup/pkg/fi/cloudup/populate_cluster_spec.go index dc74dcac90..c2dc6576aa 100644 --- a/upup/pkg/fi/cloudup/populate_cluster_spec.go +++ b/upup/pkg/fi/cloudup/populate_cluster_spec.go @@ -22,7 +22,7 @@ import ( "net" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" kopsapi "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/util" diff --git a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go index db6ebf9374..cdb5bc0dd4 100644 --- a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go +++ b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/blang/semver/v4" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/util" "k8s.io/kops/pkg/apis/kops/validation" diff --git a/upup/pkg/fi/cloudup/spec_builder.go b/upup/pkg/fi/cloudup/spec_builder.go index 139a085fbf..c87e93a9c1 100644 --- a/upup/pkg/fi/cloudup/spec_builder.go +++ b/upup/pkg/fi/cloudup/spec_builder.go @@ -17,7 +17,7 @@ limitations under the License. package cloudup import ( - "k8s.io/klog" + "k8s.io/klog/v2" kopsapi "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/loader" diff --git a/upup/pkg/fi/cloudup/spotinsttasks/BUILD.bazel b/upup/pkg/fi/cloudup/spotinsttasks/BUILD.bazel index 55e95ed2bc..1825792b5c 100644 --- a/upup/pkg/fi/cloudup/spotinsttasks/BUILD.bazel +++ b/upup/pkg/fi/cloudup/spotinsttasks/BUILD.bazel @@ -26,6 +26,6 @@ go_library( "//vendor/github.com/spotinst/spotinst-sdk-go/spotinst/util/stringutil:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/cloudup/spotinsttasks/elastigroup.go b/upup/pkg/fi/cloudup/spotinsttasks/elastigroup.go index cdba6cb1e0..f0b763c318 100644 --- a/upup/pkg/fi/cloudup/spotinsttasks/elastigroup.go +++ b/upup/pkg/fi/cloudup/spotinsttasks/elastigroup.go @@ -30,7 +30,7 @@ import ( "github.com/spotinst/spotinst-sdk-go/spotinst/util/stringutil" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/resources/spotinst" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awstasks" diff --git a/upup/pkg/fi/cloudup/spotinsttasks/launch_spec.go b/upup/pkg/fi/cloudup/spotinsttasks/launch_spec.go index c9019792f4..1115180938 100644 --- a/upup/pkg/fi/cloudup/spotinsttasks/launch_spec.go +++ b/upup/pkg/fi/cloudup/spotinsttasks/launch_spec.go @@ -26,7 +26,7 @@ import ( "github.com/spotinst/spotinst-sdk-go/service/ocean/providers/aws" "github.com/spotinst/spotinst-sdk-go/spotinst/util/stringutil" corev1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/resources/spotinst" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awstasks" diff --git a/upup/pkg/fi/cloudup/spotinsttasks/ocean.go b/upup/pkg/fi/cloudup/spotinsttasks/ocean.go index a793ed805c..2889c58cfe 100644 --- a/upup/pkg/fi/cloudup/spotinsttasks/ocean.go +++ b/upup/pkg/fi/cloudup/spotinsttasks/ocean.go @@ -28,7 +28,7 @@ import ( "github.com/spotinst/spotinst-sdk-go/spotinst/client" "github.com/spotinst/spotinst-sdk-go/spotinst/util/stringutil" corev1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/resources/spotinst" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awstasks" diff --git a/upup/pkg/fi/cloudup/subnets.go b/upup/pkg/fi/cloudup/subnets.go index 426a9d8497..d3747864d7 100644 --- a/upup/pkg/fi/cloudup/subnets.go +++ b/upup/pkg/fi/cloudup/subnets.go @@ -21,7 +21,7 @@ import ( "net" "sort" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/util/subnet" "k8s.io/kops/upup/pkg/fi" diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go index bd5a6e68cc..4fcc218b0c 100644 --- a/upup/pkg/fi/cloudup/template_functions.go +++ b/upup/pkg/fi/cloudup/template_functions.go @@ -39,7 +39,7 @@ import ( "github.com/Masterminds/sprig" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/klog" + "k8s.io/klog/v2" kopscontrollerconfig "k8s.io/kops/cmd/kops-controller/pkg/config" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/util" diff --git a/upup/pkg/fi/cloudup/terraform/BUILD.bazel b/upup/pkg/fi/cloudup/terraform/BUILD.bazel index dcca1f3b06..d56bb59675 100644 --- a/upup/pkg/fi/cloudup/terraform/BUILD.bazel +++ b/upup/pkg/fi/cloudup/terraform/BUILD.bazel @@ -25,7 +25,7 @@ go_library( "//vendor/github.com/hashicorp/hcl/v2/hclwrite:go_default_library", "//vendor/github.com/zclconf/go-cty/cty:go_default_library", "//vendor/github.com/zclconf/go-cty/cty/gocty:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/cloudup/terraform/hcl_printer.go b/upup/pkg/fi/cloudup/terraform/hcl_printer.go index 4b177d6b5e..bf73085520 100644 --- a/upup/pkg/fi/cloudup/terraform/hcl_printer.go +++ b/upup/pkg/fi/cloudup/terraform/hcl_printer.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/hcl/hcl/ast" hcl_printer "github.com/hashicorp/hcl/hcl/printer" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/featureflag" ) diff --git a/upup/pkg/fi/cloudup/terraform/literal.go b/upup/pkg/fi/cloudup/terraform/literal.go index 7c49083c43..2ee8b0756d 100644 --- a/upup/pkg/fi/cloudup/terraform/literal.go +++ b/upup/pkg/fi/cloudup/terraform/literal.go @@ -21,7 +21,7 @@ import ( "fmt" "sort" - "k8s.io/klog" + "k8s.io/klog/v2" ) type fileFn string diff --git a/upup/pkg/fi/cloudup/terraform/target.go b/upup/pkg/fi/cloudup/terraform/target.go index d0a31ed00b..37d62ddf17 100644 --- a/upup/pkg/fi/cloudup/terraform/target.go +++ b/upup/pkg/fi/cloudup/terraform/target.go @@ -25,7 +25,7 @@ import ( "strings" "sync" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" ) diff --git a/upup/pkg/fi/cloudup/urls.go b/upup/pkg/fi/cloudup/urls.go index b9d9a72a21..2cfbcfd501 100644 --- a/upup/pkg/fi/cloudup/urls.go +++ b/upup/pkg/fi/cloudup/urls.go @@ -23,7 +23,7 @@ import ( "path" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops" "k8s.io/kops/pkg/assets" "k8s.io/kops/util/pkg/architectures" diff --git a/upup/pkg/fi/cloudup/utils.go b/upup/pkg/fi/cloudup/utils.go index ac4d9e8314..959ff3e570 100644 --- a/upup/pkg/fi/cloudup/utils.go +++ b/upup/pkg/fi/cloudup/utils.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dnsprovider/pkg/dnsprovider" "k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/aws/route53" "k8s.io/kops/pkg/apis/kops" diff --git a/upup/pkg/fi/cloudup/validation_test.go b/upup/pkg/fi/cloudup/validation_test.go index cc7e500479..13cfdc5e59 100644 --- a/upup/pkg/fi/cloudup/validation_test.go +++ b/upup/pkg/fi/cloudup/validation_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "k8s.io/klog" + "k8s.io/klog/v2" api "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/validation" "k8s.io/kops/upup/pkg/fi" diff --git a/upup/pkg/fi/context.go b/upup/pkg/fi/context.go index edbdbd55f2..bdfb83dc07 100644 --- a/upup/pkg/fi/context.go +++ b/upup/pkg/fi/context.go @@ -24,7 +24,7 @@ import ( "reflect" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/dnsprovider/pkg/dnsprovider" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/util/pkg/vfs" diff --git a/upup/pkg/fi/dryrun_target.go b/upup/pkg/fi/dryrun_target.go index 6f5781bc2b..89f9b18a64 100644 --- a/upup/pkg/fi/dryrun_target.go +++ b/upup/pkg/fi/dryrun_target.go @@ -25,7 +25,7 @@ import ( "strings" "sync" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/assets" "k8s.io/kops/pkg/diff" "k8s.io/kops/util/pkg/reflectutils" diff --git a/upup/pkg/fi/executor.go b/upup/pkg/fi/executor.go index f777e369a4..f3f9610863 100644 --- a/upup/pkg/fi/executor.go +++ b/upup/pkg/fi/executor.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "k8s.io/klog" + "k8s.io/klog/v2" ) type executor struct { diff --git a/upup/pkg/fi/files.go b/upup/pkg/fi/files.go index 935f98cba4..a05eff5dbe 100644 --- a/upup/pkg/fi/files.go +++ b/upup/pkg/fi/files.go @@ -23,7 +23,7 @@ import ( "path" "strconv" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/util/pkg/hashing" ) diff --git a/upup/pkg/fi/files_owner.go b/upup/pkg/fi/files_owner.go index 57627d8d43..2bcec53f4a 100644 --- a/upup/pkg/fi/files_owner.go +++ b/upup/pkg/fi/files_owner.go @@ -23,7 +23,7 @@ import ( "os" "syscall" - "k8s.io/klog" + "k8s.io/klog/v2" ) func EnsureFileOwner(destPath string, owner string, groupName string) (bool, error) { diff --git a/upup/pkg/fi/fitasks/BUILD.bazel b/upup/pkg/fi/fitasks/BUILD.bazel index d7ab74dec4..ac47d89053 100644 --- a/upup/pkg/fi/fitasks/BUILD.bazel +++ b/upup/pkg/fi/fitasks/BUILD.bazel @@ -23,7 +23,7 @@ go_library( "//upup/pkg/fi/secrets:go_default_library", "//util/pkg/vfs:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/fitasks/keypair.go b/upup/pkg/fi/fitasks/keypair.go index 26153ef07e..a3950e2ceb 100644 --- a/upup/pkg/fi/fitasks/keypair.go +++ b/upup/pkg/fi/fitasks/keypair.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/pki" "k8s.io/kops/upup/pkg/fi" ) diff --git a/upup/pkg/fi/fitasks/mirrorkeystore.go b/upup/pkg/fi/fitasks/mirrorkeystore.go index dd634ca857..78858f158d 100644 --- a/upup/pkg/fi/fitasks/mirrorkeystore.go +++ b/upup/pkg/fi/fitasks/mirrorkeystore.go @@ -17,7 +17,7 @@ limitations under the License. package fitasks import ( - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/util/pkg/vfs" ) diff --git a/upup/pkg/fi/fitasks/mirrorsecrets.go b/upup/pkg/fi/fitasks/mirrorsecrets.go index 2a1c1f5784..c8d97c68e7 100644 --- a/upup/pkg/fi/fitasks/mirrorsecrets.go +++ b/upup/pkg/fi/fitasks/mirrorsecrets.go @@ -17,7 +17,7 @@ limitations under the License. package fitasks import ( - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/secrets" "k8s.io/kops/util/pkg/vfs" diff --git a/upup/pkg/fi/http.go b/upup/pkg/fi/http.go index ce482dcd68..8f932466c7 100644 --- a/upup/pkg/fi/http.go +++ b/upup/pkg/fi/http.go @@ -24,7 +24,7 @@ import ( "path" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/util/pkg/hashing" ) diff --git a/upup/pkg/fi/loader/BUILD.bazel b/upup/pkg/fi/loader/BUILD.bazel index a1022085f6..73086343a6 100644 --- a/upup/pkg/fi/loader/BUILD.bazel +++ b/upup/pkg/fi/loader/BUILD.bazel @@ -11,6 +11,6 @@ go_library( deps = [ "//util/pkg/reflectutils:go_default_library", "//util/pkg/vfs:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/loader/options_loader.go b/upup/pkg/fi/loader/options_loader.go index f3ec613299..a808796736 100644 --- a/upup/pkg/fi/loader/options_loader.go +++ b/upup/pkg/fi/loader/options_loader.go @@ -20,7 +20,7 @@ import ( "fmt" "reflect" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/util/pkg/reflectutils" ) diff --git a/upup/pkg/fi/loader/tree_walker.go b/upup/pkg/fi/loader/tree_walker.go index 3441c87574..0fb36851a9 100644 --- a/upup/pkg/fi/loader/tree_walker.go +++ b/upup/pkg/fi/loader/tree_walker.go @@ -20,7 +20,7 @@ import ( "fmt" "path" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/util/pkg/vfs" ) diff --git a/upup/pkg/fi/nodeup/BUILD.bazel b/upup/pkg/fi/nodeup/BUILD.bazel index 4645532fdc..d832e625aa 100644 --- a/upup/pkg/fi/nodeup/BUILD.bazel +++ b/upup/pkg/fi/nodeup/BUILD.bazel @@ -27,6 +27,6 @@ go_library( "//vendor/github.com/aws/aws-sdk-go/aws:go_default_library", "//vendor/github.com/aws/aws-sdk-go/aws/session:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/nodeup/cloudinit/BUILD.bazel b/upup/pkg/fi/nodeup/cloudinit/BUILD.bazel index 16138f75e3..3409c78e9d 100644 --- a/upup/pkg/fi/nodeup/cloudinit/BUILD.bazel +++ b/upup/pkg/fi/nodeup/cloudinit/BUILD.bazel @@ -8,6 +8,6 @@ go_library( deps = [ "//upup/pkg/fi:go_default_library", "//upup/pkg/fi/utils:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/nodeup/cloudinit/cloud_init_target.go b/upup/pkg/fi/nodeup/cloudinit/cloud_init_target.go index b83b8ad055..6c87ee685a 100644 --- a/upup/pkg/fi/nodeup/cloudinit/cloud_init_target.go +++ b/upup/pkg/fi/nodeup/cloudinit/cloud_init_target.go @@ -23,7 +23,7 @@ import ( "os" "path" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/utils" ) diff --git a/upup/pkg/fi/nodeup/command.go b/upup/pkg/fi/nodeup/command.go index 9db3c700bd..f30923af91 100644 --- a/upup/pkg/fi/nodeup/command.go +++ b/upup/pkg/fi/nodeup/command.go @@ -46,7 +46,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" ) // MaxTaskDuration is the amount of time to keep trying for; we retry for a long time - there is not really any great fallback diff --git a/upup/pkg/fi/nodeup/loader.go b/upup/pkg/fi/nodeup/loader.go index 4a89eefae1..b4a13a0431 100644 --- a/upup/pkg/fi/nodeup/loader.go +++ b/upup/pkg/fi/nodeup/loader.go @@ -17,7 +17,7 @@ limitations under the License. package nodeup import ( - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/nodetasks" ) diff --git a/upup/pkg/fi/nodeup/nodetasks/BUILD.bazel b/upup/pkg/fi/nodeup/nodetasks/BUILD.bazel index 9424293adf..545f0ff084 100644 --- a/upup/pkg/fi/nodeup/nodetasks/BUILD.bazel +++ b/upup/pkg/fi/nodeup/nodetasks/BUILD.bazel @@ -34,7 +34,7 @@ go_library( "//upup/pkg/fi/utils:go_default_library", "//util/pkg/hashing:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/nodeup/nodetasks/archive.go b/upup/pkg/fi/nodeup/nodetasks/archive.go index 52d7eb2d0f..aa61714d23 100644 --- a/upup/pkg/fi/nodeup/nodetasks/archive.go +++ b/upup/pkg/fi/nodeup/nodetasks/archive.go @@ -28,7 +28,7 @@ import ( "strconv" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/cloudinit" "k8s.io/kops/upup/pkg/fi/nodeup/local" diff --git a/upup/pkg/fi/nodeup/nodetasks/bindmount.go b/upup/pkg/fi/nodeup/nodetasks/bindmount.go index 0d9726e98d..0eca8ce485 100644 --- a/upup/pkg/fi/nodeup/nodetasks/bindmount.go +++ b/upup/pkg/fi/nodeup/nodetasks/bindmount.go @@ -22,7 +22,7 @@ import ( "strings" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/cloudinit" "k8s.io/kops/upup/pkg/fi/nodeup/local" diff --git a/upup/pkg/fi/nodeup/nodetasks/chattr.go b/upup/pkg/fi/nodeup/nodetasks/chattr.go index 781c469c17..a18afba1d2 100644 --- a/upup/pkg/fi/nodeup/nodetasks/chattr.go +++ b/upup/pkg/fi/nodeup/nodetasks/chattr.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/cloudinit" "k8s.io/kops/upup/pkg/fi/nodeup/local" diff --git a/upup/pkg/fi/nodeup/nodetasks/file.go b/upup/pkg/fi/nodeup/nodetasks/file.go index 200aa27bf0..574ccb976d 100644 --- a/upup/pkg/fi/nodeup/nodetasks/file.go +++ b/upup/pkg/fi/nodeup/nodetasks/file.go @@ -25,7 +25,7 @@ import ( "strings" "syscall" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/cloudinit" "k8s.io/kops/upup/pkg/fi/nodeup/local" diff --git a/upup/pkg/fi/nodeup/nodetasks/group.go b/upup/pkg/fi/nodeup/nodetasks/group.go index 1440470b3b..9ce29ec04a 100644 --- a/upup/pkg/fi/nodeup/nodetasks/group.go +++ b/upup/pkg/fi/nodeup/nodetasks/group.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/cloudinit" "k8s.io/kops/upup/pkg/fi/nodeup/local" diff --git a/upup/pkg/fi/nodeup/nodetasks/issue_cert.go b/upup/pkg/fi/nodeup/nodetasks/issue_cert.go index 52c9511ff1..9a93f17712 100644 --- a/upup/pkg/fi/nodeup/nodetasks/issue_cert.go +++ b/upup/pkg/fi/nodeup/nodetasks/issue_cert.go @@ -27,7 +27,7 @@ import ( "sort" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/pki" "k8s.io/kops/upup/pkg/fi" ) diff --git a/upup/pkg/fi/nodeup/nodetasks/load_image.go b/upup/pkg/fi/nodeup/nodetasks/load_image.go index 787894e7e6..5416993e49 100644 --- a/upup/pkg/fi/nodeup/nodetasks/load_image.go +++ b/upup/pkg/fi/nodeup/nodetasks/load_image.go @@ -24,7 +24,7 @@ import ( "path" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/backoff" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/cloudinit" diff --git a/upup/pkg/fi/nodeup/nodetasks/package.go b/upup/pkg/fi/nodeup/nodetasks/package.go index 981118d16a..d4a9d079c3 100644 --- a/upup/pkg/fi/nodeup/nodetasks/package.go +++ b/upup/pkg/fi/nodeup/nodetasks/package.go @@ -25,7 +25,7 @@ import ( "strings" "sync" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/nodeup/pkg/distros" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" diff --git a/upup/pkg/fi/nodeup/nodetasks/service.go b/upup/pkg/fi/nodeup/nodetasks/service.go index 35d1248997..433f4e0c04 100644 --- a/upup/pkg/fi/nodeup/nodetasks/service.go +++ b/upup/pkg/fi/nodeup/nodetasks/service.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/nodeup/pkg/distros" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/cloudinit" diff --git a/upup/pkg/fi/nodeup/nodetasks/update_packages.go b/upup/pkg/fi/nodeup/nodetasks/update_packages.go index 154d27627a..6d4b1d35de 100644 --- a/upup/pkg/fi/nodeup/nodetasks/update_packages.go +++ b/upup/pkg/fi/nodeup/nodetasks/update_packages.go @@ -22,7 +22,7 @@ import ( "os/exec" "syscall" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/nodeup/pkg/distros" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/cloudinit" diff --git a/upup/pkg/fi/nodeup/nodetasks/user.go b/upup/pkg/fi/nodeup/nodetasks/user.go index 8e479d6ab3..538f50eeba 100644 --- a/upup/pkg/fi/nodeup/nodetasks/user.go +++ b/upup/pkg/fi/nodeup/nodetasks/user.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/nodeup/cloudinit" "k8s.io/kops/upup/pkg/fi/nodeup/local" diff --git a/upup/pkg/fi/secrets/BUILD.bazel b/upup/pkg/fi/secrets/BUILD.bazel index d4201be4b4..25c563b1bc 100644 --- a/upup/pkg/fi/secrets/BUILD.bazel +++ b/upup/pkg/fi/secrets/BUILD.bazel @@ -17,6 +17,6 @@ go_library( "//util/pkg/vfs:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/secrets/clientset_secretstore.go b/upup/pkg/fi/secrets/clientset_secretstore.go index 9d9a2a75b7..75cb44f95b 100644 --- a/upup/pkg/fi/secrets/clientset_secretstore.go +++ b/upup/pkg/fi/secrets/clientset_secretstore.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/acls" "k8s.io/kops/pkg/apis/kops" kopsinternalversion "k8s.io/kops/pkg/client/clientset_generated/clientset/typed/kops/internalversion" diff --git a/upup/pkg/fi/secrets/vfs_secretstore.go b/upup/pkg/fi/secrets/vfs_secretstore.go index 14f85d4ce7..e3ec5dce87 100644 --- a/upup/pkg/fi/secrets/vfs_secretstore.go +++ b/upup/pkg/fi/secrets/vfs_secretstore.go @@ -22,7 +22,7 @@ import ( "fmt" "os" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/acls" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" diff --git a/upup/pkg/fi/task.go b/upup/pkg/fi/task.go index 25cff2d5b8..46deeb66a3 100644 --- a/upup/pkg/fi/task.go +++ b/upup/pkg/fi/task.go @@ -21,7 +21,7 @@ import ( "reflect" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" ) type Task interface { diff --git a/upup/pkg/fi/topological_sort.go b/upup/pkg/fi/topological_sort.go index 73a20c3141..0049519dec 100644 --- a/upup/pkg/fi/topological_sort.go +++ b/upup/pkg/fi/topological_sort.go @@ -20,7 +20,7 @@ import ( "fmt" "reflect" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/util/pkg/reflectutils" ) diff --git a/upup/pkg/fi/users.go b/upup/pkg/fi/users.go index ef27bcd922..5bfd1e8370 100644 --- a/upup/pkg/fi/users.go +++ b/upup/pkg/fi/users.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" ) // This file parses /etc/passwd and /etc/group to get information about users & groups diff --git a/upup/pkg/fi/vfs_castore.go b/upup/pkg/fi/vfs_castore.go index 7e29a25f4a..7d16c9b6f5 100644 --- a/upup/pkg/fi/vfs_castore.go +++ b/upup/pkg/fi/vfs_castore.go @@ -25,7 +25,7 @@ import ( "sync" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/acls" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/v1alpha2" diff --git a/upup/pkg/kutil/BUILD.bazel b/upup/pkg/kutil/BUILD.bazel index 0a3743388d..3eab26fcbf 100644 --- a/upup/pkg/kutil/BUILD.bazel +++ b/upup/pkg/kutil/BUILD.bazel @@ -28,6 +28,6 @@ go_library( "//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library", "//vendor/golang.org/x/crypto/ssh:go_default_library", "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/kutil/convert_kubeup_cluster.go b/upup/pkg/kutil/convert_kubeup_cluster.go index c2627c2cdd..1b34cb735d 100644 --- a/upup/pkg/kutil/convert_kubeup_cluster.go +++ b/upup/pkg/kutil/convert_kubeup_cluster.go @@ -24,7 +24,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/autoscaling" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops" api "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/registry" diff --git a/upup/pkg/kutil/import_cluster.go b/upup/pkg/kutil/import_cluster.go index 47832ab445..28dbff2048 100644 --- a/upup/pkg/kutil/import_cluster.go +++ b/upup/pkg/kutil/import_cluster.go @@ -27,7 +27,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/registry" "k8s.io/kops/pkg/client/simple" diff --git a/upup/pkg/kutil/kubectl.go b/upup/pkg/kutil/kubectl.go index 36669003b1..2268739980 100644 --- a/upup/pkg/kutil/kubectl.go +++ b/upup/pkg/kutil/kubectl.go @@ -26,7 +26,7 @@ import ( "strings" "k8s.io/client-go/tools/clientcmd" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/kubeconfig" ) diff --git a/util/pkg/architectures/BUILD.bazel b/util/pkg/architectures/BUILD.bazel index 9ee07e7639..7654a29275 100644 --- a/util/pkg/architectures/BUILD.bazel +++ b/util/pkg/architectures/BUILD.bazel @@ -5,5 +5,5 @@ go_library( srcs = ["architectures.go"], importpath = "k8s.io/kops/util/pkg/architectures", visibility = ["//visibility:public"], - deps = ["//vendor/k8s.io/klog:go_default_library"], + deps = ["//vendor/k8s.io/klog/v2:go_default_library"], ) diff --git a/util/pkg/architectures/architectures.go b/util/pkg/architectures/architectures.go index 1cdfb01015..a0b1269a91 100644 --- a/util/pkg/architectures/architectures.go +++ b/util/pkg/architectures/architectures.go @@ -21,7 +21,7 @@ import ( "os" "runtime" - "k8s.io/klog" + "k8s.io/klog/v2" ) type Architecture string diff --git a/util/pkg/hashing/BUILD.bazel b/util/pkg/hashing/BUILD.bazel index 53c48a772f..bbf024d4ba 100644 --- a/util/pkg/hashing/BUILD.bazel +++ b/util/pkg/hashing/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/try:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/util/pkg/hashing/hash.go b/util/pkg/hashing/hash.go index 5f193930ab..d37279ff55 100644 --- a/util/pkg/hashing/hash.go +++ b/util/pkg/hashing/hash.go @@ -28,7 +28,7 @@ import ( "os" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/try" ) diff --git a/util/pkg/proxy/BUILD.bazel b/util/pkg/proxy/BUILD.bazel index d0af5d58b2..ef968b0941 100644 --- a/util/pkg/proxy/BUILD.bazel +++ b/util/pkg/proxy/BUILD.bazel @@ -8,7 +8,7 @@ go_library( deps = [ "//pkg/apis/kops:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/util/pkg/proxy/proxy.go b/util/pkg/proxy/proxy.go index 1c6e642333..44c6b0f992 100644 --- a/util/pkg/proxy/proxy.go +++ b/util/pkg/proxy/proxy.go @@ -22,7 +22,7 @@ import ( "k8s.io/kops/pkg/apis/kops" v1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" ) func GetProxyEnvVars(proxies *kops.EgressProxySpec) []v1.EnvVar { diff --git a/util/pkg/reflectutils/BUILD.bazel b/util/pkg/reflectutils/BUILD.bazel index 856a47cff5..89078f4fbb 100644 --- a/util/pkg/reflectutils/BUILD.bazel +++ b/util/pkg/reflectutils/BUILD.bazel @@ -10,6 +10,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/values:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/util/pkg/reflectutils/print.go b/util/pkg/reflectutils/print.go index 7898c63814..4b3cdcdffa 100644 --- a/util/pkg/reflectutils/print.go +++ b/util/pkg/reflectutils/print.go @@ -21,7 +21,7 @@ import ( "fmt" "reflect" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/values" ) diff --git a/util/pkg/reflectutils/walk.go b/util/pkg/reflectutils/walk.go index 31d5d1069f..34a6ec1f8d 100644 --- a/util/pkg/reflectutils/walk.go +++ b/util/pkg/reflectutils/walk.go @@ -22,7 +22,7 @@ import ( "fmt" "reflect" - "k8s.io/klog" + "k8s.io/klog/v2" ) var SkipReflection = errors.New("skip this value") diff --git a/util/pkg/tables/BUILD.bazel b/util/pkg/tables/BUILD.bazel index 69acfee8f4..897969be7e 100644 --- a/util/pkg/tables/BUILD.bazel +++ b/util/pkg/tables/BUILD.bazel @@ -7,6 +7,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//util/pkg/reflectutils:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/util/pkg/tables/format.go b/util/pkg/tables/format.go index 7b77947bc1..659e7cbbcb 100644 --- a/util/pkg/tables/format.go +++ b/util/pkg/tables/format.go @@ -24,7 +24,7 @@ import ( "sort" "text/tabwriter" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/util/pkg/reflectutils" ) diff --git a/util/pkg/vfs/BUILD.bazel b/util/pkg/vfs/BUILD.bazel index 69e4749136..39997f77b8 100644 --- a/util/pkg/vfs/BUILD.bazel +++ b/util/pkg/vfs/BUILD.bazel @@ -51,7 +51,7 @@ go_library( "//vendor/google.golang.org/api/storage/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/client-go/util/homedir:go_default_library", - "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/util/pkg/vfs/context.go b/util/pkg/vfs/context.go index 33fff134e9..c33f84bc8e 100644 --- a/util/pkg/vfs/context.go +++ b/util/pkg/vfs/context.go @@ -34,7 +34,7 @@ import ( "google.golang.org/api/option" storage "google.golang.org/api/storage/v1" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" vault "github.com/hashicorp/vault/api" ) diff --git a/util/pkg/vfs/fs.go b/util/pkg/vfs/fs.go index b61a7a4040..5964257d34 100644 --- a/util/pkg/vfs/fs.go +++ b/util/pkg/vfs/fs.go @@ -24,7 +24,7 @@ import ( "path" "sync" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/pkg/try" "k8s.io/kops/util/pkg/hashing" ) diff --git a/util/pkg/vfs/gsfs.go b/util/pkg/vfs/gsfs.go index 15a21617e4..f8e54f32ce 100644 --- a/util/pkg/vfs/gsfs.go +++ b/util/pkg/vfs/gsfs.go @@ -32,7 +32,7 @@ import ( "google.golang.org/api/googleapi" storage "google.golang.org/api/storage/v1" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/util/pkg/hashing" ) diff --git a/util/pkg/vfs/ossfs.go b/util/pkg/vfs/ossfs.go index d37736d23b..8e71c644fe 100644 --- a/util/pkg/vfs/ossfs.go +++ b/util/pkg/vfs/ossfs.go @@ -31,7 +31,7 @@ import ( "github.com/denverdino/aliyungo/oss" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/util/pkg/hashing" ) diff --git a/util/pkg/vfs/s3context.go b/util/pkg/vfs/s3context.go index d9a0e91fdb..55e1b8e521 100644 --- a/util/pkg/vfs/s3context.go +++ b/util/pkg/vfs/s3context.go @@ -34,7 +34,7 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/s3" - "k8s.io/klog" + "k8s.io/klog/v2" ) var ( diff --git a/util/pkg/vfs/s3fs.go b/util/pkg/vfs/s3fs.go index 0405edf7aa..f98a8aad4a 100644 --- a/util/pkg/vfs/s3fs.go +++ b/util/pkg/vfs/s3fs.go @@ -29,7 +29,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/s3" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/util/pkg/hashing" ) diff --git a/util/pkg/vfs/sshfs.go b/util/pkg/vfs/sshfs.go index 91804641a9..a3efba6770 100644 --- a/util/pkg/vfs/sshfs.go +++ b/util/pkg/vfs/sshfs.go @@ -27,7 +27,7 @@ import ( "github.com/pkg/sftp" "golang.org/x/crypto/ssh" - "k8s.io/klog" + "k8s.io/klog/v2" ) type SSHPath struct { diff --git a/util/pkg/vfs/swiftfs.go b/util/pkg/vfs/swiftfs.go index 33a892c080..f10fbbf0e1 100644 --- a/util/pkg/vfs/swiftfs.go +++ b/util/pkg/vfs/swiftfs.go @@ -38,7 +38,7 @@ import ( "github.com/gophercloud/gophercloud/pagination" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/homedir" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/util/pkg/hashing" ) diff --git a/util/pkg/vfs/vaultcontext.go b/util/pkg/vfs/vaultcontext.go index 4ce837c16f..b8a08e0e1b 100644 --- a/util/pkg/vfs/vaultcontext.go +++ b/util/pkg/vfs/vaultcontext.go @@ -24,7 +24,7 @@ import ( "net/http" "os" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" diff --git a/util/pkg/vfs/vaultfs.go b/util/pkg/vfs/vaultfs.go index 7e9b9083c4..ec5011e60a 100644 --- a/util/pkg/vfs/vaultfs.go +++ b/util/pkg/vfs/vaultfs.go @@ -27,7 +27,7 @@ import ( "strings" vault "github.com/hashicorp/vault/api" - "k8s.io/klog" + "k8s.io/klog/v2" ) type VaultPath struct { diff --git a/util/pkg/vfs/vfs.go b/util/pkg/vfs/vfs.go index a4a8ba769a..b160d378a9 100644 --- a/util/pkg/vfs/vfs.go +++ b/util/pkg/vfs/vfs.go @@ -21,7 +21,7 @@ import ( "io" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/util/pkg/hashing" ) diff --git a/vendor/github.com/go-logr/logr/README.md b/vendor/github.com/go-logr/logr/README.md index 26296d0240..aca17f3827 100644 --- a/vendor/github.com/go-logr/logr/README.md +++ b/vendor/github.com/go-logr/logr/README.md @@ -1,9 +1,9 @@ # A more minimal logging API for Go -Before you consider this package, please read [this blog post by the inimitable -Dave Cheney](http://dave.cheney.net/2015/11/05/lets-talk-about-logging). I -really appreciate what he has to say, and it largely aligns with my own -experiences. Too many choices of levels means inconsistent logs. +Before you consider this package, please read [this blog post by the +inimitable Dave Cheney][warning-makes-no-sense]. I really appreciate what +he has to say, and it largely aligns with my own experiences. Too many +choices of levels means inconsistent logs. This package offers a purely abstract interface, based on these ideas but with a few twists. Code can depend on just this interface and have the actual @@ -31,6 +31,151 @@ may feel very similar, but the primary difference is the lack of semantics. Because verbosity is a numerical value, it's safe to assume that an app running with higher verbosity means more (and less important) logs will be generated. -This is a BETA grade API. I have implemented it for -[glog](https://godoc.org/github.com/golang/glog). Until there is a significant -2nd implementation, I don't really know how it will change. +This is a BETA grade API. + +There are implementations for the following logging libraries: + +- **github.com/google/glog**: [glogr](https://github.com/go-logr/glogr) +- **k8s.io/klog**: [klogr](https://git.k8s.io/klog/klogr) +- **go.uber.org/zap**: [zapr](https://github.com/go-logr/zapr) +- **log** (the Go standard library logger): + [stdr](https://github.com/go-logr/stdr) +- **github.com/sirupsen/logrus**: [logrusr](https://github.com/bombsimon/logrusr) + +# FAQ + +## Conceptual + +## Why structured logging? + +- **Structured logs are more easily queriable**: Since you've got + key-value pairs, it's much easier to query your structured logs for + particular values by filtering on the contents of a particular key -- + think searching request logs for error codes, Kubernetes reconcilers for + the name and namespace of the reconciled object, etc + +- **Structured logging makes it easier to have cross-referencable logs**: + Similarly to searchability, if you maintain conventions around your + keys, it becomes easy to gather all log lines related to a particular + concept. + +- **Structured logs allow better dimensions of filtering**: if you have + structure to your logs, you've got more precise control over how much + information is logged -- you might choose in a particular configuration + to log certain keys but not others, only log lines where a certain key + matches a certain value, etc, instead of just having v-levels and names + to key off of. + +- **Structured logs better represent structured data**: sometimes, the + data that you want to log is inherently structured (think tuple-link + objects). Structured logs allow you to preserve that structure when + outputting. + +## Why V-levels? + +**V-levels give operators an easy way to control the chattiness of log +operations**. V-levels provide a way for a given package to distinguish +the relative importance or verbosity of a given log message. Then, if +a particular logger or package is logging too many messages, the user +of the package can simply change the v-levels for that library. + +## Why not more named levels, like Warning? + +Read [Dave Cheney's post][warning-makes-no-sense]. Then read [Differences +from Dave's ideas](#differences-from-daves-ideas). + +## Why not allow format strings, too? + +**Format strings negate many of the benefits of structured logs**: + +- They're not easily searchable without resorting to fuzzy searching, + regular expressions, etc + +- They don't store structured data well, since contents are flattened into + a string + +- They're not cross-referencable + +- They don't compress easily, since the message is not constant + +(unless you turn positional parameters into key-value pairs with numerical +keys, at which point you've gotten key-value logging with meaningless +keys) + +## Practical + +## Why key-value pairs, and not a map? + +Key-value pairs are *much* easier to optimize, especially around +allocations. Zap (a structured logger that inspired logr's interface) has +[performance measurements](https://github.com/uber-go/zap#performance) +that show this quite nicely. + +While the interface ends up being a little less obvious, you get +potentially better performance, plus avoid making users type +`map[string]string{}` every time they want to log. + +## What if my V-levels differ between libraries? + +That's fine. Control your V-levels on a per-logger basis, and use the +`WithName` function to pass different loggers to different libraries. + +Generally, you should take care to ensure that you have relatively +consistent V-levels within a given logger, however, as this makes deciding +on what verbosity of logs to request easier. + +## But I *really* want to use a format string! + +That's not actually a question. Assuming your question is "how do +I convert my mental model of logging with format strings to logging with +constant messages": + +1. figure out what the error actually is, as you'd write in a TL;DR style, + and use that as a message + +2. For every place you'd write a format specifier, look to the word before + it, and add that as a key value pair + +For instance, consider the following examples (all taken from spots in the +Kubernetes codebase): + +- `klog.V(4).Infof("Client is returning errors: code %v, error %v", + responseCode, err)` becomes `logger.Error(err, "client returned an + error", "code", responseCode)` + +- `klog.V(4).Infof("Got a Retry-After %ds response for attempt %d to %v", + seconds, retries, url)` becomes `logger.V(4).Info("got a retry-after + response when requesting url", "attempt", retries, "after + seconds", seconds, "url", url)` + +If you *really* must use a format string, place it as a key value, and +call `fmt.Sprintf` yourself -- for instance, `log.Printf("unable to +reflect over type %T")` becomes `logger.Info("unable to reflect over +type", "type", fmt.Sprintf("%T"))`. In general though, the cases where +this is necessary should be few and far between. + +## How do I choose my V-levels? + +This is basically the only hard constraint: increase V-levels to denote +more verbose or more debug-y logs. + +Otherwise, you can start out with `0` as "you always want to see this", +`1` as "common logging that you might *possibly* want to turn off", and +`10` as "I would like to performance-test your log collection stack". + +Then gradually choose levels in between as you need them, working your way +down from 10 (for debug and trace style logs) and up from 1 (for chattier +info-type logs). + +## How do I choose my keys + +- make your keys human-readable +- constant keys are generally a good idea +- be consistent across your codebase +- keys should naturally match parts of the message string + +While key names are mostly unrestricted (and spaces are acceptable), +it's generally a good idea to stick to printable ascii characters, or at +least match the general character set of your log lines. + +[warning-makes-no-sense]: http://dave.cheney.net/2015/11/05/lets-talk-about-logging diff --git a/vendor/github.com/go-logr/logr/go.mod b/vendor/github.com/go-logr/logr/go.mod new file mode 100644 index 0000000000..591884e91f --- /dev/null +++ b/vendor/github.com/go-logr/logr/go.mod @@ -0,0 +1,3 @@ +module github.com/go-logr/logr + +go 1.14 diff --git a/vendor/github.com/go-logr/logr/logr.go b/vendor/github.com/go-logr/logr/logr.go index ad72e78869..e7d66dadae 100644 --- a/vendor/github.com/go-logr/logr/logr.go +++ b/vendor/github.com/go-logr/logr/logr.go @@ -1,3 +1,19 @@ +/* +Copyright 2019 The logr Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + // Package logr defines abstract interfaces for logging. Packages can depend on // these interfaces and callers can implement logging in whatever way is // appropriate. @@ -13,22 +29,22 @@ // // Usage // -// Logging is done using a Logger. Loggers can have name prefixes and named values -// attached, so that all log messages logged with that Logger have some base context -// associated. +// Logging is done using a Logger. Loggers can have name prefixes and named +// values attached, so that all log messages logged with that Logger have some +// base context associated. // -// The term "key" is used to refer to the name associated with a particular value, to -// disambiguate it from the general Logger name. +// The term "key" is used to refer to the name associated with a particular +// value, to disambiguate it from the general Logger name. // -// For instance, suppose we're trying to reconcile the state of an object, and we want -// to log that we've made some decision. +// For instance, suppose we're trying to reconcile the state of an object, and +// we want to log that we've made some decision. // -// With the traditional log package, we might write +// With the traditional log package, we might write: // log.Printf( // "decided to set field foo to value %q for object %s/%s", // targetValue, object.Namespace, object.Name) // -// With logr's structured logging, we'd write +// With logr's structured logging, we'd write: // // elsewhere in the file, set up the logger to log with the prefix of "reconcilers", // // and the named value target-type=Foo, for extra context. // log := mainLogger.WithName("reconcilers").WithValues("target-type", "Foo") @@ -36,72 +52,95 @@ // // later on... // log.Info("setting field foo on object", "value", targetValue, "object", object) // -// Depending on our logging implementation, we could then make logging decisions based on field values -// (like only logging such events for objects in a certain namespace), or copy the structured -// information into a structured log store. +// Depending on our logging implementation, we could then make logging decisions +// based on field values (like only logging such events for objects in a certain +// namespace), or copy the structured information into a structured log store. // -// For logging errors, Logger has a method called Error. Suppose we wanted to log an -// error while reconciling. With the traditional log package, we might write +// For logging errors, Logger has a method called Error. Suppose we wanted to +// log an error while reconciling. With the traditional log package, we might +// write: // log.Errorf("unable to reconcile object %s/%s: %v", object.Namespace, object.Name, err) // -// With logr, we'd instead write +// With logr, we'd instead write: // // assuming the above setup for log // log.Error(err, "unable to reconcile object", "object", object) // // This functions similarly to: // log.Info("unable to reconcile object", "error", err, "object", object) // -// However, it ensures that a standard key for the error value ("error") is used across all -// error logging. Furthermore, certain implementations may choose to attach additional -// information (such as stack traces) on calls to Error, so it's preferred to use Error -// to log errors. +// However, it ensures that a standard key for the error value ("error") is used +// across all error logging. Furthermore, certain implementations may choose to +// attach additional information (such as stack traces) on calls to Error, so +// it's preferred to use Error to log errors. // // Parts of a log line // // Each log message from a Logger has four types of context: // logger name, log verbosity, log message, and the named values. // -// The Logger name constists of a series of name "segments" added by successive calls to WithName. -// These name segments will be joined in some way by the underlying implementation. It is strongly -// reccomended that name segements contain simple identifiers (letters, digits, and hyphen), and do -// not contain characters that could muddle the log output or confuse the joining operation (e.g. -// whitespace, commas, periods, slashes, brackets, quotes, etc). +// The Logger name constists of a series of name "segments" added by successive +// calls to WithName. These name segments will be joined in some way by the +// underlying implementation. It is strongly reccomended that name segements +// contain simple identifiers (letters, digits, and hyphen), and do not contain +// characters that could muddle the log output or confuse the joining operation +// (e.g. whitespace, commas, periods, slashes, brackets, quotes, etc). // -// Log verbosity represents how little a log matters. Level zero, the default, matters most. -// Increasing levels matter less and less. Try to avoid lots of different verbosity levels, -// and instead provide useful keys, logger names, and log messages for users to filter on. -// It's illegal to pass a log level below zero. +// Log verbosity represents how little a log matters. Level zero, the default, +// matters most. Increasing levels matter less and less. Try to avoid lots of +// different verbosity levels, and instead provide useful keys, logger names, +// and log messages for users to filter on. It's illegal to pass a log level +// below zero. // -// The log message consists of a constant message attached to the the log line. This -// should generally be a simple description of what's occuring, and should never be a format string. +// The log message consists of a constant message attached to the the log line. +// This should generally be a simple description of what's occuring, and should +// never be a format string. // -// Variable information can then be attached using named values (key/value pairs). Keys are arbitrary -// strings, while values may be any Go value. +// Variable information can then be attached using named values (key/value +// pairs). Keys are arbitrary strings, while values may be any Go value. // // Key Naming Conventions // -// While users are generally free to use key names of their choice, it's generally best to avoid -// using the following keys, as they're frequently used by implementations: +// Keys are not strictly required to conform to any specification or regex, but +// it is recommended that they: +// * be human-readable and meaningful (not auto-generated or simple ordinals) +// * be constant (not dependent on input data) +// * contain only printable characters +// * not contain whitespace or punctuation +// +// These guidelines help ensure that log data is processed properly regardless +// of the log implementation. For example, log implementations will try to +// output JSON data or will store data for later database (e.g. SQL) queries. +// +// While users are generally free to use key names of their choice, it's +// generally best to avoid using the following keys, as they're frequently used +// by implementations: // -// - `"error"`: the underlying error value in the `Error` method. -// - `"stacktrace"`: the stack trace associated with a particular log line or error -// (often from the `Error` message). // - `"caller"`: the calling information (file/line) of a particular log line. -// - `"msg"`: the log message. +// - `"error"`: the underlying error value in the `Error` method. // - `"level"`: the log level. +// - `"logger"`: the name of the associated logger. +// - `"msg"`: the log message. +// - `"stacktrace"`: the stack trace associated with a particular log line or +// error (often from the `Error` message). // - `"ts"`: the timestamp for a log line. // -// Implementations are encouraged to make use of these keys to represent the above -// concepts, when neccessary (for example, in a pure-JSON output form, it would be -// necessary to represent at least message and timestamp as ordinary named values). +// Implementations are encouraged to make use of these keys to represent the +// above concepts, when neccessary (for example, in a pure-JSON output form, it +// would be necessary to represent at least message and timestamp as ordinary +// named values). package logr // TODO: consider adding back in format strings if they're really needed // TODO: consider other bits of zap/zapcore functionality like ObjectMarshaller (for arbitrary objects) // TODO: consider other bits of glog functionality like Flush, InfoDepth, OutputStats -// InfoLogger represents the ability to log non-error messages, at a particular verbosity. -type InfoLogger interface { +// Logger represents the ability to log messages, both errors and not. +type Logger interface { + // Enabled tests whether this Logger is enabled. For example, commandline + // flags might be used to set the logging verbosity and disable some info + // logs. + Enabled() bool + // Info logs a non-error message with the given key/value pairs as context. // // The msg argument should be used to add some constant description to @@ -110,19 +149,6 @@ type InfoLogger interface { // keys and arbitrary values. Info(msg string, keysAndValues ...interface{}) - // Enabled tests whether this InfoLogger is enabled. For example, - // commandline flags might be used to set the logging verbosity and disable - // some info logs. - Enabled() bool -} - -// Logger represents the ability to log messages, both errors and not. -type Logger interface { - // All Loggers implement InfoLogger. Calling InfoLogger methods directly on - // a Logger value is equivalent to calling them on a V(0) InfoLogger. For - // example, logger.Info() produces the same result as logger.V(0).Info. - InfoLogger - // Error logs an error, with the given message and key/value pairs as context. // It functions similarly to calling Info with the "error" named value, but may // have unique behavior, and should be preferred for logging errors (see the @@ -133,10 +159,11 @@ type Logger interface { // triggered this log line, if present. Error(err error, msg string, keysAndValues ...interface{}) - // V returns an InfoLogger value for a specific verbosity level. A higher - // verbosity level means a log message is less important. It's illegal to - // pass a log level less than zero. - V(level int) InfoLogger + // V returns an Logger value for a specific verbosity level, relative to + // this Logger. In other words, V values are additive. V higher verbosity + // level means a log message is less important. It's illegal to pass a log + // level less than zero. + V(level int) Logger // WithValues adds some key-value pairs of context to a logger. // See Info for documentation on how key/value pairs work. @@ -149,3 +176,7 @@ type Logger interface { // (see the package documentation for more information). WithName(name string) Logger } + +// InfoLogger provides compatibility with code that relies on the v0.1.0 interface +// Deprecated: use Logger instead. This will be removed in a future release. +type InfoLogger = Logger diff --git a/vendor/k8s.io/klog/v2/README.md b/vendor/k8s.io/klog/v2/README.md index eda33d73d0..2f9f6f0d82 100644 --- a/vendor/k8s.io/klog/v2/README.md +++ b/vendor/k8s.io/klog/v2/README.md @@ -36,7 +36,7 @@ How to use klog **NOTE**: please use the newer go versions that support semantic import versioning in modules, ideally go 1.11.4 or greater. ### Coexisting with glog -This package can be used side by side with glog. [This example](examples/coexist_glog/coexist_glog.go) shows how to initialize and syncronize flags from the global `flag.CommandLine` FlagSet. In addition, the example makes use of stderr as combined output by setting `alsologtostderr` (or `logtostderr`) to `true`. +This package can be used side by side with glog. [This example](examples/coexist_glog/coexist_glog.go) shows how to initialize and synchronize flags from the global `flag.CommandLine` FlagSet. In addition, the example makes use of stderr as combined output by setting `alsologtostderr` (or `logtostderr`) to `true`. ## Community, discussion, contribution, and support @@ -44,7 +44,7 @@ Learn how to engage with the Kubernetes community on the [community page](http:/ You can reach the maintainers of this project at: -- [Slack](https://kubernetes.slack.com/messages/sig-architecture) +- [Slack](https://kubernetes.slack.com/messages/klog) - [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-architecture) ### Code of conduct diff --git a/vendor/k8s.io/klog/v2/go.mod b/vendor/k8s.io/klog/v2/go.mod index f50b258149..e396e31c06 100644 --- a/vendor/k8s.io/klog/v2/go.mod +++ b/vendor/k8s.io/klog/v2/go.mod @@ -2,4 +2,4 @@ module k8s.io/klog/v2 go 1.13 -require github.com/go-logr/logr v0.1.0 +require github.com/go-logr/logr v0.2.0 diff --git a/vendor/k8s.io/klog/v2/go.sum b/vendor/k8s.io/klog/v2/go.sum index fb64d277a7..8dfa785428 100644 --- a/vendor/k8s.io/klog/v2/go.sum +++ b/vendor/k8s.io/klog/v2/go.sum @@ -1,2 +1,2 @@ -github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg= -github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/logr v0.2.0 h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY= +github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= diff --git a/vendor/k8s.io/klog/v2/klog.go b/vendor/k8s.io/klog/v2/klog.go index c334b14b2d..49f1f2dd2d 100644 --- a/vendor/k8s.io/klog/v2/klog.go +++ b/vendor/k8s.io/klog/v2/klog.go @@ -687,7 +687,7 @@ func (buf *buffer) someDigits(i, d int) int { return copy(buf.tmp[i:], buf.tmp[j:]) } -func (l *loggingT) println(s severity, logr logr.InfoLogger, args ...interface{}) { +func (l *loggingT) println(s severity, logr logr.Logger, args ...interface{}) { buf, file, line := l.header(s, 0) // if logr is set, we clear the generated header as we rely on the backing // logr implementation to print headers @@ -699,11 +699,11 @@ func (l *loggingT) println(s severity, logr logr.InfoLogger, args ...interface{} l.output(s, logr, buf, file, line, false) } -func (l *loggingT) print(s severity, logr logr.InfoLogger, args ...interface{}) { +func (l *loggingT) print(s severity, logr logr.Logger, args ...interface{}) { l.printDepth(s, logr, 1, args...) } -func (l *loggingT) printDepth(s severity, logr logr.InfoLogger, depth int, args ...interface{}) { +func (l *loggingT) printDepth(s severity, logr logr.Logger, depth int, args ...interface{}) { buf, file, line := l.header(s, depth) // if logr is set, we clear the generated header as we rely on the backing // logr implementation to print headers @@ -718,7 +718,7 @@ func (l *loggingT) printDepth(s severity, logr logr.InfoLogger, depth int, args l.output(s, logr, buf, file, line, false) } -func (l *loggingT) printf(s severity, logr logr.InfoLogger, format string, args ...interface{}) { +func (l *loggingT) printf(s severity, logr logr.Logger, format string, args ...interface{}) { buf, file, line := l.header(s, 0) // if logr is set, we clear the generated header as we rely on the backing // logr implementation to print headers @@ -736,7 +736,7 @@ func (l *loggingT) printf(s severity, logr logr.InfoLogger, format string, args // printWithFileLine behaves like print but uses the provided file and line number. If // alsoLogToStderr is true, the log message always appears on standard error; it // will also appear in the log file unless --logtostderr is set. -func (l *loggingT) printWithFileLine(s severity, logr logr.InfoLogger, file string, line int, alsoToStderr bool, args ...interface{}) { +func (l *loggingT) printWithFileLine(s severity, logr logr.Logger, file string, line int, alsoToStderr bool, args ...interface{}) { buf := l.formatHeader(s, file, line) // if logr is set, we clear the generated header as we rely on the backing // logr implementation to print headers @@ -751,17 +751,27 @@ func (l *loggingT) printWithFileLine(s severity, logr logr.InfoLogger, file stri l.output(s, logr, buf, file, line, alsoToStderr) } -// printS if loggr is specified, no need to output with logging module. If -// err arguments is specified, will call logr.Error, or output to errorLog severity -func (l *loggingT) printS(err error, loggr logr.Logger, msg string, keysAndValues ...interface{}) { +// if loggr is specified, will call loggr.Error, otherwise output with logging module. +func (l *loggingT) errorS(err error, loggr logr.Logger, msg string, keysAndValues ...interface{}) { if loggr != nil { - if err != nil { - loggr.Error(err, msg, keysAndValues) - } else { - loggr.Info(msg, keysAndValues) - } + loggr.Error(err, msg, keysAndValues) return } + l.printS(err, msg, keysAndValues...) +} + +// if loggr is specified, will call loggr.Info, otherwise output with logging module. +func (l *loggingT) infoS(loggr logr.Logger, msg string, keysAndValues ...interface{}) { + if loggr != nil { + loggr.Info(msg, keysAndValues) + return + } + l.printS(nil, msg, keysAndValues...) +} + +// printS is called from infoS and errorS if loggr is not specified. +// if err arguments is specified, will output to errorLog severity +func (l *loggingT) printS(err error, msg string, keysAndValues ...interface{}) { b := &bytes.Buffer{} b.WriteString(fmt.Sprintf("%q", msg)) if err != nil { @@ -775,7 +785,7 @@ func (l *loggingT) printS(err error, loggr logr.Logger, msg string, keysAndValue } else { s = errorLog } - l.printDepth(s, logging.logr, 1, b) + l.printDepth(s, logging.logr, 2, b) } const missingValue = "(MISSING)" @@ -790,10 +800,16 @@ func kvListFormat(b *bytes.Buffer, keysAndValues ...interface{}) { v = missingValue } b.WriteByte(' ') - if _, ok := v.(fmt.Stringer); ok { + + switch v.(type) { + case string, error: b.WriteString(fmt.Sprintf("%s=%q", k, v)) - } else { - b.WriteString(fmt.Sprintf("%s=%#v", k, v)) + default: + if _, ok := v.(fmt.Stringer); ok { + b.WriteString(fmt.Sprintf("%s=%q", k, v)) + } else { + b.WriteString(fmt.Sprintf("%s=%+v", k, v)) + } } } } @@ -853,8 +869,16 @@ func SetOutputBySeverity(name string, w io.Writer) { logging.file[sev] = rb } +// LogToStderr sets whether to log exclusively to stderr, bypassing outputs +func LogToStderr(stderr bool) { + logging.mu.Lock() + defer logging.mu.Unlock() + + logging.toStderr = stderr +} + // output writes the data to the log files and releases the buffer. -func (l *loggingT) output(s severity, log logr.InfoLogger, buf *buffer, file string, line int, alsoToStderr bool) { +func (l *loggingT) output(s severity, log logr.Logger, buf *buffer, file string, line int, alsoToStderr bool) { l.mu.Lock() if l.traceLocation.isSet() { if l.traceLocation.match(file, line) { @@ -1207,7 +1231,7 @@ func (l *loggingT) setV(pc uintptr) Level { // See the documentation of V for more information. type Verbose struct { enabled bool - logr logr.InfoLogger + logr logr.Logger } func newVerbose(level Level, b bool) Verbose { @@ -1228,9 +1252,10 @@ func newVerbose(level Level, b bool) Verbose { // not evaluate its arguments. // // Whether an individual call to V generates a log record depends on the setting of -// the -v and --vmodule flags; both are off by default. If the level in the call to -// V is at least the value of -v, or of -vmodule for the source file containing the -// call, the V call will log. +// the -v and -vmodule flags; both are off by default. The V call will log if its level +// is less than or equal to the value of the -v flag, or alternatively if its level is +// less than or equal to the value of the -vmodule pattern matching the source file +// containing the call. func V(level Level) Verbose { // This function tries hard to be cheap unless there's work to do. // The fast path is two atomic loads and compares. @@ -1295,11 +1320,22 @@ func (v Verbose) Infof(format string, args ...interface{}) { // See the documentation of V for usage. func (v Verbose) InfoS(msg string, keysAndValues ...interface{}) { if v.enabled { - if v.logr != nil { - v.logr.Info(msg, keysAndValues) - return - } - logging.printS(nil, nil, msg, keysAndValues...) + logging.infoS(v.logr, msg, keysAndValues...) + } +} + +// Deprecated: Use ErrorS instead. +func (v Verbose) Error(err error, msg string, args ...interface{}) { + if v.enabled { + logging.errorS(err, v.logr, msg, args...) + } +} + +// ErrorS is equivalent to the global Error function, guarded by the value of v. +// See the documentation of V for usage. +func (v Verbose) ErrorS(err error, msg string, keysAndValues ...interface{}) { + if v.enabled { + logging.errorS(err, v.logr, msg, keysAndValues...) } } @@ -1336,7 +1372,7 @@ func Infof(format string, args ...interface{}) { // output: // >> I1025 00:15:15.525108 1 controller_utils.go:116] "Pod status updated" pod="kubedns" status="ready" func InfoS(msg string, keysAndValues ...interface{}) { - logging.printS(nil, logging.logr, msg, keysAndValues...) + logging.infoS(logging.logr, msg, keysAndValues...) } // Warning logs to the WARNING and INFO logs. @@ -1397,7 +1433,7 @@ func Errorf(format string, args ...interface{}) { // output: // >> E1025 00:15:15.525108 1 controller_utils.go:114] "Failed to update pod status" err="timeout" func ErrorS(err error, msg string, keysAndValues ...interface{}) { - logging.printS(err, logging.logr, msg, keysAndValues...) + logging.errorS(err, logging.logr, msg, keysAndValues...) } // Fatal logs to the FATAL, ERROR, WARNING, and INFO logs, diff --git a/vendor/k8s.io/klog/v2/klog_file.go b/vendor/k8s.io/klog/v2/klog_file.go index 458456a4a5..de830d9221 100644 --- a/vendor/k8s.io/klog/v2/klog_file.go +++ b/vendor/k8s.io/klog/v2/klog_file.go @@ -44,43 +44,49 @@ func createLogDirs() { } var ( - pid = os.Getpid() - program = filepath.Base(os.Args[0]) - host = "unknownhost" - userName = "unknownuser" + pid = os.Getpid() + program = filepath.Base(os.Args[0]) + host = "unknownhost" + userName = "unknownuser" + userNameOnce sync.Once ) func init() { - h, err := os.Hostname() - if err == nil { + if h, err := os.Hostname(); err == nil { host = shortHostname(h) } +} - // On Windows, the Go 'user' package requires netapi32.dll. - // This affects Windows Nano Server: - // https://github.com/golang/go/issues/21867 - // Fallback to using environment variables. - if runtime.GOOS == "windows" { - u := os.Getenv("USERNAME") - if len(u) == 0 { - return - } - // Sanitize the USERNAME since it may contain filepath separators. - u = strings.Replace(u, `\`, "_", -1) +func getUserName() string { + userNameOnce.Do(func() { + // On Windows, the Go 'user' package requires netapi32.dll. + // This affects Windows Nano Server: + // https://github.com/golang/go/issues/21867 + // Fallback to using environment variables. + if runtime.GOOS == "windows" { + u := os.Getenv("USERNAME") + if len(u) == 0 { + return + } + // Sanitize the USERNAME since it may contain filepath separators. + u = strings.Replace(u, `\`, "_", -1) - // user.Current().Username normally produces something like 'USERDOMAIN\USERNAME' - d := os.Getenv("USERDOMAIN") - if len(d) != 0 { - userName = d + "_" + u + // user.Current().Username normally produces something like 'USERDOMAIN\USERNAME' + d := os.Getenv("USERDOMAIN") + if len(d) != 0 { + userName = d + "_" + u + } else { + userName = u + } } else { - userName = u + current, err := user.Current() + if err == nil { + userName = current.Username + } } - } else { - current, err := user.Current() - if err == nil { - userName = current.Username - } - } + }) + + return userName } // shortHostname returns its argument, truncating at the first period. @@ -98,7 +104,7 @@ func logName(tag string, t time.Time) (name, link string) { name = fmt.Sprintf("%s.%s.%s.log.%s.%04d%02d%02d-%02d%02d%02d.%d", program, host, - userName, + getUserName(), tag, t.Year(), t.Month(), diff --git a/vendor/modules.txt b/vendor/modules.txt index 691fa9a641..63f971765a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -249,7 +249,7 @@ github.com/go-bindata/go-bindata/go-bindata # github.com/go-ini/ini v1.51.0 ## explicit github.com/go-ini/ini -# github.com/go-logr/logr v0.1.0 +# github.com/go-logr/logr v0.2.1-0.20200730175230-ee2de8da5be6 ## explicit github.com/go-logr/logr # github.com/go-openapi/jsonpointer v0.19.3 @@ -1222,7 +1222,7 @@ k8s.io/helm/pkg/strvals ## explicit k8s.io/klog k8s.io/klog/klogr -# k8s.io/klog/v2 v2.0.0 +# k8s.io/klog/v2 v2.3.0 ## explicit k8s.io/klog/v2 # k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6