mirror of
https://github.com/kubernetes/kubernetes.git
synced 2026-06-09 08:55:55 -04:00
chore: depr. pointer pkg replacement for the cloud-provider
This commit is contained in:
parent
60e7f66dba
commit
b72ab8a4e1
2 changed files with 4 additions and 5 deletions
|
|
@ -24,7 +24,7 @@ import (
|
|||
nodeconfigv1alpha1 "k8s.io/cloud-provider/controllers/node/config/v1alpha1"
|
||||
serviceconfigv1alpha1 "k8s.io/cloud-provider/controllers/service/config/v1alpha1"
|
||||
cmconfigv1alpha1 "k8s.io/controller-manager/config/v1alpha1"
|
||||
utilpointer "k8s.io/utils/pointer"
|
||||
"k8s.io/utils/ptr"
|
||||
)
|
||||
|
||||
func addDefaultingFuncs(scheme *runtime.Scheme) error {
|
||||
|
|
@ -63,7 +63,7 @@ func SetDefaults_KubeCloudSharedConfiguration(obj *KubeCloudSharedConfiguration)
|
|||
obj.ClusterName = "kubernetes"
|
||||
}
|
||||
if obj.ConfigureCloudRoutes == nil {
|
||||
obj.ConfigureCloudRoutes = utilpointer.BoolPtr(true)
|
||||
obj.ConfigureCloudRoutes = ptr.To(true)
|
||||
}
|
||||
if obj.RouteReconciliationPeriod == zero {
|
||||
obj.RouteReconciliationPeriod = metav1.Duration{Duration: 10 * time.Second}
|
||||
|
|
|
|||
|
|
@ -52,8 +52,7 @@ import (
|
|||
servicehelper "k8s.io/cloud-provider/service/helpers"
|
||||
_ "k8s.io/controller-manager/pkg/features/register"
|
||||
"k8s.io/klog/v2/ktesting"
|
||||
|
||||
utilpointer "k8s.io/utils/pointer"
|
||||
"k8s.io/utils/ptr"
|
||||
)
|
||||
|
||||
const region = "us-central"
|
||||
|
|
@ -250,7 +249,7 @@ func TestSyncLoadBalancerIfNeeded(t *testing.T) {
|
|||
expectPatchFinalizer: true,
|
||||
}, {
|
||||
desc: "service specifies loadBalancerClass",
|
||||
service: newService("with-external-balancer", v1.ServiceTypeLoadBalancer, tweakAddLBClass(utilpointer.String("custom-loadbalancer"))),
|
||||
service: newService("with-external-balancer", v1.ServiceTypeLoadBalancer, tweakAddLBClass(ptr.To("custom-loadbalancer"))),
|
||||
expectOp: deleteLoadBalancer,
|
||||
expectCreateAttempt: false,
|
||||
expectPatchStatus: false,
|
||||
|
|
|
|||
Loading…
Reference in a new issue