Skip to content

Commit 5ac3982

Browse files
committed
Enable DRA(DynamicResourceAllocation) by default from OCP 4.21
- DynamicResourceAllocation feature has been graduated to GA in the upstream i.e. k8s 1.34 - Removed the downstream featuregate DynamicResourceAllocation so that this is enabled by default for all the cluster types - Remove the downstream featuregate dependency from the scheduler.config's ProfileCustomizations field - make update Signed-off-by: Sai Ramesh Vanka <[email protected]>
1 parent f203425 commit 5ac3982

24 files changed

+29
-302
lines changed

config/v1/tests/schedulers.config.openshift.io/DynamicResourceAllocation.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.

config/v1/types_scheduling.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ type SchedulerSpec struct {
4848
// +optional
4949
Profile SchedulerProfile `json:"profile,omitempty"`
5050
// profileCustomizations contains configuration for modifying the default behavior of existing scheduler profiles.
51-
// Deprecated: no longer needed, since DRA is GA starting with 4.21, and
52-
// is enabled by' default in the cluster, this field will be removed in 4.24.
53-
// +openshift:enable:FeatureGate=DynamicResourceAllocation
51+
// Deprecated: DRA is GA and enabled by default across all clusters starting with 4.21
52+
// this configuration field is maintained only for HyperShift compatibility and will be removed in 4.24.
5453
// +openshift:enable:FeatureGate=HyperShiftOnlyDynamicResourceAllocation
5554
// +optional
5655
ProfileCustomizations ProfileCustomizations `json:"profileCustomizations"`
@@ -114,7 +113,7 @@ type ProfileCustomizations struct {
114113
// Valid values are Enabled, Disabled and omitted.
115114
// When omitted, this means no opinion and the platform is left to choose a reasonable default,
116115
// which is subject to change over time.
117-
// The current default is Disabled.
116+
// The current default is Enabled as the related feature gate is graduated to GA in k8s 1.34 upstream.
118117
// +optional
119118
DynamicResourceAllocation DRAEnablement `json:"dynamicResourceAllocation"`
120119
}

config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_schedulers-Hypershift.crd.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ spec:
110110
profileCustomizations:
111111
description: |-
112112
profileCustomizations contains configuration for modifying the default behavior of existing scheduler profiles.
113-
Deprecated: no longer needed, since DRA is GA starting with 4.21, and
114-
is enabled by' default in the cluster, this field will be removed in 4.24.
113+
Deprecated: DRA is GA and enabled by default across all clusters starting with 4.21
114+
this configuration field is maintained only for HyperShift compatibility and will be removed in 4.24.
115115
properties:
116116
dynamicResourceAllocation:
117117
description: |-
@@ -122,7 +122,7 @@ spec:
122122
Valid values are Enabled, Disabled and omitted.
123123
When omitted, this means no opinion and the platform is left to choose a reasonable default,
124124
which is subject to change over time.
125-
The current default is Disabled.
125+
The current default is Enabled as the related feature gate is graduated to GA in k8s 1.34 upstream.
126126
enum:
127127
- ""
128128
- Enabled

config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_schedulers-SelfManagedHA-CustomNoUpgrade.crd.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ spec:
111111
profileCustomizations:
112112
description: |-
113113
profileCustomizations contains configuration for modifying the default behavior of existing scheduler profiles.
114-
Deprecated: no longer needed, since DRA is GA starting with 4.21, and
115-
is enabled by' default in the cluster, this field will be removed in 4.24.
114+
Deprecated: DRA is GA and enabled by default across all clusters starting with 4.21
115+
this configuration field is maintained only for HyperShift compatibility and will be removed in 4.24.
116116
properties:
117117
dynamicResourceAllocation:
118118
description: |-
@@ -123,7 +123,7 @@ spec:
123123
Valid values are Enabled, Disabled and omitted.
124124
When omitted, this means no opinion and the platform is left to choose a reasonable default,
125125
which is subject to change over time.
126-
The current default is Disabled.
126+
The current default is Enabled as the related feature gate is graduated to GA in k8s 1.34 upstream.
127127
enum:
128128
- ""
129129
- Enabled

config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_schedulers-SelfManagedHA-DevPreviewNoUpgrade.crd.yaml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -108,28 +108,6 @@ spec:
108108
- HighNodeUtilization
109109
- NoScoring
110110
type: string
111-
profileCustomizations:
112-
description: |-
113-
profileCustomizations contains configuration for modifying the default behavior of existing scheduler profiles.
114-
Deprecated: no longer needed, since DRA is GA starting with 4.21, and
115-
is enabled by' default in the cluster, this field will be removed in 4.24.
116-
properties:
117-
dynamicResourceAllocation:
118-
description: |-
119-
dynamicResourceAllocation allows to enable or disable dynamic resource allocation within the scheduler.
120-
Dynamic resource allocation is an API for requesting and sharing resources between pods and containers inside a pod.
121-
Third-party resource drivers are responsible for tracking and allocating resources.
122-
Different kinds of resources support arbitrary parameters for defining requirements and initialization.
123-
Valid values are Enabled, Disabled and omitted.
124-
When omitted, this means no opinion and the platform is left to choose a reasonable default,
125-
which is subject to change over time.
126-
The current default is Disabled.
127-
enum:
128-
- ""
129-
- Enabled
130-
- Disabled
131-
type: string
132-
type: object
133111
type: object
134112
status:
135113
description: status holds observed values from the cluster. They may not

config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_schedulers-SelfManagedHA-TechPreviewNoUpgrade.crd.yaml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -108,28 +108,6 @@ spec:
108108
- HighNodeUtilization
109109
- NoScoring
110110
type: string
111-
profileCustomizations:
112-
description: |-
113-
profileCustomizations contains configuration for modifying the default behavior of existing scheduler profiles.
114-
Deprecated: no longer needed, since DRA is GA starting with 4.21, and
115-
is enabled by' default in the cluster, this field will be removed in 4.24.
116-
properties:
117-
dynamicResourceAllocation:
118-
description: |-
119-
dynamicResourceAllocation allows to enable or disable dynamic resource allocation within the scheduler.
120-
Dynamic resource allocation is an API for requesting and sharing resources between pods and containers inside a pod.
121-
Third-party resource drivers are responsible for tracking and allocating resources.
122-
Different kinds of resources support arbitrary parameters for defining requirements and initialization.
123-
Valid values are Enabled, Disabled and omitted.
124-
When omitted, this means no opinion and the platform is left to choose a reasonable default,
125-
which is subject to change over time.
126-
The current default is Disabled.
127-
enum:
128-
- ""
129-
- Enabled
130-
- Disabled
131-
type: string
132-
type: object
133111
type: object
134112
status:
135113
description: status holds observed values from the cluster. They may not

config/v1/zz_generated.featuregated-crd-manifests.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,6 @@ schedulers.config.openshift.io:
575575
Capability: ""
576576
Category: ""
577577
FeatureGates:
578-
- DynamicResourceAllocation
579578
- HyperShiftOnlyDynamicResourceAllocation
580579
FilenameOperatorName: config-operator
581580
FilenameOperatorOrdering: "01"

config/v1/zz_generated.featuregated-crd-manifests/schedulers.config.openshift.io/DynamicResourceAllocation.yaml

Lines changed: 0 additions & 145 deletions
This file was deleted.

config/v1/zz_generated.featuregated-crd-manifests/schedulers.config.openshift.io/HyperShiftOnlyDynamicResourceAllocation.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ spec:
112112
profileCustomizations:
113113
description: |-
114114
profileCustomizations contains configuration for modifying the default behavior of existing scheduler profiles.
115-
Deprecated: no longer needed, since DRA is GA starting with 4.21, and
116-
is enabled by' default in the cluster, this field will be removed in 4.24.
115+
Deprecated: DRA is GA and enabled by default across all clusters starting with 4.21
116+
this configuration field is maintained only for HyperShift compatibility and will be removed in 4.24.
117117
properties:
118118
dynamicResourceAllocation:
119119
description: |-
@@ -124,7 +124,7 @@ spec:
124124
Valid values are Enabled, Disabled and omitted.
125125
When omitted, this means no opinion and the platform is left to choose a reasonable default,
126126
which is subject to change over time.
127-
The current default is Disabled.
127+
The current default is Enabled as the related feature gate is graduated to GA in k8s 1.34 upstream.
128128
enum:
129129
- ""
130130
- Enabled

0 commit comments

Comments
 (0)