refactor naming policy api

Author: ColdsteelRail

apps/v1alpha1/collaset_types.go

@@ -28,17 +28,17 @@ const (
 	CollaSetUpdate CollaSetConditionType = "Update"
 )
 
-// PodNamingPolicy is a string enumeration that determaines how pod name will be generated.
+// ReplicaNamingPolicy is a string enumeration that determaines how pod name will be generated.
 // A collaset pod name contains two parts to be placed in a string formation %s-%s; the prefix
-// is name of collaset, and the suffix is determined by PodNamingPolicy.
-type PodNamingPolicy string
+// is name of collaset, and the suffix is determined by ReplicaNamingPolicy.
+type ReplicaNamingPolicy string
 
 const (
-	// PodNamingPolicyPersistentSequence uses persistent sequential numbers as pod name suffix.
-	PodNamingPolicyPersistentSequence PodNamingPolicy = "PersistentSequence"
-	// PodNamingPolicyDefault uses random strings which are provided by Kubernetes as pod name suffix.
+	// ReplicaNamingPolicyPersistentSequence uses persistent sequential numbers as pod name suffix.
+	ReplicaNamingPolicyPersistentSequence ReplicaNamingPolicy = "PersistentSequence"
+	// ReplicaNamingPolicyDefault uses random strings which are provided by Kubernetes as pod name suffix.
 	// This is defaulting value.
-	PodNamingPolicyDefault PodNamingPolicy = "Default"
+	ReplicaNamingPolicyDefault ReplicaNamingPolicy = "Default"
 )
 
 // PersistentVolumeClaimRetentionPolicyType is a string enumeration of the policies that will determine
@@ -120,6 +120,10 @@ type CollaSetSpec struct {
 	// +optional
 	ScaleStrategy ScaleStrategy `json:"scaleStrategy,omitempty"`
 
+	// NamigPolicy indicates the strategy detail that will be used for replica naming
+	// +optional
+	NamingPolicy NamingPolicy `json:"namimgPolicy,omitempty"`
+
 	// Indicate the number of histories to be conserved
 	// If unspecified, defaults to 20
 	// +optional
@@ -133,9 +137,6 @@ type ScaleStrategy struct {
 	// +optional
 	Context string `json:"context,omitempty"`
 
-	// PodNamingPolicy indicates how a new pod name is generated.
-	PodNamingPolicy PodNamingPolicy `json:"podNamingPolicy,omitempty"`
-
 	// PodToExclude indicates the pods which will be orphaned by CollaSet.
 	// +optional
 	PodToExclude []string `json:"podToExclude,omitempty"`
@@ -160,6 +161,11 @@ type ScaleStrategy struct {
 	OperationDelaySeconds *int32 `json:"operationDelaySeconds,omitempty"`
 }
 
+type NamingPolicy struct {
+	// ReplicaNamingPolicy indicates how a new pod name is generated.
+	ReplicaNamingPolicy ReplicaNamingPolicy `json:"replicaNamingPolicy,omitempty"`
+}
+
 type PersistentVolumeClaimRetentionPolicy struct {
 	// WhenDeleted specifies what happens to PVCs created from CollaSet
 	// VolumeClaimTemplates when the CollaSet is deleted. The default policy

apps/v1alpha1/zz_generated.deepcopy.go

@@ -83,6 +83,15 @@ spec:
                   If unspecified, defaults to 20
                 format: int32
                 type: integer
+              namimgPolicy:
+                description: NamigPolicy indicates the strategy detail that will be
+                  used for replica naming
+                properties:
+                  replicaNamingPolicy:
+                    description: ReplicaNamingPolicy indicates how a new pod name
+                      is generated.
+                    type: string
+                type: object
               paused:
                 description: |-
                   Indicates that the scaling and updating is paused and will not be processed by the
@@ -134,9 +143,6 @@ spec:
                           the replica count to be deleted.
                         type: string
                     type: object
-                  podNamingPolicy:
-                    description: PodNamingPolicy indicates how a new pod name is generated.
-                    type: string
                   podToDelete:
                     description: PodToDelete indicates the pods which will be deleted
                       by CollaSet.