Refactored the service spec into a common struct

api/v1alpha1/common.go

@@ -52,3 +52,25 @@ const (
 	// Provider Sveltos
 	ProviderSveltosName = "projectsveltos"
 )
+
+type ServicesType struct {
+	// Services is a list of services created via ServiceTemplates
+	// that could be installed on the target cluster.
+	Services []ServiceSpec `json:"services,omitempty"`
+
+	// ServicesPriority sets the priority for the services defined in this spec.
+	// Higher value means higher priority and lower means lower.
+	// In case of conflict with another object managing the service,
+	// the one with higher priority will get to deploy its services.
+	ServicesPriority int32 `json:"servicesPriority,omitempty"`
+	// DryRun specifies whether the template should be applied after validation or only validated.
+	// DryRun bool `json:"dryRun,omitempty"`
+
+	// +kubebuilder:default:=false
+
+	// StopOnConflict specifies what to do in case of a conflict.
+	// E.g. If another object is already managing a service.
+	// By default the remaining services will be deployed even if conflict is detected.
+	// If set to true, the deployment will stop after encountering the first conflict.
+	StopOnConflict bool `json:"stopOnConflict,omitempty"`
+}

api/v1alpha1/managedcluster_types.go

@@ -65,29 +65,11 @@ type ManagedClusterSpec struct {
 	Template string `json:"template"`
 	// Name reference to the related Credentials object.
 	Credential string `json:"credential,omitempty"`
-	// Services is a list of services created via ServiceTemplates
-	// that could be installed on the target cluster.
-	Services []ServiceSpec `json:"services,omitempty"`
-
-	// +kubebuilder:default:=100
-	// +kubebuilder:validation:Minimum=1
-	// +kubebuilder:validation:Maximum=2147483646
-
-	// ServicesPriority sets the priority for the services defined in this spec.
-	// Higher value means higher priority and lower means lower.
-	// In case of conflict with another object managing the service,
-	// the one with higher priority will get to deploy its services.
-	ServicesPriority int32 `json:"servicesPriority,omitempty"`
+
 	// DryRun specifies whether the template should be applied after validation or only validated.
 	DryRun bool `json:"dryRun,omitempty"`
 
-	// +kubebuilder:default:=false
-
-	// StopOnConflict specifies what to do in case of a conflict.
-	// E.g. If another object is already managing a service.
-	// By default the remaining services will be deployed even if conflict is detected.
-	// If set to true, the deployment will stop after encountering the first conflict.
-	StopOnConflict bool `json:"stopOnConflict,omitempty"`
+	ServicesType `json:",inline"`
 }
 
 // ManagedClusterStatus defines the observed state of ManagedCluster

api/v1alpha1/multiclusterservice_types.go

@@ -63,27 +63,7 @@ type ServiceSpec struct {
 type MultiClusterServiceSpec struct {
 	// ClusterSelector identifies target clusters to manage services on.
 	ClusterSelector metav1.LabelSelector `json:"clusterSelector,omitempty"`
-	// Services is a list of services created via ServiceTemplates
-	// that could be installed on the target cluster.
-	Services []ServiceSpec `json:"services,omitempty"`
-
-	// +kubebuilder:default:=100
-	// +kubebuilder:validation:Minimum=1
-	// +kubebuilder:validation:Maximum=2147483646
-
-	// ServicesPriority sets the priority for the services defined in this spec.
-	// Higher value means higher priority and lower means lower.
-	// In case of conflict with another object managing the service,
-	// the one with higher priority will get to deploy its services.
-	ServicesPriority int32 `json:"servicesPriority,omitempty"`
-
-	// +kubebuilder:default:=false
-
-	// StopOnConflict specifies what to do in case of a conflict.
-	// E.g. If another object is already managing a service.
-	// By default the remaining services will be deployed even if conflict is detected.
-	// If set to true, the deployment will stop after encountering the first conflict.
-	StopOnConflict bool `json:"stopOnConflict,omitempty"`
+	ServicesType    `json:",inline"`
 }
 
 // ServiceStatus contains details for the state of services.

api/v1alpha1/unmanagedcluster_types.go

@@ -28,25 +28,7 @@ const (
 
 // UnmanagedClusterSpec defines the desired state of UnmanagedCluster
 type UnmanagedClusterSpec struct {
-	// Services is a list of services created via ServiceTemplates
-	// that could be installed on the target cluster.
-	Services []ServiceSpec `json:"services,omitempty"`
-
-	// ServicesPriority sets the priority for the services defined in this spec.
-	// Higher value means higher priority and lower means lower.
-	// In case of conflict with another object managing the service,
-	// the one with higher priority will get to deploy its services.
-	ServicesPriority int32 `json:"servicesPriority,omitempty"`
-	// DryRun specifies whether the template should be applied after validation or only validated.
-	// DryRun bool `json:"dryRun,omitempty"`
-
-	// +kubebuilder:default:=false
-
-	// StopOnConflict specifies what to do in case of a conflict.
-	// E.g. If another object is already managing a service.
-	// By default the remaining services will be deployed even if conflict is detected.
-	// If set to true, the deployment will stop after encountering the first conflict.
-	StopOnConflict bool `json:"stopOnConflict,omitempty"`
+	ServicesType `json:",inline"`
 }
 
 // UnmanagedClusterStatus defines the observed state of UnmanagedCluster

templates/provider/hmc/templates/crds/hmc.mirantis.com_managedclusters.yaml

@@ -103,15 +103,12 @@ spec:
                   type: object
                 type: array
               servicesPriority:
-                default: 100
                 description: |-
                   ServicesPriority sets the priority for the services defined in this spec.
                   Higher value means higher priority and lower means lower.
                   In case of conflict with another object managing the service,
                   the one with higher priority will get to deploy its services.
                 format: int32
-                maximum: 2147483646
-                minimum: 1
                 type: integer
               stopOnConflict:
                 default: false

templates/provider/hmc/templates/crds/hmc.mirantis.com_multiclusterservices.yaml

@@ -121,15 +121,12 @@ spec:
                   type: object
                 type: array
               servicesPriority:
-                default: 100
                 description: |-
                   ServicesPriority sets the priority for the services defined in this spec.
                   Higher value means higher priority and lower means lower.
                   In case of conflict with another object managing the service,
                   the one with higher priority will get to deploy its services.
                 format: int32
-                maximum: 2147483646
-                minimum: 1
                 type: integer
               stopOnConflict:
                 default: false