diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 2f05c37c3994..dbc982595bc0 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -19297,6 +19297,7 @@ "description": "SchedulePriority defines how Karmada should resolve the priority and preemption policy for workload scheduling.", "type": "object", "required": [ + "priorityClassSource", "priorityClassName" ], "properties": { @@ -19305,7 +19306,7 @@ "type": "string" }, "priorityClassSource": { - "description": "PriorityClassSource specifies where Karmada should look for the PriorityClass definition. Available options: - KubePriorityClass (default): Uses Kubernetes PriorityClass (scheduling.k8s.io/v1) - PodPriorityClass: Uses PriorityClassName from PodTemplate: PodSpec.PriorityClassName (not yet implemented) - FederatedPriorityClass: Uses Karmada FederatedPriorityClass (not yet implemented)", + "description": "PriorityClassSource specifies where Karmada should look for the PriorityClass definition. Available options: - KubePriorityClass: Uses Kubernetes PriorityClass (scheduling.k8s.io/v1) - PodPriorityClass: Uses PriorityClassName from PodTemplate: PodSpec.PriorityClassName (not yet implemented) - FederatedPriorityClass: Uses Karmada FederatedPriorityClass (not yet implemented)", "type": "string" } } diff --git a/charts/karmada/_crds/bases/policy/policy.karmada.io_clusterpropagationpolicies.yaml b/charts/karmada/_crds/bases/policy/policy.karmada.io_clusterpropagationpolicies.yaml index ae3f4419d10e..504a6c2844a8 100644 --- a/charts/karmada/_crds/bases/policy/policy.karmada.io_clusterpropagationpolicies.yaml +++ b/charts/karmada/_crds/bases/policy/policy.karmada.io_clusterpropagationpolicies.yaml @@ -902,11 +902,10 @@ spec: - Not yet implemented. type: string priorityClassSource: - default: KubePriorityClass description: |- PriorityClassSource specifies where Karmada should look for the PriorityClass definition. Available options: - - KubePriorityClass (default): Uses Kubernetes PriorityClass (scheduling.k8s.io/v1) + - KubePriorityClass: Uses Kubernetes PriorityClass (scheduling.k8s.io/v1) - PodPriorityClass: Uses PriorityClassName from PodTemplate: PodSpec.PriorityClassName (not yet implemented) - FederatedPriorityClass: Uses Karmada FederatedPriorityClass (not yet implemented) enum: @@ -914,6 +913,7 @@ spec: type: string required: - priorityClassName + - priorityClassSource type: object schedulerName: default: default-scheduler diff --git a/charts/karmada/_crds/bases/policy/policy.karmada.io_propagationpolicies.yaml b/charts/karmada/_crds/bases/policy/policy.karmada.io_propagationpolicies.yaml index b1caaf73e62e..a63390a9a062 100644 --- a/charts/karmada/_crds/bases/policy/policy.karmada.io_propagationpolicies.yaml +++ b/charts/karmada/_crds/bases/policy/policy.karmada.io_propagationpolicies.yaml @@ -899,11 +899,10 @@ spec: - Not yet implemented. type: string priorityClassSource: - default: KubePriorityClass description: |- PriorityClassSource specifies where Karmada should look for the PriorityClass definition. Available options: - - KubePriorityClass (default): Uses Kubernetes PriorityClass (scheduling.k8s.io/v1) + - KubePriorityClass: Uses Kubernetes PriorityClass (scheduling.k8s.io/v1) - PodPriorityClass: Uses PriorityClassName from PodTemplate: PodSpec.PriorityClassName (not yet implemented) - FederatedPriorityClass: Uses Karmada FederatedPriorityClass (not yet implemented) enum: @@ -911,6 +910,7 @@ spec: type: string required: - priorityClassName + - priorityClassSource type: object schedulerName: default: default-scheduler diff --git a/pkg/apis/policy/v1alpha1/propagation_types.go b/pkg/apis/policy/v1alpha1/propagation_types.go index 8280a9b922c9..59c4b4010586 100644 --- a/pkg/apis/policy/v1alpha1/propagation_types.go +++ b/pkg/apis/policy/v1alpha1/propagation_types.go @@ -682,13 +682,12 @@ const ( type SchedulePriority struct { // PriorityClassSource specifies where Karmada should look for the PriorityClass definition. // Available options: - // - KubePriorityClass (default): Uses Kubernetes PriorityClass (scheduling.k8s.io/v1) + // - KubePriorityClass: Uses Kubernetes PriorityClass (scheduling.k8s.io/v1) // - PodPriorityClass: Uses PriorityClassName from PodTemplate: PodSpec.PriorityClassName (not yet implemented) // - FederatedPriorityClass: Uses Karmada FederatedPriorityClass (not yet implemented) // - // +kubebuilder:default="KubePriorityClass" // +kubebuilder:validation:Enum=KubePriorityClass - // +optional + // +required PriorityClassSource PriorityClassSource `json:"priorityClassSource,omitempty"` // PriorityClassName specifies which PriorityClass to use. Its behavior depends on PriorityClassSource: diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index b81aceb58330..05fd242752d5 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -5150,7 +5150,7 @@ func schema_pkg_apis_policy_v1alpha1_SchedulePriority(ref common.ReferenceCallba Properties: map[string]spec.Schema{ "priorityClassSource": { SchemaProps: spec.SchemaProps{ - Description: "PriorityClassSource specifies where Karmada should look for the PriorityClass definition. Available options: - KubePriorityClass (default): Uses Kubernetes PriorityClass (scheduling.k8s.io/v1) - PodPriorityClass: Uses PriorityClassName from PodTemplate: PodSpec.PriorityClassName (not yet implemented) - FederatedPriorityClass: Uses Karmada FederatedPriorityClass (not yet implemented)", + Description: "PriorityClassSource specifies where Karmada should look for the PriorityClass definition. Available options: - KubePriorityClass: Uses Kubernetes PriorityClass (scheduling.k8s.io/v1) - PodPriorityClass: Uses PriorityClassName from PodTemplate: PodSpec.PriorityClassName (not yet implemented) - FederatedPriorityClass: Uses Karmada FederatedPriorityClass (not yet implemented)", Type: []string{"string"}, Format: "", }, @@ -5163,7 +5163,7 @@ func schema_pkg_apis_policy_v1alpha1_SchedulePriority(ref common.ReferenceCallba }, }, }, - Required: []string{"priorityClassName"}, + Required: []string{"priorityClassSource", "priorityClassName"}, }, }, }