Skip to content

Commit ad511cd

Browse files
aojeaaojea
committed
update registry
1 parent e340a07 commit ad511cd

File tree

7 files changed

+161
-161
lines changed

7 files changed

+161
-161
lines changed

‎pkg/registry/core/rest/storage_core.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
serverstorage "k8s.io/apiserver/pkg/server/storage"
3535
utilfeature "k8s.io/apiserver/pkg/util/feature"
3636
"k8s.io/client-go/kubernetes"
37-
networkingv1beta1client "k8s.io/client-go/kubernetes/typed/networking/v1beta1"
37+
networkingv1client "k8s.io/client-go/kubernetes/typed/networking/v1"
3838
policyclient "k8s.io/client-go/kubernetes/typed/policy/v1"
3939
"k8s.io/klog/v2"
4040
"k8s.io/kubernetes/pkg/api/legacyscheme"
@@ -140,8 +140,8 @@ func New(c Config) (*legacyProvider, error) {
140140
c.Services.IPRepairInterval,
141141
client,
142142
c.Informers.Core().V1().Services(),
143-
c.Informers.Networking().V1beta1().ServiceCIDRs(),
144-
c.Informers.Networking().V1beta1().IPAddresses(),
143+
c.Informers.Networking().V1().ServiceCIDRs(),
144+
c.Informers.Networking().V1().IPAddresses(),
145145
).RunUntil
146146
}
147147

@@ -351,7 +351,7 @@ func (c *Config) newServiceIPAllocators() (registries rangeRegistries, primaryCl
351351
return rangeRegistries{}, nil, nil, nil, fmt.Errorf("cannot create cluster IP allocator: %v", err)
352352
}
353353
} else {
354-
networkingv1beta1Client, err := networkingv1beta1client.NewForConfig(c.LoopbackClientConfig)
354+
networkingv1Client, err := networkingv1client.NewForConfig(c.LoopbackClientConfig)
355355
if err != nil {
356356
return rangeRegistries{}, nil, nil, nil, err
357357
}
@@ -391,9 +391,9 @@ func (c *Config) newServiceIPAllocators() (registries rangeRegistries, primaryCl
391391
// sets the default IPFamily that may not be coherent with the
392392
// existing default ServiceCIDR
393393
primaryClusterIPAllocator, err = ipallocator.NewMetaAllocator(
394-
networkingv1beta1Client,
395-
c.Informers.Networking().V1beta1().ServiceCIDRs(),
396-
c.Informers.Networking().V1beta1().IPAddresses(),
394+
networkingv1Client,
395+
c.Informers.Networking().V1().ServiceCIDRs(),
396+
c.Informers.Networking().V1().IPAddresses(),
397397
netutils.IsIPv6CIDR(&serviceClusterIPRange),
398398
bitmapAllocator,
399399
)
@@ -423,7 +423,7 @@ func (c *Config) newServiceIPAllocators() (registries rangeRegistries, primaryCl
423423
return rangeRegistries{}, nil, nil, nil, fmt.Errorf("cannot create cluster secondary IP allocator: %v", err)
424424
}
425425
} else {
426-
networkingv1beta1Client, err := networkingv1beta1client.NewForConfig(c.LoopbackClientConfig)
426+
networkingv1Client, err := networkingv1client.NewForConfig(c.LoopbackClientConfig)
427427
if err != nil {
428428
return rangeRegistries{}, nil, nil, nil, err
429429
}
@@ -463,9 +463,9 @@ func (c *Config) newServiceIPAllocators() (registries rangeRegistries, primaryCl
463463
// sets the default IPFamily that may not be coherent with the
464464
// existing default ServiceCIDR
465465
secondaryClusterIPAllocator, err = ipallocator.NewMetaAllocator(
466-
networkingv1beta1Client,
467-
c.Informers.Networking().V1beta1().ServiceCIDRs(),
468-
c.Informers.Networking().V1beta1().IPAddresses(),
466+
networkingv1Client,
467+
c.Informers.Networking().V1().ServiceCIDRs(),
468+
c.Informers.Networking().V1().IPAddresses(),
469469
netutils.IsIPv6CIDR(&c.Services.SecondaryClusterIPRange),
470470
bitmapAllocator,
471471
)

‎pkg/registry/core/service/ipallocator/cidrallocator.go‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ import (
2424
"time"
2525

2626
v1 "k8s.io/api/core/v1"
27-
networkingv1beta1 "k8s.io/api/networking/v1beta1"
27+
networkingv1 "k8s.io/api/networking/v1"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/apimachinery/pkg/labels"
3030
"k8s.io/apimachinery/pkg/util/runtime"
3131
"k8s.io/apimachinery/pkg/util/sets"
3232
"k8s.io/apimachinery/pkg/util/wait"
3333
utilfeature "k8s.io/apiserver/pkg/util/feature"
34-
networkingv1beta1informers "k8s.io/client-go/informers/networking/v1beta1"
35-
networkingv1beta1client "k8s.io/client-go/kubernetes/typed/networking/v1beta1"
36-
networkingv1beta1listers "k8s.io/client-go/listers/networking/v1beta1"
34+
networkingv1informers "k8s.io/client-go/informers/networking/v1"
35+
networkingv1client "k8s.io/client-go/kubernetes/typed/networking/v1"
36+
networkingv1listers "k8s.io/client-go/listers/networking/v1"
3737
"k8s.io/client-go/tools/cache"
3838
"k8s.io/client-go/util/workqueue"
3939
"k8s.io/klog/v2"
@@ -52,12 +52,12 @@ import (
5252
// MetaAllocator implements current allocator interface using
5353
// ServiceCIDR and IPAddress API objects.
5454
type MetaAllocator struct {
55-
client networkingv1beta1client.NetworkingV1beta1Interface
56-
serviceCIDRLister networkingv1beta1listers.ServiceCIDRLister
55+
client networkingv1client.NetworkingV1Interface
56+
serviceCIDRLister networkingv1listers.ServiceCIDRLister
5757
serviceCIDRSynced cache.InformerSynced
58-
ipAddressLister networkingv1beta1listers.IPAddressLister
58+
ipAddressLister networkingv1listers.IPAddressLister
5959
ipAddressSynced cache.InformerSynced
60-
ipAddressInformer networkingv1beta1informers.IPAddressInformer
60+
ipAddressInformer networkingv1informers.IPAddressInformer
6161
queue workqueue.TypedRateLimitingInterface[string]
6262

6363
internalStopCh chan struct{}
@@ -87,9 +87,9 @@ var _ Interface = &MetaAllocator{}
8787
// and ServiceCIDR objects to track the assigned IP addresses,
8888
// using an informer cache as storage.
8989
func NewMetaAllocator(
90-
client networkingv1beta1client.NetworkingV1beta1Interface,
91-
serviceCIDRInformer networkingv1beta1informers.ServiceCIDRInformer,
92-
ipAddressInformer networkingv1beta1informers.IPAddressInformer,
90+
client networkingv1client.NetworkingV1Interface,
91+
serviceCIDRInformer networkingv1informers.ServiceCIDRInformer,
92+
ipAddressInformer networkingv1informers.IPAddressInformer,
9393
isIPv6 bool,
9494
bitmapAllocator Interface,
9595
) (*MetaAllocator, error) {
@@ -100,9 +100,9 @@ func NewMetaAllocator(
100100
}
101101

102102
// newMetaAllocator is used to build the allocator for testing
103-
func newMetaAllocator(client networkingv1beta1client.NetworkingV1beta1Interface,
104-
serviceCIDRInformer networkingv1beta1informers.ServiceCIDRInformer,
105-
ipAddressInformer networkingv1beta1informers.IPAddressInformer,
103+
func newMetaAllocator(client networkingv1client.NetworkingV1Interface,
104+
serviceCIDRInformer networkingv1informers.ServiceCIDRInformer,
105+
ipAddressInformer networkingv1informers.IPAddressInformer,
106106
isIPv6 bool,
107107
bitmapAllocator Interface,
108108
) *MetaAllocator {
@@ -152,13 +152,13 @@ func (c *MetaAllocator) enqueueServiceCIDR(obj interface{}) {
152152
}
153153

154154
func (c *MetaAllocator) deleteServiceCIDR(obj interface{}) {
155-
serviceCIDR, ok := obj.(*networkingv1beta1.ServiceCIDR)
155+
serviceCIDR, ok := obj.(*networkingv1.ServiceCIDR)
156156
if !ok {
157157
tombstone, ok := obj.(cache.DeletedFinalStateUnknown)
158158
if !ok {
159159
return
160160
}
161-
serviceCIDR, ok = tombstone.Obj.(*networkingv1beta1.ServiceCIDR)
161+
serviceCIDR, ok = tombstone.Obj.(*networkingv1.ServiceCIDR)
162162
if !ok {
163163
return
164164
}
@@ -414,8 +414,8 @@ func (c *MetaAllocator) Release(ip net.IP) error {
414414
}
415415
func (c *MetaAllocator) ForEach(f func(ip net.IP)) {
416416
ipLabelSelector := labels.Set(map[string]string{
417-
networkingv1beta1.LabelIPAddressFamily: string(c.IPFamily()),
418-
networkingv1beta1.LabelManagedBy: ControllerName,
417+
networkingv1.LabelIPAddressFamily: string(c.IPFamily()),
418+
networkingv1.LabelManagedBy: ControllerName,
419419
}).AsSelectorPreValidated()
420420
ips, err := c.ipAddressLister.List(ipLabelSelector)
421421
if err != nil {
@@ -454,8 +454,8 @@ func (c *MetaAllocator) Destroy() {
454454
// for testing
455455
func (c *MetaAllocator) Used() int {
456456
ipLabelSelector := labels.Set(map[string]string{
457-
networkingv1beta1.LabelIPAddressFamily: string(c.IPFamily()),
458-
networkingv1beta1.LabelManagedBy: ControllerName,
457+
networkingv1.LabelIPAddressFamily: string(c.IPFamily()),
458+
networkingv1.LabelManagedBy: ControllerName,
459459
}).AsSelectorPreValidated()
460460
ips, err := c.ipAddressLister.List(ipLabelSelector)
461461
if err != nil {
@@ -512,13 +512,13 @@ func (c *MetaAllocator) DryRun() Interface {
512512
return &Allocator{}
513513
}
514514

515-
func isReady(serviceCIDR *networkingv1beta1.ServiceCIDR) bool {
515+
func isReady(serviceCIDR *networkingv1.ServiceCIDR) bool {
516516
if serviceCIDR == nil {
517517
return false
518518
}
519519

520520
for _, condition := range serviceCIDR.Status.Conditions {
521-
if condition.Type == networkingv1beta1.ServiceCIDRConditionReady {
521+
if condition.Type == networkingv1.ServiceCIDRConditionReady {
522522
return condition.Status == metav1.ConditionStatus(metav1.ConditionTrue)
523523
}
524524
}

‎pkg/registry/core/service/ipallocator/cidrallocator_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"testing"
2424
"time"
2525

26-
networkingv1beta1 "k8s.io/api/networking/v1beta1"
26+
networkingv1 "k8s.io/api/networking/v1"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/runtime"
2929
"k8s.io/apimachinery/pkg/util/sets"
@@ -41,13 +41,13 @@ func newTestMetaAllocator() (*MetaAllocator, error) {
4141
client := fake.NewSimpleClientset()
4242

4343
informerFactory := informers.NewSharedInformerFactory(client, 0*time.Second)
44-
serviceCIDRInformer := informerFactory.Networking().V1beta1().ServiceCIDRs()
44+
serviceCIDRInformer := informerFactory.Networking().V1().ServiceCIDRs()
4545
serviceCIDRStore := serviceCIDRInformer.Informer().GetIndexer()
46-
ipInformer := informerFactory.Networking().V1beta1().IPAddresses()
46+
ipInformer := informerFactory.Networking().V1().IPAddresses()
4747
ipStore := ipInformer.Informer().GetIndexer()
4848

4949
client.PrependReactor("create", "servicecidrs", k8stesting.ReactionFunc(func(action k8stesting.Action) (bool, runtime.Object, error) {
50-
cidr := action.(k8stesting.CreateAction).GetObject().(*networkingv1beta1.ServiceCIDR)
50+
cidr := action.(k8stesting.CreateAction).GetObject().(*networkingv1.ServiceCIDR)
5151
_, exists, err := serviceCIDRStore.GetByKey(cidr.Name)
5252
if exists && err != nil {
5353
return false, nil, fmt.Errorf("cidr already exist")
@@ -59,16 +59,16 @@ func newTestMetaAllocator() (*MetaAllocator, error) {
5959
client.PrependReactor("delete", "servicecidrs", k8stesting.ReactionFunc(func(action k8stesting.Action) (bool, runtime.Object, error) {
6060
name := action.(k8stesting.DeleteAction).GetName()
6161
obj, exists, err := serviceCIDRStore.GetByKey(name)
62-
cidr := &networkingv1beta1.ServiceCIDR{}
62+
cidr := &networkingv1.ServiceCIDR{}
6363
if exists && err == nil {
64-
cidr = obj.(*networkingv1beta1.ServiceCIDR)
64+
cidr = obj.(*networkingv1.ServiceCIDR)
6565
err = serviceCIDRStore.Delete(cidr)
6666
}
6767
return false, cidr, err
6868
}))
6969

7070
client.PrependReactor("create", "ipaddresses", k8stesting.ReactionFunc(func(action k8stesting.Action) (bool, runtime.Object, error) {
71-
ip := action.(k8stesting.CreateAction).GetObject().(*networkingv1beta1.IPAddress)
71+
ip := action.(k8stesting.CreateAction).GetObject().(*networkingv1.IPAddress)
7272
_, exists, err := ipStore.GetByKey(ip.Name)
7373
if exists && err != nil {
7474
return false, nil, fmt.Errorf("ip already exist")
@@ -80,15 +80,15 @@ func newTestMetaAllocator() (*MetaAllocator, error) {
8080
client.PrependReactor("delete", "ipaddresses", k8stesting.ReactionFunc(func(action k8stesting.Action) (bool, runtime.Object, error) {
8181
name := action.(k8stesting.DeleteAction).GetName()
8282
obj, exists, err := ipStore.GetByKey(name)
83-
ip := &networkingv1beta1.IPAddress{}
83+
ip := &networkingv1.IPAddress{}
8484
if exists && err == nil {
85-
ip = obj.(*networkingv1beta1.IPAddress)
85+
ip = obj.(*networkingv1.IPAddress)
8686
err = ipStore.Delete(ip)
8787
}
8888
return false, ip, err
8989
}))
9090

91-
c := newMetaAllocator(client.NetworkingV1beta1(), serviceCIDRInformer, ipInformer, false, nil)
91+
c := newMetaAllocator(client.NetworkingV1(), serviceCIDRInformer, ipInformer, false, nil)
9292

9393
c.serviceCIDRSynced = func() bool { return true }
9494
c.ipAddressSynced = func() bool { return true }
@@ -602,18 +602,18 @@ func TestCIDRAllocateDualWriteCollision(t *testing.T) {
602602
}
603603

604604
// TODO: add IPv6 and dual stack test cases
605-
func newServiceCIDR(name, cidr string) *networkingv1beta1.ServiceCIDR {
606-
return &networkingv1beta1.ServiceCIDR{
605+
func newServiceCIDR(name, cidr string) *networkingv1.ServiceCIDR {
606+
return &networkingv1.ServiceCIDR{
607607
ObjectMeta: metav1.ObjectMeta{
608608
Name: name,
609609
},
610-
Spec: networkingv1beta1.ServiceCIDRSpec{
610+
Spec: networkingv1.ServiceCIDRSpec{
611611
CIDRs: []string{cidr},
612612
},
613-
Status: networkingv1beta1.ServiceCIDRStatus{
613+
Status: networkingv1.ServiceCIDRStatus{
614614
Conditions: []metav1.Condition{
615615
{
616-
Type: string(networkingv1beta1.ServiceCIDRConditionReady),
616+
Type: string(networkingv1.ServiceCIDRConditionReady),
617617
Status: metav1.ConditionTrue,
618618
},
619619
},

0 commit comments

Comments
 (0)