Skip to content

Commit 5a73fad

Browse files
committed
run make update
1 parent 79edc2a commit 5a73fad

22 files changed

+439
-26
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ metadata:
55
api-approved.openshift.io: https://github.com/openshift/api/pull/470
66
api.openshift.io/merged-by-featuregates: "true"
77
include.release.openshift.io/ibm-cloud-managed: "true"
8-
include.release.openshift.io/self-managed-high-availability: "true"
98
release.openshift.io/bootstrap-required: "true"
10-
release.openshift.io/feature-set: DevPreviewNoUpgrade
119
name: schedulers.config.openshift.io
1210
spec:
1311
group: config.openshift.io
@@ -110,8 +108,10 @@ spec:
110108
- NoScoring
111109
type: string
112110
profileCustomizations:
113-
description: profileCustomizations contains configuration for modifying
114-
the default behavior of existing scheduler profiles.
111+
description: |-
112+
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.
115115
properties:
116116
dynamicResourceAllocation:
117117
description: |-

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ metadata:
44
annotations:
55
api-approved.openshift.io: https://github.com/openshift/api/pull/470
66
api.openshift.io/merged-by-featuregates: "true"
7-
include.release.openshift.io/ibm-cloud-managed: "true"
87
include.release.openshift.io/self-managed-high-availability: "true"
98
release.openshift.io/bootstrap-required: "true"
109
release.openshift.io/feature-set: CustomNoUpgrade
@@ -110,8 +109,10 @@ spec:
110109
- NoScoring
111110
type: string
112111
profileCustomizations:
113-
description: profileCustomizations contains configuration for modifying
114-
the default behavior of existing scheduler profiles.
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.
115116
properties:
116117
dynamicResourceAllocation:
117118
description: |-

config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_schedulers-Default.crd.yaml renamed to config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_schedulers-SelfManagedHA-Default.crd.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ metadata:
44
annotations:
55
api-approved.openshift.io: https://github.com/openshift/api/pull/470
66
api.openshift.io/merged-by-featuregates: "true"
7-
include.release.openshift.io/ibm-cloud-managed: "true"
87
include.release.openshift.io/self-managed-high-availability: "true"
98
release.openshift.io/bootstrap-required: "true"
109
release.openshift.io/feature-set: Default

payload-manifests/crds/0000_10_config-operator_01_schedulers-DevPreviewNoUpgrade.crd.yaml renamed to config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_schedulers-SelfManagedHA-DevPreviewNoUpgrade.crd.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ metadata:
44
annotations:
55
api-approved.openshift.io: https://github.com/openshift/api/pull/470
66
api.openshift.io/merged-by-featuregates: "true"
7-
include.release.openshift.io/ibm-cloud-managed: "true"
87
include.release.openshift.io/self-managed-high-availability: "true"
98
release.openshift.io/bootstrap-required: "true"
109
release.openshift.io/feature-set: DevPreviewNoUpgrade
@@ -110,8 +109,10 @@ spec:
110109
- NoScoring
111110
type: string
112111
profileCustomizations:
113-
description: profileCustomizations contains configuration for modifying
114-
the default behavior of existing scheduler profiles.
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.
115116
properties:
116117
dynamicResourceAllocation:
117118
description: |-

payload-manifests/crds/0000_10_config-operator_01_schedulers-TechPreviewNoUpgrade.crd.yaml renamed to config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_schedulers-SelfManagedHA-TechPreviewNoUpgrade.crd.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ metadata:
44
annotations:
55
api-approved.openshift.io: https://github.com/openshift/api/pull/470
66
api.openshift.io/merged-by-featuregates: "true"
7-
include.release.openshift.io/ibm-cloud-managed: "true"
87
include.release.openshift.io/self-managed-high-availability: "true"
98
release.openshift.io/bootstrap-required: "true"
109
release.openshift.io/feature-set: TechPreviewNoUpgrade
@@ -110,8 +109,10 @@ spec:
110109
- NoScoring
111110
type: string
112111
profileCustomizations:
113-
description: profileCustomizations contains configuration for modifying
114-
the default behavior of existing scheduler profiles.
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.
115116
properties:
116117
dynamicResourceAllocation:
117118
description: |-

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,7 @@ schedulers.config.openshift.io:
576576
Category: ""
577577
FeatureGates:
578578
- DynamicResourceAllocation
579+
- HyperShiftOnlyDynamicResourceAllocation
579580
FilenameOperatorName: config-operator
580581
FilenameOperatorOrdering: "01"
581582
FilenameRunLevel: "0000_10"

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,10 @@ spec:
110110
- NoScoring
111111
type: string
112112
profileCustomizations:
113-
description: profileCustomizations contains configuration for modifying
114-
the default behavior of existing scheduler profiles.
113+
description: |-
114+
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.
115117
properties:
116118
dynamicResourceAllocation:
117119
description: |-
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
annotations:
5+
api-approved.openshift.io: https://github.com/openshift/api/pull/470
6+
api.openshift.io/filename-cvo-runlevel: "0000_10"
7+
api.openshift.io/filename-operator: config-operator
8+
api.openshift.io/filename-ordering: "01"
9+
feature-gate.release.openshift.io/HyperShiftOnlyDynamicResourceAllocation: "true"
10+
release.openshift.io/bootstrap-required: "true"
11+
name: schedulers.config.openshift.io
12+
spec:
13+
group: config.openshift.io
14+
names:
15+
kind: Scheduler
16+
listKind: SchedulerList
17+
plural: schedulers
18+
singular: scheduler
19+
scope: Cluster
20+
versions:
21+
- name: v1
22+
schema:
23+
openAPIV3Schema:
24+
description: |-
25+
Scheduler holds cluster-wide config information to run the Kubernetes Scheduler
26+
and influence its placement decisions. The canonical name for this config is `cluster`.
27+
28+
Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
29+
properties:
30+
apiVersion:
31+
description: |-
32+
APIVersion defines the versioned schema of this representation of an object.
33+
Servers should convert recognized schemas to the latest internal value, and
34+
may reject unrecognized values.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
36+
type: string
37+
kind:
38+
description: |-
39+
Kind is a string value representing the REST resource this object represents.
40+
Servers may infer this from the endpoint the client submits requests to.
41+
Cannot be updated.
42+
In CamelCase.
43+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
44+
type: string
45+
metadata:
46+
type: object
47+
spec:
48+
description: spec holds user settable values for configuration
49+
properties:
50+
defaultNodeSelector:
51+
description: |-
52+
defaultNodeSelector helps set the cluster-wide default node selector to
53+
restrict pod placement to specific nodes. This is applied to the pods
54+
created in all namespaces and creates an intersection with any existing
55+
nodeSelectors already set on a pod, additionally constraining that pod's selector.
56+
For example,
57+
defaultNodeSelector: "type=user-node,region=east" would set nodeSelector
58+
field in pod spec to "type=user-node,region=east" to all pods created
59+
in all namespaces. Namespaces having project-wide node selectors won't be
60+
impacted even if this field is set. This adds an annotation section to
61+
the namespace.
62+
For example, if a new namespace is created with
63+
node-selector='type=user-node,region=east',
64+
the annotation openshift.io/node-selector: type=user-node,region=east
65+
gets added to the project. When the openshift.io/node-selector annotation
66+
is set on the project the value is used in preference to the value we are setting
67+
for defaultNodeSelector field.
68+
For instance,
69+
openshift.io/node-selector: "type=user-node,region=west" means
70+
that the default of "type=user-node,region=east" set in defaultNodeSelector
71+
would not be applied.
72+
type: string
73+
mastersSchedulable:
74+
description: |-
75+
mastersSchedulable allows masters nodes to be schedulable. When this flag is
76+
turned on, all the master nodes in the cluster will be made schedulable,
77+
so that workload pods can run on them. The default value for this field is false,
78+
meaning none of the master nodes are schedulable.
79+
Important Note: Once the workload pods start running on the master nodes,
80+
extreme care must be taken to ensure that cluster-critical control plane components
81+
are not impacted.
82+
Please turn on this field after doing due diligence.
83+
type: boolean
84+
policy:
85+
description: |-
86+
DEPRECATED: the scheduler Policy API has been deprecated and will be removed in a future release.
87+
policy is a reference to a ConfigMap containing scheduler policy which has
88+
user specified predicates and priorities. If this ConfigMap is not available
89+
scheduler will default to use DefaultAlgorithmProvider.
90+
The namespace for this configmap is openshift-config.
91+
properties:
92+
name:
93+
description: name is the metadata.name of the referenced config
94+
map
95+
type: string
96+
required:
97+
- name
98+
type: object
99+
profile:
100+
description: |-
101+
profile sets which scheduling profile should be set in order to configure scheduling
102+
decisions for new pods.
103+
104+
Valid values are "LowNodeUtilization", "HighNodeUtilization", "NoScoring"
105+
Defaults to "LowNodeUtilization"
106+
enum:
107+
- ""
108+
- LowNodeUtilization
109+
- HighNodeUtilization
110+
- NoScoring
111+
type: string
112+
profileCustomizations:
113+
description: |-
114+
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.
117+
properties:
118+
dynamicResourceAllocation:
119+
description: |-
120+
dynamicResourceAllocation allows to enable or disable dynamic resource allocation within the scheduler.
121+
Dynamic resource allocation is an API for requesting and sharing resources between pods and containers inside a pod.
122+
Third-party resource drivers are responsible for tracking and allocating resources.
123+
Different kinds of resources support arbitrary parameters for defining requirements and initialization.
124+
Valid values are Enabled, Disabled and omitted.
125+
When omitted, this means no opinion and the platform is left to choose a reasonable default,
126+
which is subject to change over time.
127+
The current default is Disabled.
128+
enum:
129+
- ""
130+
- Enabled
131+
- Disabled
132+
type: string
133+
type: object
134+
type: object
135+
status:
136+
description: status holds observed values from the cluster. They may not
137+
be overridden.
138+
type: object
139+
required:
140+
- spec
141+
type: object
142+
served: true
143+
storage: true
144+
subresources:
145+
status: {}

config/v1/zz_generated.swagger_doc_generated.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

features.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
| NewOLMPreflightPermissionChecks| | | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> |
1616
| NoRegistryClusterInstall| | | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> |
1717
| ProvisioningRequestAvailable| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | |
18+
| HyperShiftOnlyDynamicResourceAllocation| <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | |
1819
| NewOLM| | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> |
1920
| NewOLMWebhookProviderOpenshiftServiceCA| | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> |
2021
| AWSClusterHostedDNS| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |

0 commit comments

Comments
 (0)