modify poolservice api.

zyjhtangtang · Apr 7, 2024 · 6af818b · 6af818b
1 parent 9769ab2
commit 6af818b
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 24 deletions.
diff --git a/...er/crds/net.openyurt.io_poolservices.yaml → ...rds/network.openyurt.io_poolservices.yaml b/...er/crds/net.openyurt.io_poolservices.yaml → ...rds/network.openyurt.io_poolservices.yaml
@@ -4,9 +4,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
-  name: poolservices.net.openyurt.io
+  name: poolservices.network.openyurt.io
 spec:
-  group: net.openyurt.io
+  group: network.openyurt.io
   names:
     categories:
     - all
@@ -48,11 +48,6 @@ spec:
             properties:
               loadBalancerClass:
                 type: string
-              poolName:
-                type: string
-              renewTime:
-                format: date-time
-                type: string
             type: object
           status:
             description: PoolServiceStatus defines the observed state of PoolService

diff --git a/pkg/apis/addtoscheme_net_v1alpha1.go → pkg/apis/addtoscheme_network_v1alpha1.go b/pkg/apis/addtoscheme_net_v1alpha1.go → pkg/apis/addtoscheme_network_v1alpha1.go
@@ -17,7 +17,7 @@ limitations under the License.
 package apis
 
 import (
-	version "github.com/openyurtio/openyurt/pkg/apis/net/v1alpha1"
+	version "github.com/openyurtio/openyurt/pkg/apis/network/v1alpha1"
 )
 
 func init() {

diff --git a/pkg/apis/net/v1alpha1/default.go → pkg/apis/network/v1alpha1/default.go b/pkg/apis/net/v1alpha1/default.go → pkg/apis/network/v1alpha1/default.go
diff --git a/pkg/apis/net/v1alpha1/doc.go → pkg/apis/network/v1alpha1/doc.go b/pkg/apis/net/v1alpha1/doc.go → pkg/apis/network/v1alpha1/doc.go
diff --git a/pkg/apis/net/v1alpha1/groupversion_info.go → ...pis/network/v1alpha1/groupversion_info.go b/pkg/apis/net/v1alpha1/groupversion_info.go → ...pis/network/v1alpha1/groupversion_info.go
@@ -27,7 +27,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "net.openyurt.io", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "network.openyurt.io", Version: "v1alpha1"}
 
 	SchemeGroupVersion = GroupVersion
 

diff --git a/pkg/apis/net/v1alpha1/poolservice_types.go → ...pis/network/v1alpha1/poolservice_types.go b/pkg/apis/net/v1alpha1/poolservice_types.go → ...pis/network/v1alpha1/poolservice_types.go
@@ -26,14 +26,8 @@ import (
 
 // PoolServiceSpec defines the desired state of PoolService
 type PoolServiceSpec struct {
-	// Specify the name of the nodepool to identifies the nodepool to which the PoolService belongs.
-	PoolName string `json:"poolName,omitempty"`
-
-	// When the service corresponding to poolService is updated, the RenewTime will be refreshed.
-	RenewTime *metav1.MicroTime `json:"renewTime,omitempty"`
-
-	// Inherited from service annotations service.beta.kubernetes.io/class.
-	LoadBalancerClass string `json:"loadBalancerClass,omitempty"`
+	// Inherited from service spec.LoadBalancerClass
+	LoadBalancerClass *string `json:"loadBalancerClass,omitempty"`
 }
 
 // PoolServiceStatus defines the observed state of PoolService

diff --git a/...pis/net/v1alpha1/zz_generated.deepcopy.go → ...network/v1alpha1/zz_generated.deepcopy.go b/...pis/net/v1alpha1/zz_generated.deepcopy.go → ...network/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/network/well_known_labels_annotations.go b/pkg/apis/network/well_known_labels_annotations.go
@@ -0,0 +1,8 @@
+package network
+
+const (
+	LabelServiceName              = "openyurt.io/service-name"
+	LabelNodePoolName             = "openyurt.io/pool-name"
+	AnnotationNodePoolSelector    = "service.openyurt.io/nodepool-labelselector"
+	AggregateAnnotationsKeyPrefix = "service.openyurt.io"
+)
diff --git a/pkg/yurtmanager/controller/poolservice/poolservice_controller.go b/pkg/yurtmanager/controller/poolservice/poolservice_controller.go
@@ -34,7 +34,7 @@ import (
 
 	appconfig "github.com/openyurtio/openyurt/cmd/yurt-manager/app/config"
 	"github.com/openyurtio/openyurt/cmd/yurt-manager/names"
-	netv1alpha1 "github.com/openyurtio/openyurt/pkg/apis/net/v1alpha1"
+	netv1alpha1 "github.com/openyurtio/openyurt/pkg/apis/network/v1alpha1"
 	"github.com/openyurtio/openyurt/pkg/yurtmanager/controller/poolservice/config"
 )
 

diff --git a/pkg/yurtmanager/webhook/poolservice/v1alpha1/poolservice_default.go b/pkg/yurtmanager/webhook/poolservice/v1alpha1/poolservice_default.go
@@ -23,7 +23,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	"github.com/openyurtio/openyurt/pkg/apis/net/v1alpha1"
+	"github.com/openyurtio/openyurt/pkg/apis/network/v1alpha1"
 )
 
 // Default satisfies the defaulting webhook interface.

diff --git a/pkg/yurtmanager/webhook/poolservice/v1alpha1/poolservice_handler.go b/pkg/yurtmanager/webhook/poolservice/v1alpha1/poolservice_handler.go
@@ -22,7 +22,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
-	"github.com/openyurtio/openyurt/pkg/apis/net/v1alpha1"
+	"github.com/openyurtio/openyurt/pkg/apis/network/v1alpha1"
 	"github.com/openyurtio/openyurt/pkg/yurtmanager/webhook/util"
 )
 

diff --git a/pkg/yurtmanager/webhook/poolservice/v1alpha1/poolservice_validation.go b/pkg/yurtmanager/webhook/poolservice/v1alpha1/poolservice_validation.go
@@ -24,7 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/v2"
 
-	"github.com/openyurtio/openyurt/pkg/apis/net/v1alpha1"
+	"github.com/openyurtio/openyurt/pkg/apis/network/v1alpha1"
 )
 
 // ValidateCreate implements webhook.CustomValidator so a webhook will be registered for the type.