Skip to content

Update klog dependency to v2 #1231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 17, 2021
Merged

Update klog dependency to v2 #1231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fd67de
Update klog dependency to v2
stmcginnis Mar 11, 2021
e28a93b
Bump CAPI release to nightly_master_20210315
stmcginnis Mar 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)

# Deploy CAPI
# Using cluster-api nightly build until 0.4.x is released.
curl --retry $(CURL_RETRIES) -sSL https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_master_20210310/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
curl --retry $(CURL_RETRIES) -sSL https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_master_20210315/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -

# Deploy CAPZ
kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=capz
Expand Down
2 changes: 1 addition & 1 deletion Tiltfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ settings = {
"deploy_cert_manager": True,
"preload_images_for_kind": True,
"kind_cluster_name": "capz",
"capi_version": "nightly_master_20210310",
"capi_version": "nightly_master_20210315",
"cert_manager_version": "v1.1.0",
"kubernetes_version": "v1.19.7",
"aks_kubernetes_version": "v1.18.8"
Expand Down
2 changes: 1 addition & 1 deletion azure/scope/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/Azure/go-autorest/autorest/to"
"github.com/go-logr/logr"
"github.com/pkg/errors"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
"k8s.io/utils/net"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
"sigs.k8s.io/cluster-api/util/conditions"
Expand Down
2 changes: 1 addition & 1 deletion azure/scope/machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
"sigs.k8s.io/cluster-api/controllers/noderefutil"
capierrors "sigs.k8s.io/cluster-api/errors"
Expand Down
2 changes: 1 addition & 1 deletion azure/scope/machinepool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
"k8s.io/utils/pointer"
"sigs.k8s.io/cluster-api/controllers/noderefutil"
capierrors "sigs.k8s.io/cluster-api/errors"
Expand Down
2 changes: 1 addition & 1 deletion azure/scope/managedcontrolplane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/Azure/go-autorest/autorest"
"github.com/go-logr/logr"
"github.com/pkg/errors"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
expv1 "sigs.k8s.io/cluster-api/exp/api/v1alpha4"
"sigs.k8s.io/cluster-api/util/patch"
Expand Down
2 changes: 1 addition & 1 deletion azure/services/agentpools/agentpools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-02-01/containerservice"
"github.com/google/go-cmp/cmp"
"github.com/pkg/errors"
"k8s.io/klog"
"k8s.io/klog/v2"

"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
Expand Down
2 changes: 1 addition & 1 deletion azure/services/availabilitysets/availabilitysets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus"
gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock"

"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/availabilitysets/mock_availabilitysets"
)

Expand Down
2 changes: 1 addition & 1 deletion azure/services/bastionhosts/bastionhosts_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (

network "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
)

Expand Down
2 changes: 1 addition & 1 deletion azure/services/disks/disks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
. "github.com/onsi/gomega"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

Expand Down
2 changes: 1 addition & 1 deletion azure/services/groups/groups_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/Azure/go-autorest/autorest"
"github.com/golang/mock/gomock"
. "github.com/onsi/gomega"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha4"
"sigs.k8s.io/cluster-api-provider-azure/azure"
Expand Down
2 changes: 1 addition & 1 deletion azure/services/inboundnatrules/inboundnatrules_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/Azure/go-autorest/autorest/to"
"github.com/golang/mock/gomock"
. "github.com/onsi/gomega"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
"k8s.io/utils/pointer"

"sigs.k8s.io/cluster-api-provider-azure/azure"
Expand Down
2 changes: 1 addition & 1 deletion azure/services/loadbalancers/loadbalancers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/Azure/go-autorest/autorest/to"
"github.com/golang/mock/gomock"
. "github.com/onsi/gomega"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha4"
"sigs.k8s.io/cluster-api-provider-azure/azure"
Expand Down
2 changes: 1 addition & 1 deletion azure/services/managedclusters/managedclusters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-02-01/containerservice"
"github.com/pkg/errors"
"k8s.io/klog"
"k8s.io/klog/v2"

"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
Expand Down
2 changes: 1 addition & 1 deletion azure/services/networkinterfaces/networkinterfaces_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"github.com/golang/mock/gomock"
"github.com/google/go-cmp/cmp"
. "github.com/onsi/gomega"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/networkinterfaces/mock_networkinterfaces"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus"
)
Expand Down
2 changes: 1 addition & 1 deletion azure/services/privatedns/privatedns_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
. "github.com/onsi/gomega"
"sigs.k8s.io/cluster-api-provider-azure/azure"

"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
)

func TestReconcilePrivateDNS(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion azure/services/publicips/publicips_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (

network "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
)

Expand Down
2 changes: 1 addition & 1 deletion azure/services/roleassignments/roleassignments_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/golang/mock/gomock"
. "github.com/onsi/gomega"

"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"

"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/roleassignments/mock_roleassignments"
Expand Down
2 changes: 1 addition & 1 deletion azure/services/routetables/routetables_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/golang/mock/gomock"
. "github.com/onsi/gomega"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha4"
Expand Down
2 changes: 1 addition & 1 deletion azure/services/scalesets/scalesets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
clusterv1exp "sigs.k8s.io/cluster-api/exp/api/v1alpha4"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
Expand Down
2 changes: 1 addition & 1 deletion azure/services/securitygroups/securitygroups_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/Azure/go-autorest/autorest/to"
"github.com/golang/mock/gomock"
. "github.com/onsi/gomega"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha4"
"sigs.k8s.io/cluster-api-provider-azure/azure"
Expand Down
2 changes: 1 addition & 1 deletion azure/services/subnets/subnets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock"

. "github.com/onsi/gomega"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/subnets/mock_subnets"

Expand Down
2 changes: 1 addition & 1 deletion azure/services/tags/tags_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/Azure/go-autorest/autorest/to"
"github.com/golang/mock/gomock"
. "github.com/onsi/gomega"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"

"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/tags/mock_tags"
Expand Down
2 changes: 1 addition & 1 deletion azure/services/virtualmachines/virtualmachines_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/golang/mock/gomock"
. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha4"
"sigs.k8s.io/cluster-api-provider-azure/azure"
Expand Down
2 changes: 1 addition & 1 deletion azure/services/virtualnetworks/virtualnetworks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/Azure/go-autorest/autorest/to"
"github.com/golang/mock/gomock"
. "github.com/onsi/gomega"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha4"
"sigs.k8s.io/cluster-api-provider-azure/azure"
Expand Down
2 changes: 1 addition & 1 deletion azure/services/vmextensions/vmextensions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

"github.com/golang/mock/gomock"
. "github.com/onsi/gomega"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
"sigs.k8s.io/cluster-api-provider-azure/azure"
gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock"
)
Expand Down
2 changes: 1 addition & 1 deletion azure/services/vmssextensions/vmssextensions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

"github.com/golang/mock/gomock"
. "github.com/onsi/gomega"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
"sigs.k8s.io/cluster-api-provider-azure/azure"
gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock"
)
Expand Down
2 changes: 1 addition & 1 deletion controllers/azurejson_machine_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"k8s.io/apimachinery/pkg/types"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/tools/record"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
clusterexpv1 "sigs.k8s.io/cluster-api/exp/api/v1alpha4"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
2 changes: 1 addition & 1 deletion controllers/azurejson_machinepool_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/record"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
clusterexpv1 "sigs.k8s.io/cluster-api/exp/api/v1alpha4"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
2 changes: 1 addition & 1 deletion controllers/azurejson_machinetemplate_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/record"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha4"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
Expand Down
2 changes: 1 addition & 1 deletion controllers/azuremachine_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ require (
k8s.io/apimachinery v0.21.0-beta.0
k8s.io/client-go v0.21.0-beta.0
k8s.io/component-base v0.21.0-beta.0
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.5.0
k8s.io/kubectl v0.21.0-beta.0
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009
sigs.k8s.io/cluster-api v0.3.11-0.20210309152500-ef7a51b6d725
Expand Down
2 changes: 1 addition & 1 deletion internal/test/env/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (

utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/rest"
"k8s.io/klog"
"k8s.io/klog/v2"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/envtest"
Expand Down
4 changes: 2 additions & 2 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
cgrecord "k8s.io/client-go/tools/record"
"k8s.io/klog"
"k8s.io/klog/klogr"
"k8s.io/klog/v2"
"k8s.io/klog/v2/klogr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
clusterv1exp "sigs.k8s.io/cluster-api/exp/api/v1alpha4"
capifeature "sigs.k8s.io/cluster-api/feature"
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/config/azure-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ providers:
type: CoreProvider
versions:
- name: v0.4.0
value: https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_master_20210310/core-components.yaml
value: https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_master_20210315/core-components.yaml
type: url
files:
- sourcePath: "../data/shared/v1alpha4/metadata.yaml"
Expand All @@ -22,7 +22,7 @@ providers:
type: BootstrapProvider
versions:
- name: v0.4.0
value: https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_master_20210310/bootstrap-components.yaml
value: https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_master_20210315/bootstrap-components.yaml
type: url
files:
- sourcePath: "../data/shared/v1alpha4/metadata.yaml"
Expand All @@ -35,7 +35,7 @@ providers:
type: ControlPlaneProvider
versions:
- name: v0.4.0
value: https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_master_20210310/control-plane-components.yaml
value: https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_master_20210315/control-plane-components.yaml
type: url
files:
- sourcePath: "../data/shared/v1alpha4/metadata.yaml"
Expand Down