diff --git a/bootstrap/kubeadm/main.go b/bootstrap/kubeadm/main.go index 3c3ada5230a6..f1b7d1594756 100644 --- a/bootstrap/kubeadm/main.go +++ b/bootstrap/kubeadm/main.go @@ -29,8 +29,8 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" - "k8s.io/klog" - "k8s.io/klog/klogr" + "k8s.io/klog/v2" + "k8s.io/klog/v2/klogr" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4" kubeadmbootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4" kubeadmbootstrapcontrollers "sigs.k8s.io/cluster-api/bootstrap/kubeadm/controllers" diff --git a/controllers/machine_controller.go b/controllers/machine_controller.go index 370c018b4f7a..bfbfc04d5ea5 100644 --- a/controllers/machine_controller.go +++ b/controllers/machine_controller.go @@ -31,7 +31,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/record" - "k8s.io/klog" + "k8s.io/klog/v2" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4" "sigs.k8s.io/cluster-api/controllers/external" "sigs.k8s.io/cluster-api/controllers/noderefutil" diff --git a/controllers/mdutil/util_test.go b/controllers/mdutil/util_test.go index ebb8aed3603a..ab0f74923345 100644 --- a/controllers/mdutil/util_test.go +++ b/controllers/mdutil/util_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apiserver/pkg/storage/names" - "k8s.io/klog/klogr" + "k8s.io/klog/v2/klogr" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4" ) diff --git a/controllers/remote/cluster_cache_healthcheck_test.go b/controllers/remote/cluster_cache_healthcheck_test.go index 37212e2b5b24..24975b38ff08 100644 --- a/controllers/remote/cluster_cache_healthcheck_test.go +++ b/controllers/remote/cluster_cache_healthcheck_test.go @@ -28,7 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" - "k8s.io/klog/klogr" + "k8s.io/klog/v2/klogr" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4" "sigs.k8s.io/cluster-api/util" "sigs.k8s.io/cluster-api/util/conditions" diff --git a/controlplane/kubeadm/controllers/controller_test.go b/controlplane/kubeadm/controllers/controller_test.go index cc8e5e100f27..31521f7dafb7 100644 --- a/controlplane/kubeadm/controllers/controller_test.go +++ b/controlplane/kubeadm/controllers/controller_test.go @@ -36,7 +36,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/record" - "k8s.io/klog/klogr" + "k8s.io/klog/v2/klogr" "k8s.io/utils/pointer" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4" bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4" diff --git a/controlplane/kubeadm/controllers/status_test.go b/controlplane/kubeadm/controllers/status_test.go index 3f7c0e73a8c7..8e515eb5923f 100644 --- a/controlplane/kubeadm/controllers/status_test.go +++ b/controlplane/kubeadm/controllers/status_test.go @@ -25,7 +25,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/record" - "k8s.io/klog/klogr" + "k8s.io/klog/v2/klogr" "k8s.io/utils/pointer" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4" controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1alpha4" diff --git a/controlplane/kubeadm/internal/control_plane.go b/controlplane/kubeadm/internal/control_plane.go index 9341a6e9ceaa..2d405f2f20c0 100644 --- a/controlplane/kubeadm/internal/control_plane.go +++ b/controlplane/kubeadm/internal/control_plane.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" kerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apiserver/pkg/storage/names" - "k8s.io/klog/klogr" + "k8s.io/klog/v2/klogr" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4" bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4" "sigs.k8s.io/cluster-api/controllers/external" diff --git a/controlplane/kubeadm/main.go b/controlplane/kubeadm/main.go index a8af13a8f032..178ec063e1a6 100644 --- a/controlplane/kubeadm/main.go +++ b/controlplane/kubeadm/main.go @@ -29,8 +29,8 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" - "k8s.io/klog" - "k8s.io/klog/klogr" + "k8s.io/klog/v2" + "k8s.io/klog/v2/klogr" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4" kubeadmbootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4" "sigs.k8s.io/cluster-api/controllers/remote" diff --git a/docs/book/src/developer/providers/v1alpha3-to-v1alpha4.md b/docs/book/src/developer/providers/v1alpha3-to-v1alpha4.md index 9e234fe5949a..16c1e233024f 100644 --- a/docs/book/src/developer/providers/v1alpha3-to-v1alpha4.md +++ b/docs/book/src/developer/providers/v1alpha3-to-v1alpha4.md @@ -16,6 +16,16 @@ - Find and replace the `kube-rbac-proxy` version (usually the image is `gcr.io/kubebuilder/kube-rbac-proxy`) and update it to `v0.8.0`. +## Klog version + +- The klog package used has been upgraded to v2.5.x. It is recommended that + all providers also switch to using v2. + + - Change `import k8s.io/klog` to `import k8s.io/klog/v2` + - Change `import k8s.io/klog/klogr` to `import k8s.io/klog/v2/klogr` + - Update `go.mod` to `k8s.io/klog/v2 v2.5.0` + - Run `go mod tidy` to ensure all dependencies are updated. + ## The controllers.DeleteNodeAnnotation constant has been removed - This annotation `cluster.k8s.io/delete-machine` was originally deprecated a while ago when we moved our types under the `x-k8s.io` domain. diff --git a/go.mod b/go.mod index 2c57ae016294..71b0a791c9d3 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( k8s.io/client-go v0.21.0-beta.0 k8s.io/cluster-bootstrap 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/controller-runtime v0.8.2-0.20210302195120-85527dfb5348 diff --git a/main.go b/main.go index 1fd8edea0590..14eef430f08d 100644 --- a/main.go +++ b/main.go @@ -30,8 +30,8 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" - "k8s.io/klog" - "k8s.io/klog/klogr" + "k8s.io/klog/v2" + "k8s.io/klog/v2/klogr" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4" "sigs.k8s.io/cluster-api/controllers" "sigs.k8s.io/cluster-api/controllers/remote" diff --git a/test/helpers/envtest.go b/test/helpers/envtest.go index e839d1a55eb8..28f441b23eb8 100644 --- a/test/helpers/envtest.go +++ b/test/helpers/envtest.go @@ -38,8 +38,8 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" - "k8s.io/klog" - "k8s.io/klog/klogr" + "k8s.io/klog/v2" + "k8s.io/klog/v2/klogr" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4" bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4" "sigs.k8s.io/cluster-api/cmd/clusterctl/log" diff --git a/test/infrastructure/docker/go.mod b/test/infrastructure/docker/go.mod index 190a94afe45b..5d03e3c44734 100644 --- a/test/infrastructure/docker/go.mod +++ b/test/infrastructure/docker/go.mod @@ -10,7 +10,7 @@ require ( k8s.io/api v0.21.0-beta.0 k8s.io/apimachinery v0.21.0-beta.0 k8s.io/client-go v0.21.0-beta.0 - k8s.io/klog v1.0.0 + k8s.io/klog/v2 v2.5.0 k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 sigs.k8s.io/cluster-api v0.3.3 sigs.k8s.io/controller-runtime v0.8.2-0.20210302195120-85527dfb5348 diff --git a/test/infrastructure/docker/main.go b/test/infrastructure/docker/main.go index b4653185710a..7507fd894a7e 100644 --- a/test/infrastructure/docker/main.go +++ b/test/infrastructure/docker/main.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/scheme" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" - "k8s.io/klog" - "k8s.io/klog/klogr" + "k8s.io/klog/v2" + "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/feature" diff --git a/util/failuredomains/failure_domains.go b/util/failuredomains/failure_domains.go index 46b5ad412927..ee3ae209a29b 100644 --- a/util/failuredomains/failure_domains.go +++ b/util/failuredomains/failure_domains.go @@ -17,7 +17,7 @@ limitations under the License. package failuredomains import ( - "k8s.io/klog/klogr" + "k8s.io/klog/v2/klogr" "sort" "k8s.io/utils/pointer"