diff --git a/bootstrap/kubeadm/main.go b/bootstrap/kubeadm/main.go index f3d8c625f4e5..fca4f1870cce 100644 --- a/bootstrap/kubeadm/main.go +++ b/bootstrap/kubeadm/main.go @@ -37,6 +37,7 @@ import ( logsv1 "k8s.io/component-base/logs/api/v1" _ "k8s.io/component-base/logs/json/register" "k8s.io/klog/v2" + "k8s.io/utils/ptr" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" @@ -228,7 +229,7 @@ func main() { ctrlOptions := ctrl.Options{ Controller: config.Controller{ - UsePriorityQueue: feature.Gates.Enabled(feature.PriorityQueue), + UsePriorityQueue: ptr.To[bool](feature.Gates.Enabled(feature.PriorityQueue)), }, Scheme: scheme, LeaderElection: enableLeaderElection, diff --git a/controlplane/kubeadm/main.go b/controlplane/kubeadm/main.go index eae1eb5f8411..8a9197439c7b 100644 --- a/controlplane/kubeadm/main.go +++ b/controlplane/kubeadm/main.go @@ -41,6 +41,7 @@ import ( logsv1 "k8s.io/component-base/logs/api/v1" _ "k8s.io/component-base/logs/json/register" "k8s.io/klog/v2" + "k8s.io/utils/ptr" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" @@ -254,7 +255,7 @@ func main() { ctrlOptions := ctrl.Options{ Controller: config.Controller{ - UsePriorityQueue: feature.Gates.Enabled(feature.PriorityQueue), + UsePriorityQueue: ptr.To[bool](feature.Gates.Enabled(feature.PriorityQueue)), }, Scheme: scheme, LeaderElection: enableLeaderElection, diff --git a/internal/test/envtest/environment.go b/internal/test/envtest/environment.go index 53f5e2a55ef4..2eebbc7f5fcc 100644 --- a/internal/test/envtest/environment.go +++ b/internal/test/envtest/environment.go @@ -44,6 +44,7 @@ import ( "k8s.io/component-base/logs" logsv1 "k8s.io/component-base/logs/api/v1" "k8s.io/klog/v2" + "k8s.io/utils/ptr" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/config" @@ -289,7 +290,7 @@ func newEnvironment(uncachedObjs ...client.Object) *Environment { options := manager.Options{ Controller: config.Controller{ - UsePriorityQueue: feature.Gates.Enabled(feature.PriorityQueue), + UsePriorityQueue: ptr.To[bool](feature.Gates.Enabled(feature.PriorityQueue)), }, Scheme: scheme.Scheme, Metrics: metricsserver.Options{ diff --git a/main.go b/main.go index 06facf9ce1f7..38620d14a208 100644 --- a/main.go +++ b/main.go @@ -42,6 +42,7 @@ import ( logsv1 "k8s.io/component-base/logs/api/v1" _ "k8s.io/component-base/logs/json/register" "k8s.io/klog/v2" + "k8s.io/utils/ptr" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" @@ -334,7 +335,7 @@ func main() { ctrlOptions := ctrl.Options{ Controller: config.Controller{ - UsePriorityQueue: feature.Gates.Enabled(feature.PriorityQueue), + UsePriorityQueue: ptr.To[bool](feature.Gates.Enabled(feature.PriorityQueue)), }, Scheme: scheme, LeaderElection: enableLeaderElection, diff --git a/test/extension/main.go b/test/extension/main.go index 8efc802b3a09..48310782e47f 100644 --- a/test/extension/main.go +++ b/test/extension/main.go @@ -37,7 +37,7 @@ import ( "k8s.io/component-base/logs" logsv1 "k8s.io/component-base/logs/api/v1" _ "k8s.io/component-base/logs/json/register" - "k8s.io/klog/v2" + "k8s.io/utils/ptr" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" @@ -51,11 +51,12 @@ import ( runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" "sigs.k8s.io/cluster-api/exp/runtime/server" "sigs.k8s.io/cluster-api/feature" + "sigs.k8s.io/cluster-api/util/flags" + "sigs.k8s.io/cluster-api/version" + "sigs.k8s.io/cluster-api/test/extension/handlers/lifecycle" "sigs.k8s.io/cluster-api/test/extension/handlers/topologymutation" infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" - "sigs.k8s.io/cluster-api/util/flags" - "sigs.k8s.io/cluster-api/version" ) var ( @@ -225,7 +226,7 @@ func main() { ctrlOptions := ctrl.Options{ Controller: config.Controller{ - UsePriorityQueue: feature.Gates.Enabled(feature.PriorityQueue), + UsePriorityQueue: ptr.To[bool](feature.Gates.Enabled(feature.PriorityQueue)), }, Scheme: scheme, LeaderElection: enableLeaderElection, diff --git a/test/infrastructure/docker/main.go b/test/infrastructure/docker/main.go index a8959fa4b7bc..83a505594964 100644 --- a/test/infrastructure/docker/main.go +++ b/test/infrastructure/docker/main.go @@ -37,7 +37,7 @@ import ( "k8s.io/component-base/logs" logsv1 "k8s.io/component-base/logs/api/v1" _ "k8s.io/component-base/logs/json/register" - "k8s.io/klog/v2" + "k8s.io/utils/ptr" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" @@ -50,6 +50,9 @@ import ( "sigs.k8s.io/cluster-api/controllers/remote" expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1" "sigs.k8s.io/cluster-api/feature" + "sigs.k8s.io/cluster-api/util/flags" + "sigs.k8s.io/cluster-api/version" + "sigs.k8s.io/cluster-api/test/infrastructure/container" infrav1alpha3 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha3" infrav1alpha4 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha4" @@ -61,8 +64,6 @@ import ( expcontrollers "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/controllers" infraexpwebhooks "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/webhooks" infrawebhooks "sigs.k8s.io/cluster-api/test/infrastructure/docker/webhooks" - "sigs.k8s.io/cluster-api/util/flags" - "sigs.k8s.io/cluster-api/version" ) var ( @@ -232,7 +233,7 @@ func main() { ctrlOptions := ctrl.Options{ Controller: config.Controller{ - UsePriorityQueue: feature.Gates.Enabled(feature.PriorityQueue), + UsePriorityQueue: ptr.To[bool](feature.Gates.Enabled(feature.PriorityQueue)), }, Scheme: scheme, LeaderElection: enableLeaderElection, diff --git a/test/infrastructure/inmemory/main.go b/test/infrastructure/inmemory/main.go index e1d836226c8e..2bd159298832 100644 --- a/test/infrastructure/inmemory/main.go +++ b/test/infrastructure/inmemory/main.go @@ -36,7 +36,7 @@ import ( "k8s.io/component-base/logs" logsv1 "k8s.io/component-base/logs/api/v1" _ "k8s.io/component-base/logs/json/register" - "k8s.io/klog/v2" + "k8s.io/utils/ptr" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" @@ -47,14 +47,15 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/cluster-api/controllers/remote" "sigs.k8s.io/cluster-api/feature" + "sigs.k8s.io/cluster-api/util/flags" + "sigs.k8s.io/cluster-api/version" + infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/inmemory/api/v1alpha1" "sigs.k8s.io/cluster-api/test/infrastructure/inmemory/controllers" cloudv1 "sigs.k8s.io/cluster-api/test/infrastructure/inmemory/internal/cloud/api/v1alpha1" inmemoryruntime "sigs.k8s.io/cluster-api/test/infrastructure/inmemory/pkg/runtime" inmemoryserver "sigs.k8s.io/cluster-api/test/infrastructure/inmemory/pkg/server" "sigs.k8s.io/cluster-api/test/infrastructure/inmemory/webhooks" - "sigs.k8s.io/cluster-api/util/flags" - "sigs.k8s.io/cluster-api/version" ) var ( @@ -210,7 +211,7 @@ func main() { ctrlOptions := ctrl.Options{ Controller: config.Controller{ - UsePriorityQueue: feature.Gates.Enabled(feature.PriorityQueue), + UsePriorityQueue: ptr.To[bool](feature.Gates.Enabled(feature.PriorityQueue)), }, Scheme: scheme, LeaderElection: enableLeaderElection,