OCPBUGS-23900: config.openshift.io/v1/scheduler: allow profile customizations for DRA

config/v1/0000_10_config-operator_01_scheduler-CustomNoUpgrade.crd.yaml

@@ -0,0 +1,130 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    api-approved.openshift.io: https://github.com/openshift/api/pull/470
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/feature-set: CustomNoUpgrade
+  name: schedulers.config.openshift.io
+spec:
+  group: config.openshift.io
+  names:
+    kind: Scheduler
+    listKind: SchedulerList
+    plural: schedulers
+    singular: scheduler
+  scope: Cluster
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: "Scheduler holds cluster-wide config information to run the Kubernetes
+          Scheduler and influence its placement decisions. The canonical name for
+          this config is `cluster`. \n Compatibility level 1: Stable within a major
+          release for a minimum of 12 months or 3 minor releases (whichever is longer)."
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: spec holds user settable values for configuration
+            properties:
+              defaultNodeSelector:
+                description: 'defaultNodeSelector helps set the cluster-wide default
+                  node selector to restrict pod placement to specific nodes. This
+                  is applied to the pods created in all namespaces and creates an
+                  intersection with any existing nodeSelectors already set on a pod,
+                  additionally constraining that pod''s selector. For example, defaultNodeSelector:
+                  "type=user-node,region=east" would set nodeSelector field in pod
+                  spec to "type=user-node,region=east" to all pods created in all
+                  namespaces. Namespaces having project-wide node selectors won''t
+                  be impacted even if this field is set. This adds an annotation section
+                  to the namespace. For example, if a new namespace is created with
+                  node-selector=''type=user-node,region=east'', the annotation openshift.io/node-selector:
+                  type=user-node,region=east gets added to the project. When the openshift.io/node-selector
+                  annotation is set on the project the value is used in preference
+                  to the value we are setting for defaultNodeSelector field. For instance,
+                  openshift.io/node-selector: "type=user-node,region=west" means that
+                  the default of "type=user-node,region=east" set in defaultNodeSelector
+                  would not be applied.'
+                type: string
+              mastersSchedulable:
+                description: 'MastersSchedulable allows masters nodes to be schedulable.
+                  When this flag is turned on, all the master nodes in the cluster
+                  will be made schedulable, so that workload pods can run on them.
+                  The default value for this field is false, meaning none of the master
+                  nodes are schedulable. Important Note: Once the workload pods start
+                  running on the master nodes, extreme care must be taken to ensure
+                  that cluster-critical control plane components are not impacted.
+                  Please turn on this field after doing due diligence.'
+                type: boolean
+              policy:
+                description: 'DEPRECATED: the scheduler Policy API has been deprecated
+                  and will be removed in a future release. policy is a reference to
+                  a ConfigMap containing scheduler policy which has user specified
+                  predicates and priorities. If this ConfigMap is not available scheduler
+                  will default to use DefaultAlgorithmProvider. The namespace for
+                  this configmap is openshift-config.'
+                properties:
+                  name:
+                    description: name is the metadata.name of the referenced config
+                      map
+                    type: string
+                required:
+                - name
+                type: object
+              profile:
+                description: "profile sets which scheduling profile should be set
+                  in order to configure scheduling decisions for new pods. \n Valid
+                  values are \"LowNodeUtilization\", \"HighNodeUtilization\", \"NoScoring\"
+                  Defaults to \"LowNodeUtilization\""
+                enum:
+                - ""
+                - LowNodeUtilization
+                - HighNodeUtilization
+                - NoScoring
+                type: string
+              profileCustomizations:
+                description: profileCustomizations contains configuration for modifying
+                  the default behavior of existing scheduler profiles.
+                properties:
+                  dynamicResourceAllocation:
+                    description: dynamicResourceAllocation allows to enable or disable
+                      dynamic resource allocation within the scheduler. Dynamic resource
+                      allocation is an API for requesting and sharing resources between
+                      pods and containers inside a pod. Third-party resource drivers
+                      are responsible for tracking and allocating resources. Different
+                      kinds of resources support arbitrary parameters for defining
+                      requirements and initialization. Valid values are Enabled, Disabled
+                      and omitted. When omitted, this means no opinion and the platform
+                      is left to choose a reasonable default, which is subject to
+                      change over time. The current default is Disabled.
+                    enum:
+                    - ""
+                    - Enabled
+                    - Disabled
+                    type: string
+                type: object
+            type: object
+          status:
+            description: status holds observed values from the cluster. They may not
+              be overridden.
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}

config/v1/0000_10_config-operator_01_scheduler.crd.yaml → config/v1/0000_10_config-operator_01_scheduler-Default.crd.yaml

@@ -6,6 +6,7 @@ metadata:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/feature-set: Default
   name: schedulers.config.openshift.io
 spec:
   group: config.openshift.io

config/v1/0000_10_config-operator_01_scheduler-TechPreviewNoUpgrade.crd.yaml

@@ -0,0 +1,130 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    api-approved.openshift.io: https://github.com/openshift/api/pull/470
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/feature-set: TechPreviewNoUpgrade
+  name: schedulers.config.openshift.io
+spec:
+  group: config.openshift.io
+  names:
+    kind: Scheduler
+    listKind: SchedulerList
+    plural: schedulers
+    singular: scheduler
+  scope: Cluster
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: "Scheduler holds cluster-wide config information to run the Kubernetes
+          Scheduler and influence its placement decisions. The canonical name for
+          this config is `cluster`. \n Compatibility level 1: Stable within a major
+          release for a minimum of 12 months or 3 minor releases (whichever is longer)."
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: spec holds user settable values for configuration
+            properties:
+              defaultNodeSelector:
+                description: 'defaultNodeSelector helps set the cluster-wide default
+                  node selector to restrict pod placement to specific nodes. This
+                  is applied to the pods created in all namespaces and creates an
+                  intersection with any existing nodeSelectors already set on a pod,
+                  additionally constraining that pod''s selector. For example, defaultNodeSelector:
+                  "type=user-node,region=east" would set nodeSelector field in pod
+                  spec to "type=user-node,region=east" to all pods created in all
+                  namespaces. Namespaces having project-wide node selectors won''t
+                  be impacted even if this field is set. This adds an annotation section
+                  to the namespace. For example, if a new namespace is created with
+                  node-selector=''type=user-node,region=east'', the annotation openshift.io/node-selector:
+                  type=user-node,region=east gets added to the project. When the openshift.io/node-selector
+                  annotation is set on the project the value is used in preference
+                  to the value we are setting for defaultNodeSelector field. For instance,
+                  openshift.io/node-selector: "type=user-node,region=west" means that
+                  the default of "type=user-node,region=east" set in defaultNodeSelector
+                  would not be applied.'
+                type: string
+              mastersSchedulable:
+                description: 'MastersSchedulable allows masters nodes to be schedulable.
+                  When this flag is turned on, all the master nodes in the cluster
+                  will be made schedulable, so that workload pods can run on them.
+                  The default value for this field is false, meaning none of the master
+                  nodes are schedulable. Important Note: Once the workload pods start
+                  running on the master nodes, extreme care must be taken to ensure
+                  that cluster-critical control plane components are not impacted.
+                  Please turn on this field after doing due diligence.'
+                type: boolean
+              policy:
+                description: 'DEPRECATED: the scheduler Policy API has been deprecated
+                  and will be removed in a future release. policy is a reference to
+                  a ConfigMap containing scheduler policy which has user specified
+                  predicates and priorities. If this ConfigMap is not available scheduler
+                  will default to use DefaultAlgorithmProvider. The namespace for
+                  this configmap is openshift-config.'
+                properties:
+                  name:
+                    description: name is the metadata.name of the referenced config
+                      map
+                    type: string
+                required:
+                - name
+                type: object
+              profile:
+                description: "profile sets which scheduling profile should be set
+                  in order to configure scheduling decisions for new pods. \n Valid
+                  values are \"LowNodeUtilization\", \"HighNodeUtilization\", \"NoScoring\"
+                  Defaults to \"LowNodeUtilization\""
+                enum:
+                - ""
+                - LowNodeUtilization
+                - HighNodeUtilization
+                - NoScoring
+                type: string
+              profileCustomizations:
+                description: profileCustomizations contains configuration for modifying
+                  the default behavior of existing scheduler profiles.
+                properties:
+                  dynamicResourceAllocation:
+                    description: dynamicResourceAllocation allows to enable or disable
+                      dynamic resource allocation within the scheduler. Dynamic resource
+                      allocation is an API for requesting and sharing resources between
+                      pods and containers inside a pod. Third-party resource drivers
+                      are responsible for tracking and allocating resources. Different
+                      kinds of resources support arbitrary parameters for defining
+                      requirements and initialization. Valid values are Enabled, Disabled
+                      and omitted. When omitted, this means no opinion and the platform
+                      is left to choose a reasonable default, which is subject to
+                      change over time. The current default is Disabled.
+                    enum:
+                    - ""
+                    - Enabled
+                    - Disabled
+                    type: string
+                type: object
+            type: object
+          status:
+            description: status holds observed values from the cluster. They may not
+              be overridden.
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}

config/v1/custom.scheduler.testsuite.yaml

@@ -0,0 +1,14 @@
+apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
+name: "[Stable] Scheduler"
+crd: 0000_10_config-operator_01_scheduler-CustomNoUpgrade.crd.yaml
+tests:
+  onCreate:
+  - name: Should be able to create a minimal Scheduler
+    initial: |
+      apiVersion: config.openshift.io/v1
+      kind: Scheduler
+      spec: {} # No spec is required for a Scheduler
+    expected: |
+      apiVersion: config.openshift.io/v1
+      kind: Scheduler
+      spec: {}

config/v1/stable.scheduler.testsuite.yaml

@@ -1,6 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "[Stable] Scheduler"
-crd: 0000_10_config-operator_01_scheduler.crd.yaml
+crd: 0000_10_config-operator_01_scheduler-Default.crd.yaml
 tests:
   onCreate:
   - name: Should be able to create a minimal Scheduler

config/v1/techpreview.scheduler.testsuite.yaml

@@ -0,0 +1,14 @@
+apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
+name: "[Stable] Scheduler"
+crd: 0000_10_config-operator_01_scheduler-TechPreviewNoUpgrade.crd.yaml
+tests:
+  onCreate:
+  - name: Should be able to create a minimal Scheduler
+    initial: |
+      apiVersion: config.openshift.io/v1
+      kind: Scheduler
+      spec: {} # No spec is required for a Scheduler
+    expected: |
+      apiVersion: config.openshift.io/v1
+      kind: Scheduler
+      spec: {}

config/v1/types_scheduling.go

@@ -42,6 +42,10 @@ type SchedulerSpec struct {
 	// Defaults to "LowNodeUtilization"
 	// +optional
 	Profile SchedulerProfile `json:"profile,omitempty"`
+	// profileCustomizations contains configuration for modifying the default behavior of existing scheduler profiles.
+	// +openshift:enable:FeatureSets=CustomNoUpgrade;TechPreviewNoUpgrade
+	// +optional
+	ProfileCustomizations ProfileCustomizations `json:"profileCustomizations"`
 	// defaultNodeSelector helps set the cluster-wide default node selector to
 	// restrict pod placement to specific nodes. This is applied to the pods
 	// created in all namespaces and creates an intersection with any existing
@@ -93,6 +97,30 @@ var (
 	NoScoring SchedulerProfile = "NoScoring"
 )
 
+// ProfileCustomizations contains various parameters for modifying the default behavior of certain profiles
+type ProfileCustomizations struct {
+	// dynamicResourceAllocation allows to enable or disable dynamic resource allocation within the scheduler.
+	// Dynamic resource allocation is an API for requesting and sharing resources between pods and containers inside a pod.
+	// Third-party resource drivers are responsible for tracking and allocating resources.
+	// Different kinds of resources support arbitrary parameters for defining requirements and initialization.
+	// Valid values are Enabled, Disabled and omitted.
+	// When omitted, this means no opinion and the platform is left to choose a reasonable default,
+	// which is subject to change over time.
+	// The current default is Disabled.
+	// +optional
+	DynamicResourceAllocation DRAEnablement `json:"dynamicResourceAllocation"`
+}
+
+// +kubebuilder:validation:Enum:="";"Enabled";"Disabled"
+type DRAEnablement string
+
+var (
+	// DRAEnablementEnabled enables dynamic resource allocation feature
+	DRAEnablementEnabled DRAEnablement = "Enabled"
+	// DRAEnablementDisabled disables dynamic resource allocation feature
+	DRAEnablementDisabled DRAEnablement = "Disabled"
+)
+
 type SchedulerStatus struct {
 }