Skip to content

Commit

Permalink
serve networking v1beta1 apis for ServiceCIDR and IP Address
Browse files Browse the repository at this point in the history
  • Loading branch information
aojea committed Jun 28, 2024
1 parent 29f33bc commit f0fd893
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkg/registry/networking/rest/storage_settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package rest

import (
networkingapiv1 "k8s.io/api/networking/v1"
networkingapiv1alpha1 "k8s.io/api/networking/v1alpha1"
networkingapiv1beta1 "k8s.io/api/networking/v1beta1"
"k8s.io/apiserver/pkg/registry/generic"
"k8s.io/apiserver/pkg/registry/rest"
genericapiserver "k8s.io/apiserver/pkg/server"
Expand All @@ -42,7 +42,7 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
if storageMap, err := p.v1alpha1Storage(apiResourceConfigSource, restOptionsGetter); err != nil {
return genericapiserver.APIGroupInfo{}, err
} else if len(storageMap) > 0 {
apiGroupInfo.VersionedResourcesStorageMap[networkingapiv1alpha1.SchemeGroupVersion.Version] = storageMap
apiGroupInfo.VersionedResourcesStorageMap[networkingapiv1beta1.SchemeGroupVersion.Version] = storageMap
}

if storageMap, err := p.v1Storage(apiResourceConfigSource, restOptionsGetter); err != nil {
Expand Down Expand Up @@ -92,7 +92,7 @@ func (p RESTStorageProvider) v1alpha1Storage(apiResourceConfigSource serverstora
storage := map[string]rest.Storage{}

// ipaddress
if resource := "ipaddresses"; apiResourceConfigSource.ResourceEnabled(networkingapiv1alpha1.SchemeGroupVersion.WithResource(resource)) {
if resource := "ipaddresses"; apiResourceConfigSource.ResourceEnabled(networkingapiv1beta1.SchemeGroupVersion.WithResource(resource)) {
ipAddressStorage, err := ipaddressstore.NewREST(restOptionsGetter)
if err != nil {
return storage, err
Expand All @@ -101,7 +101,7 @@ func (p RESTStorageProvider) v1alpha1Storage(apiResourceConfigSource serverstora
}

// servicecidrs
if resource := "servicecidrs"; apiResourceConfigSource.ResourceEnabled(networkingapiv1alpha1.SchemeGroupVersion.WithResource(resource)) {
if resource := "servicecidrs"; apiResourceConfigSource.ResourceEnabled(networkingapiv1beta1.SchemeGroupVersion.WithResource(resource)) {
serviceCIDRStorage, serviceCIDRStatusStorage, err := servicecidrstore.NewREST(restOptionsGetter)
if err != nil {
return storage, err
Expand Down

0 comments on commit f0fd893

Please sign in to comment.