Skip to content

Commit 4a81ad3

Browse files
authored
Merge pull request #85979 from openshift/revert-85935-apis-4-18rc0
Revert "Add OpenShift 4.18 RC0 APIs"
2 parents bab2503 + 6205e66 commit 4a81ad3

File tree

149 files changed

+8475
-27745
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+8475
-27745
lines changed

api-config.yaml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -458,9 +458,6 @@ apiMap:
458458
- kind: NetworkPolicy
459459
group: networking.k8s.io
460460
version: v1
461-
- kind: NodeSlicePool
462-
group: whereabouts.cni.cncf.io
463-
version: v1alpha1
464461
- kind: OverlappingRangeIPReservation
465462
group: whereabouts.cni.cncf.io
466463
version: v1alpha1
@@ -602,21 +599,21 @@ apiMap:
602599
- kind: CatalogSource
603600
group: operators.coreos.com
604601
version: v1alpha1
605-
- kind: ClusterCatalog
606-
group: olm.operatorframework.io
607-
version: v1
608-
- kind: ClusterExtension
609-
group: olm.operatorframework.io
610-
version: v1
602+
# - kind: ClusterCatalog
603+
# group: catalogd.operatorframework.io
604+
# version: v1alpha1
605+
# - kind: ClusterExtension
606+
# group: olm.operatorframework.io
607+
# version: v1alpha1
611608
- kind: ClusterServiceVersion
612609
group: operators.coreos.com
613610
version: v1alpha1
614611
- kind: InstallPlan
615612
group: operators.coreos.com
616613
version: v1alpha1
617-
- kind: OLM
618-
group: operator.openshift.io
619-
version: v1
614+
# - kind: OLM
615+
# group: operator.openshift.io
616+
# version: v1alpha1
620617
- kind: OLMConfig
621618
group: operators.coreos.com
622619
version: v1
@@ -680,9 +677,6 @@ apiMap:
680677
- kind: HostFirmwareSettings
681678
group: metal3.io
682679
version: v1alpha1
683-
- kind: HostUpdatePolicy
684-
group: metal3.io
685-
version: v1alpha1
686680
- kind: Metal3Remediation
687681
group: infrastructure.cluster.x-k8s.io
688682
version: v1beta1

rest_api/authorization_apis/localsubjectaccessreview-authorization-k8s-io-v1.adoc

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -150,18 +150,10 @@ Type::
150150
|===
151151
| Property | Type | Description
152152

153-
| `fieldSelector`
154-
| `object`
155-
| FieldSelectorAttributes indicates a field limited access. Webhook authors are encouraged to * ensure rawSelector and requirements are not both set * consider the requirements field if set * not try to parse or consider the rawSelector field if set. This is to avoid another CVE-2022-2880 (i.e. getting different systems to agree on how exactly to parse a query is not something we want), see https://www.oxeye.io/resources/golang-parameter-smuggling-attack for more details. For the *SubjectAccessReview endpoints of the kube-apiserver: * If rawSelector is empty and requirements are empty, the request is not limited. * If rawSelector is present and requirements are empty, the rawSelector will be parsed and limited if the parsing succeeds. * If rawSelector is empty and requirements are present, the requirements should be honored * If rawSelector is present and requirements are present, the request is invalid.
156-
157153
| `group`
158154
| `string`
159155
| Group is the API Group of the Resource. "*" means all.
160156

161-
| `labelSelector`
162-
| `object`
163-
| LabelSelectorAttributes indicates a label limited access. Webhook authors are encouraged to * ensure rawSelector and requirements are not both set * consider the requirements field if set * not try to parse or consider the rawSelector field if set. This is to avoid another CVE-2022-2880 (i.e. getting different systems to agree on how exactly to parse a query is not something we want), see https://www.oxeye.io/resources/golang-parameter-smuggling-attack for more details. For the *SubjectAccessReview endpoints of the kube-apiserver: * If rawSelector is empty and requirements are empty, the request is not limited. * If rawSelector is present and requirements are empty, the rawSelector will be parsed and limited if the parsing succeeds. * If rawSelector is empty and requirements are present, the requirements should be honored * If rawSelector is present and requirements are present, the request is invalid.
164-
165157
| `name`
166158
| `string`
167159
| Name is the name of the resource being requested for a "get" or deleted for a "delete". "" (empty) means all.
@@ -186,58 +178,6 @@ Type::
186178
| `string`
187179
| Version is the API Version of the Resource. "*" means all.
188180

189-
|===
190-
=== .spec.resourceAttributes.fieldSelector
191-
Description::
192-
+
193-
--
194-
FieldSelectorAttributes indicates a field limited access. Webhook authors are encouraged to * ensure rawSelector and requirements are not both set * consider the requirements field if set * not try to parse or consider the rawSelector field if set. This is to avoid another CVE-2022-2880 (i.e. getting different systems to agree on how exactly to parse a query is not something we want), see https://www.oxeye.io/resources/golang-parameter-smuggling-attack for more details. For the *SubjectAccessReview endpoints of the kube-apiserver: * If rawSelector is empty and requirements are empty, the request is not limited. * If rawSelector is present and requirements are empty, the rawSelector will be parsed and limited if the parsing succeeds. * If rawSelector is empty and requirements are present, the requirements should be honored * If rawSelector is present and requirements are present, the request is invalid.
195-
--
196-
197-
Type::
198-
`object`
199-
200-
201-
202-
203-
[cols="1,1,1",options="header"]
204-
|===
205-
| Property | Type | Description
206-
207-
| `rawSelector`
208-
| `string`
209-
| rawSelector is the serialization of a field selector that would be included in a query parameter. Webhook implementations are encouraged to ignore rawSelector. The kube-apiserver's *SubjectAccessReview will parse the rawSelector as long as the requirements are not present.
210-
211-
| `requirements`
212-
| xref:../objects/index.adoc#io-k8s-apimachinery-pkg-apis-meta-v1-FieldSelectorRequirement[`array (FieldSelectorRequirement)`]
213-
| requirements is the parsed interpretation of a field selector. All requirements must be met for a resource instance to match the selector. Webhook implementations should handle requirements, but how to handle them is up to the webhook. Since requirements can only limit the request, it is safe to authorize as unlimited request if the requirements are not understood.
214-
215-
|===
216-
=== .spec.resourceAttributes.labelSelector
217-
Description::
218-
+
219-
--
220-
LabelSelectorAttributes indicates a label limited access. Webhook authors are encouraged to * ensure rawSelector and requirements are not both set * consider the requirements field if set * not try to parse or consider the rawSelector field if set. This is to avoid another CVE-2022-2880 (i.e. getting different systems to agree on how exactly to parse a query is not something we want), see https://www.oxeye.io/resources/golang-parameter-smuggling-attack for more details. For the *SubjectAccessReview endpoints of the kube-apiserver: * If rawSelector is empty and requirements are empty, the request is not limited. * If rawSelector is present and requirements are empty, the rawSelector will be parsed and limited if the parsing succeeds. * If rawSelector is empty and requirements are present, the requirements should be honored * If rawSelector is present and requirements are present, the request is invalid.
221-
--
222-
223-
Type::
224-
`object`
225-
226-
227-
228-
229-
[cols="1,1,1",options="header"]
230-
|===
231-
| Property | Type | Description
232-
233-
| `rawSelector`
234-
| `string`
235-
| rawSelector is the serialization of a field selector that would be included in a query parameter. Webhook implementations are encouraged to ignore rawSelector. The kube-apiserver's *SubjectAccessReview will parse the rawSelector as long as the requirements are not present.
236-
237-
| `requirements`
238-
| xref:../objects/index.adoc#io-k8s-apimachinery-pkg-apis-meta-v1-LabelSelectorRequirement[`array (LabelSelectorRequirement)`]
239-
| requirements is the parsed interpretation of a label selector. All requirements must be met for a resource instance to match the selector. Webhook implementations should handle requirements, but how to handle them is up to the webhook. Since requirements can only limit the request, it is safe to authorize as unlimited request if the requirements are not understood.
240-
241181
|===
242182
=== .status
243183
Description::

rest_api/authorization_apis/selfsubjectaccessreview-authorization-k8s-io-v1.adoc

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -117,18 +117,10 @@ Type::
117117
|===
118118
| Property | Type | Description
119119

120-
| `fieldSelector`
121-
| `object`
122-
| FieldSelectorAttributes indicates a field limited access. Webhook authors are encouraged to * ensure rawSelector and requirements are not both set * consider the requirements field if set * not try to parse or consider the rawSelector field if set. This is to avoid another CVE-2022-2880 (i.e. getting different systems to agree on how exactly to parse a query is not something we want), see https://www.oxeye.io/resources/golang-parameter-smuggling-attack for more details. For the *SubjectAccessReview endpoints of the kube-apiserver: * If rawSelector is empty and requirements are empty, the request is not limited. * If rawSelector is present and requirements are empty, the rawSelector will be parsed and limited if the parsing succeeds. * If rawSelector is empty and requirements are present, the requirements should be honored * If rawSelector is present and requirements are present, the request is invalid.
123-
124120
| `group`
125121
| `string`
126122
| Group is the API Group of the Resource. "*" means all.
127123

128-
| `labelSelector`
129-
| `object`
130-
| LabelSelectorAttributes indicates a label limited access. Webhook authors are encouraged to * ensure rawSelector and requirements are not both set * consider the requirements field if set * not try to parse or consider the rawSelector field if set. This is to avoid another CVE-2022-2880 (i.e. getting different systems to agree on how exactly to parse a query is not something we want), see https://www.oxeye.io/resources/golang-parameter-smuggling-attack for more details. For the *SubjectAccessReview endpoints of the kube-apiserver: * If rawSelector is empty and requirements are empty, the request is not limited. * If rawSelector is present and requirements are empty, the rawSelector will be parsed and limited if the parsing succeeds. * If rawSelector is empty and requirements are present, the requirements should be honored * If rawSelector is present and requirements are present, the request is invalid.
131-
132124
| `name`
133125
| `string`
134126
| Name is the name of the resource being requested for a "get" or deleted for a "delete". "" (empty) means all.
@@ -153,58 +145,6 @@ Type::
153145
| `string`
154146
| Version is the API Version of the Resource. "*" means all.
155147

156-
|===
157-
=== .spec.resourceAttributes.fieldSelector
158-
Description::
159-
+
160-
--
161-
FieldSelectorAttributes indicates a field limited access. Webhook authors are encouraged to * ensure rawSelector and requirements are not both set * consider the requirements field if set * not try to parse or consider the rawSelector field if set. This is to avoid another CVE-2022-2880 (i.e. getting different systems to agree on how exactly to parse a query is not something we want), see https://www.oxeye.io/resources/golang-parameter-smuggling-attack for more details. For the *SubjectAccessReview endpoints of the kube-apiserver: * If rawSelector is empty and requirements are empty, the request is not limited. * If rawSelector is present and requirements are empty, the rawSelector will be parsed and limited if the parsing succeeds. * If rawSelector is empty and requirements are present, the requirements should be honored * If rawSelector is present and requirements are present, the request is invalid.
162-
--
163-
164-
Type::
165-
`object`
166-
167-
168-
169-
170-
[cols="1,1,1",options="header"]
171-
|===
172-
| Property | Type | Description
173-
174-
| `rawSelector`
175-
| `string`
176-
| rawSelector is the serialization of a field selector that would be included in a query parameter. Webhook implementations are encouraged to ignore rawSelector. The kube-apiserver's *SubjectAccessReview will parse the rawSelector as long as the requirements are not present.
177-
178-
| `requirements`
179-
| xref:../objects/index.adoc#io-k8s-apimachinery-pkg-apis-meta-v1-FieldSelectorRequirement[`array (FieldSelectorRequirement)`]
180-
| requirements is the parsed interpretation of a field selector. All requirements must be met for a resource instance to match the selector. Webhook implementations should handle requirements, but how to handle them is up to the webhook. Since requirements can only limit the request, it is safe to authorize as unlimited request if the requirements are not understood.
181-
182-
|===
183-
=== .spec.resourceAttributes.labelSelector
184-
Description::
185-
+
186-
--
187-
LabelSelectorAttributes indicates a label limited access. Webhook authors are encouraged to * ensure rawSelector and requirements are not both set * consider the requirements field if set * not try to parse or consider the rawSelector field if set. This is to avoid another CVE-2022-2880 (i.e. getting different systems to agree on how exactly to parse a query is not something we want), see https://www.oxeye.io/resources/golang-parameter-smuggling-attack for more details. For the *SubjectAccessReview endpoints of the kube-apiserver: * If rawSelector is empty and requirements are empty, the request is not limited. * If rawSelector is present and requirements are empty, the rawSelector will be parsed and limited if the parsing succeeds. * If rawSelector is empty and requirements are present, the requirements should be honored * If rawSelector is present and requirements are present, the request is invalid.
188-
--
189-
190-
Type::
191-
`object`
192-
193-
194-
195-
196-
[cols="1,1,1",options="header"]
197-
|===
198-
| Property | Type | Description
199-
200-
| `rawSelector`
201-
| `string`
202-
| rawSelector is the serialization of a field selector that would be included in a query parameter. Webhook implementations are encouraged to ignore rawSelector. The kube-apiserver's *SubjectAccessReview will parse the rawSelector as long as the requirements are not present.
203-
204-
| `requirements`
205-
| xref:../objects/index.adoc#io-k8s-apimachinery-pkg-apis-meta-v1-LabelSelectorRequirement[`array (LabelSelectorRequirement)`]
206-
| requirements is the parsed interpretation of a label selector. All requirements must be met for a resource instance to match the selector. Webhook implementations should handle requirements, but how to handle them is up to the webhook. Since requirements can only limit the request, it is safe to authorize as unlimited request if the requirements are not understood.
207-
208148
|===
209149
=== .status
210150
Description::

rest_api/authorization_apis/subjectaccessreview-authorization-k8s-io-v1.adoc

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -150,18 +150,10 @@ Type::
150150
|===
151151
| Property | Type | Description
152152

153-
| `fieldSelector`
154-
| `object`
155-
| FieldSelectorAttributes indicates a field limited access. Webhook authors are encouraged to * ensure rawSelector and requirements are not both set * consider the requirements field if set * not try to parse or consider the rawSelector field if set. This is to avoid another CVE-2022-2880 (i.e. getting different systems to agree on how exactly to parse a query is not something we want), see https://www.oxeye.io/resources/golang-parameter-smuggling-attack for more details. For the *SubjectAccessReview endpoints of the kube-apiserver: * If rawSelector is empty and requirements are empty, the request is not limited. * If rawSelector is present and requirements are empty, the rawSelector will be parsed and limited if the parsing succeeds. * If rawSelector is empty and requirements are present, the requirements should be honored * If rawSelector is present and requirements are present, the request is invalid.
156-
157153
| `group`
158154
| `string`
159155
| Group is the API Group of the Resource. "*" means all.
160156

161-
| `labelSelector`
162-
| `object`
163-
| LabelSelectorAttributes indicates a label limited access. Webhook authors are encouraged to * ensure rawSelector and requirements are not both set * consider the requirements field if set * not try to parse or consider the rawSelector field if set. This is to avoid another CVE-2022-2880 (i.e. getting different systems to agree on how exactly to parse a query is not something we want), see https://www.oxeye.io/resources/golang-parameter-smuggling-attack for more details. For the *SubjectAccessReview endpoints of the kube-apiserver: * If rawSelector is empty and requirements are empty, the request is not limited. * If rawSelector is present and requirements are empty, the rawSelector will be parsed and limited if the parsing succeeds. * If rawSelector is empty and requirements are present, the requirements should be honored * If rawSelector is present and requirements are present, the request is invalid.
164-
165157
| `name`
166158
| `string`
167159
| Name is the name of the resource being requested for a "get" or deleted for a "delete". "" (empty) means all.
@@ -186,58 +178,6 @@ Type::
186178
| `string`
187179
| Version is the API Version of the Resource. "*" means all.
188180

189-
|===
190-
=== .spec.resourceAttributes.fieldSelector
191-
Description::
192-
+
193-
--
194-
FieldSelectorAttributes indicates a field limited access. Webhook authors are encouraged to * ensure rawSelector and requirements are not both set * consider the requirements field if set * not try to parse or consider the rawSelector field if set. This is to avoid another CVE-2022-2880 (i.e. getting different systems to agree on how exactly to parse a query is not something we want), see https://www.oxeye.io/resources/golang-parameter-smuggling-attack for more details. For the *SubjectAccessReview endpoints of the kube-apiserver: * If rawSelector is empty and requirements are empty, the request is not limited. * If rawSelector is present and requirements are empty, the rawSelector will be parsed and limited if the parsing succeeds. * If rawSelector is empty and requirements are present, the requirements should be honored * If rawSelector is present and requirements are present, the request is invalid.
195-
--
196-
197-
Type::
198-
`object`
199-
200-
201-
202-
203-
[cols="1,1,1",options="header"]
204-
|===
205-
| Property | Type | Description
206-
207-
| `rawSelector`
208-
| `string`
209-
| rawSelector is the serialization of a field selector that would be included in a query parameter. Webhook implementations are encouraged to ignore rawSelector. The kube-apiserver's *SubjectAccessReview will parse the rawSelector as long as the requirements are not present.
210-
211-
| `requirements`
212-
| xref:../objects/index.adoc#io-k8s-apimachinery-pkg-apis-meta-v1-FieldSelectorRequirement[`array (FieldSelectorRequirement)`]
213-
| requirements is the parsed interpretation of a field selector. All requirements must be met for a resource instance to match the selector. Webhook implementations should handle requirements, but how to handle them is up to the webhook. Since requirements can only limit the request, it is safe to authorize as unlimited request if the requirements are not understood.
214-
215-
|===
216-
=== .spec.resourceAttributes.labelSelector
217-
Description::
218-
+
219-
--
220-
LabelSelectorAttributes indicates a label limited access. Webhook authors are encouraged to * ensure rawSelector and requirements are not both set * consider the requirements field if set * not try to parse or consider the rawSelector field if set. This is to avoid another CVE-2022-2880 (i.e. getting different systems to agree on how exactly to parse a query is not something we want), see https://www.oxeye.io/resources/golang-parameter-smuggling-attack for more details. For the *SubjectAccessReview endpoints of the kube-apiserver: * If rawSelector is empty and requirements are empty, the request is not limited. * If rawSelector is present and requirements are empty, the rawSelector will be parsed and limited if the parsing succeeds. * If rawSelector is empty and requirements are present, the requirements should be honored * If rawSelector is present and requirements are present, the request is invalid.
221-
--
222-
223-
Type::
224-
`object`
225-
226-
227-
228-
229-
[cols="1,1,1",options="header"]
230-
|===
231-
| Property | Type | Description
232-
233-
| `rawSelector`
234-
| `string`
235-
| rawSelector is the serialization of a field selector that would be included in a query parameter. Webhook implementations are encouraged to ignore rawSelector. The kube-apiserver's *SubjectAccessReview will parse the rawSelector as long as the requirements are not present.
236-
237-
| `requirements`
238-
| xref:../objects/index.adoc#io-k8s-apimachinery-pkg-apis-meta-v1-LabelSelectorRequirement[`array (LabelSelectorRequirement)`]
239-
| requirements is the parsed interpretation of a label selector. All requirements must be met for a resource instance to match the selector. Webhook implementations should handle requirements, but how to handle them is up to the webhook. Since requirements can only limit the request, it is safe to authorize as unlimited request if the requirements are not understood.
240-
241181
|===
242182
=== .status
243183
Description::

0 commit comments

Comments
 (0)