Skip to content

Commit 637571e

Browse files
authored
Merge pull request #93886 from jab-rh/apis-4-19rc1
Build OpenShift 4.19 APIs
2 parents a76dc13 + d0eb9b7 commit 637571e

File tree

97 files changed

+22230
-1670
lines changed

Some content is hidden

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

97 files changed

+22230
-1670
lines changed

_topic_maps/_topic_map.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4092,6 +4092,10 @@ Topics:
40924092
File: machine-machine-openshift-io-v1beta1
40934093
- Name: 'MachineSet [machine.openshift.io/v1beta1]'
40944094
File: machineset-machine-openshift-io-v1beta1
4095+
- Name: 'MachineOSBuild [machineconfiguration.openshift.io/v1]'
4096+
File: machineosbuild-machineconfiguration-openshift-io-v1
4097+
- Name: 'MachineOSConfig [machineconfiguration.openshift.io/v1]'
4098+
File: machineosconfig-machineconfiguration-openshift-io-v1
40954099
- Name: Metadata APIs
40964100
Dir: metadata_apis
40974101
Topics:
@@ -4149,6 +4153,8 @@ Topics:
41494153
Topics:
41504154
- Name: About Network APIs
41514155
File: network-apis-index
4156+
- Name: 'ClusterUserDefinedNetwork [k8s.ovn.org/v1]'
4157+
File: clusteruserdefinednetwork-k8s-ovn-org-v1
41524158
- Name: 'AdminNetworkPolicy [policy.networking.k8s.io/v1alpha1]'
41534159
File: adminnetworkpolicy-policy-networking-k8s-io-v1alpha1
41544160
- Name: 'AdminPolicyBasedExternalRoute [k8s.ovn.org/v1]'
@@ -4171,10 +4177,20 @@ Topics:
41714177
File: endpointslice-discovery-k8s-io-v1
41724178
- Name: 'EgressRouter [network.operator.openshift.io/v1]'
41734179
File: egressrouter-network-operator-openshift-io-v1
4180+
- Name: 'GRPCRoute [gateway.networking.k8s.io/v1]'
4181+
File: grpcroute-gateway-networking-k8s-io-v1
4182+
- Name: 'Gateway [gateway.networking.k8s.io/v1]'
4183+
File: gateway-gateway-networking-k8s-io-v1
4184+
- Name: 'GatewayClass [gateway.networking.k8s.io/v1]'
4185+
File: gatewayclass-gateway-networking-k8s-io-v1
4186+
- Name: 'HTTPRoute [gateway.networking.k8s.io/v1]'
4187+
File: httproute-gateway-networking-k8s-io-v1
41744188
- Name: 'Ingress [networking.k8s.io/v1]'
41754189
File: ingress-networking-k8s-io-v1
41764190
- Name: 'IngressClass [networking.k8s.io/v1]'
41774191
File: ingressclass-networking-k8s-io-v1
4192+
- Name: 'IPAMClaim [k8s.cni.cncf.io/v1alpha1]'
4193+
File: ipamclaim-k8s-cni-cncf-io-v1alpha1
41784194
- Name: 'IPPool [whereabouts.cni.cncf.io/v1alpha1]'
41794195
File: ippool-whereabouts-cni-cncf-io-v1alpha1
41804196
- Name: 'MultiNetworkPolicy [k8s.cni.cncf.io/v1beta1]'
@@ -4183,14 +4199,20 @@ Topics:
41834199
File: networkattachmentdefinition-k8s-cni-cncf-io-v1
41844200
- Name: 'NetworkPolicy [networking.k8s.io/v1]'
41854201
File: networkpolicy-networking-k8s-io-v1
4202+
- Name: 'NodeSlicePool [whereabouts.cni.cncf.io/v1alpha1]'
4203+
File: nodeslicepool-whereabouts-cni-cncf-io-v1alpha1
41864204
- Name: 'OverlappingRangeIPReservation [whereabouts.cni.cncf.io/v1alpha1]'
41874205
File: overlappingrangeipreservation-whereabouts-cni-cncf-io-v1alpha1
41884206
- Name: 'PodNetworkConnectivityCheck [controlplane.operator.openshift.io/v1alpha1]'
41894207
File: podnetworkconnectivitycheck-controlplane-operator-openshift-io-v1alpha1
4208+
- Name: 'ReferenceGrant [gateway.networking.k8s.io/v1beta1]'
4209+
File: referencegrant-gateway-networking-k8s-io-v1beta1
41904210
- Name: 'Route [route.openshift.io/v1]'
41914211
File: route-route-openshift-io-v1
41924212
- Name: 'Service [undefined/v1]'
41934213
File: service-v1
4214+
- Name: 'UserDefinedNetwork [k8s.ovn.org/v1]'
4215+
File: userdefinednetwork-k8s-ovn-org-v1
41944216
- Name: Node APIs
41954217
Dir: node_apis
41964218
Topics:
@@ -4285,6 +4307,10 @@ Topics:
42854307
File: operatorhub-apis-index
42864308
- Name: 'CatalogSource [operators.coreos.com/v1alpha1]'
42874309
File: catalogsource-operators-coreos-com-v1alpha1
4310+
- Name: 'ClusterCatalog [olm.operatorframework.io/v1]'
4311+
File: clustercatalog-olm-operatorframework-io-v1
4312+
- Name: 'ClusterExtension [olm.operatorframework.io/v1]'
4313+
File: clusterextension-olm-operatorframework-io-v1
42884314
- Name: 'ClusterServiceVersion [operators.coreos.com/v1alpha1]'
42894315
File: clusterserviceversion-operators-coreos-com-v1alpha1
42904316
- Name: 'InstallPlan [operators.coreos.com/v1alpha1]'
@@ -4338,6 +4364,8 @@ Topics:
43384364
File: hostfirmwarecomponents-metal3-io-v1alpha1
43394365
- Name: 'HostFirmwareSettings [metal3.io/v1alpha1]'
43404366
File: hostfirmwaresettings-metal3-io-v1alpha1
4367+
- Name: 'HostUpdatePolicy [metal3.io/v1alpha1]'
4368+
File: hostupdatepolicy-metal3-io-v1alpha1
43414369
- Name: 'Metal3Remediation [infrastructure.cluster.x-k8s.io/v1beta1]'
43424370
File: metal3remediation-infrastructure-cluster-x-k8s-io-v1beta1
43434371
- Name: 'Metal3RemediationTemplate [infrastructure.cluster.x-k8s.io/v1beta1]'

api-config.yaml

Lines changed: 42 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -307,12 +307,12 @@ apiMap:
307307
# - kind: MachineConfigNode
308308
# group: machineconfiguration.openshift.io
309309
# version: v1alpha1
310-
# - kind: MachineOSBuild
311-
# group: machineconfiguration.openshift.io
312-
# version: v1alpha1
313-
# - kind: MachineOSConfig
314-
# group: machineconfiguration.openshift.io
315-
# version: v1alpha1
310+
- kind: MachineOSBuild
311+
group: machineconfiguration.openshift.io
312+
version: v1
313+
- kind: MachineOSConfig
314+
group: machineconfiguration.openshift.io
315+
version: v1
316316
# - kind: PinnedImageSet
317317
# group: machineconfiguration.openshift.io
318318
# version: v1alpha1
@@ -386,10 +386,9 @@ apiMap:
386386
version: v1beta1
387387
- name: Network APIs
388388
resources:
389-
# OpenShift SDN
390-
# - kind: ClusterNetwork
391-
# group: network.openshift.io
392-
# version: v1
389+
- kind: ClusterUserDefinedNetwork
390+
group: k8s.ovn.org
391+
version: v1
393392
- kind: AdminNetworkPolicy
394393
group: policy.networking.k8s.io
395394
version: v1alpha1
@@ -422,33 +421,33 @@ apiMap:
422421
- kind: EndpointSlice
423422
group: discovery.k8s.io
424423
version: v1
425-
# OpenShift SDN
426-
# - kind: EgressNetworkPolicy
427-
# group: network.openshift.io
428-
# version: v1
429424
- kind: EgressRouter
430425
group: network.operator.openshift.io
431426
version: v1
432-
# OpenShift SDN
433-
# - kind: HostSubnet
434-
# group: network.openshift.io
435-
# version: v1
427+
- kind: GRPCRoute
428+
group: gateway.networking.k8s.io
429+
version: v1
430+
- kind: Gateway
431+
group: gateway.networking.k8s.io
432+
version: v1
433+
- kind: GatewayClass
434+
group: gateway.networking.k8s.io
435+
version: v1
436+
- kind: HTTPRoute
437+
group: gateway.networking.k8s.io
438+
version: v1
436439
- kind: Ingress
437440
group: networking.k8s.io
438441
version: v1
439442
- kind: IngressClass
440443
group: networking.k8s.io
441444
version: v1
442-
# - kind: IPAMClaim
443-
# group: k8s.cni.cncf.io
444-
# version: v1alpha1
445+
- kind: IPAMClaim
446+
group: k8s.cni.cncf.io
447+
version: v1alpha1
445448
- kind: IPPool
446449
group: whereabouts.cni.cncf.io
447450
version: v1alpha1
448-
# OpenShift SDN
449-
# - kind: NetNamespace
450-
# group: network.openshift.io
451-
# version: v1
452451
- kind: MultiNetworkPolicy
453452
group: k8s.cni.cncf.io
454453
version: v1beta1
@@ -458,20 +457,26 @@ apiMap:
458457
- kind: NetworkPolicy
459458
group: networking.k8s.io
460459
version: v1
460+
- kind: NodeSlicePool
461+
group: whereabouts.cni.cncf.io
462+
version: v1alpha1
461463
- kind: OverlappingRangeIPReservation
462464
group: whereabouts.cni.cncf.io
463465
version: v1alpha1
464466
- kind: PodNetworkConnectivityCheck
465467
group: controlplane.operator.openshift.io
466468
version: v1alpha1
469+
- kind: ReferenceGrant
470+
group: gateway.networking.k8s.io
471+
version: v1beta1
467472
- kind: Route
468473
group: route.openshift.io
469474
version: v1
470475
- kind: Service
471476
version: v1
472-
# - kind: UserDefinedNetwork
473-
# group: k8s.ovn.org
474-
# version: v1
477+
- kind: UserDefinedNetwork
478+
group: k8s.ovn.org
479+
version: v1
475480
- name: Node APIs
476481
resources:
477482
- kind: Node
@@ -600,12 +605,12 @@ apiMap:
600605
group: operators.coreos.com
601606
version: v1alpha1
602607
# ERROR (objects/index.adoc): "xref:../operatorhub_apis/olm-operator-openshift-io-v1.adoc#olm-operator-openshift-io-v1[`array (OLM)`]" appears to try to reference a file not included in the "openshift-enterprise" distro
603-
# - kind: ClusterCatalog
604-
# group: olm.operatorframework.io
605-
# version: v1
606-
# - kind: ClusterExtension
607-
# group: olm.operatorframework.io
608-
# version: v1
608+
- kind: ClusterCatalog
609+
group: olm.operatorframework.io
610+
version: v1
611+
- kind: ClusterExtension
612+
group: olm.operatorframework.io
613+
version: v1
609614
- kind: ClusterServiceVersion
610615
group: operators.coreos.com
611616
version: v1alpha1
@@ -678,6 +683,9 @@ apiMap:
678683
- kind: HostFirmwareSettings
679684
group: metal3.io
680685
version: v1alpha1
686+
- kind: HostUpdatePolicy
687+
group: metal3.io
688+
version: v1alpha1
681689
- kind: Metal3Remediation
682690
group: infrastructure.cluster.x-k8s.io
683691
version: v1beta1

rest_api/autoscale_apis/horizontalpodautoscaler-autoscaling-v2.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ Required::
333333

334334
| `type`
335335
| `string`
336-
| type is the type of metric source. It should be one of "ContainerResource", "External", "Object", "Pods" or "Resource", each mapping to a matching field in the object. Note: "ContainerResource" type is available on when the feature-gate HPAContainerMetrics is enabled
336+
| type is the type of metric source. It should be one of "ContainerResource", "External", "Object", "Pods" or "Resource", each mapping to a matching field in the object.
337337

338338
|===
339339
=== .spec.metrics[].containerResource
@@ -981,7 +981,7 @@ Required::
981981

982982
| `type`
983983
| `string`
984-
| type is the type of metric source. It will be one of "ContainerResource", "External", "Object", "Pods" or "Resource", each corresponds to a matching field in the object. Note: "ContainerResource" type is available on when the feature-gate HPAContainerMetrics is enabled
984+
| type is the type of metric source. It will be one of "ContainerResource", "External", "Object", "Pods" or "Resource", each corresponds to a matching field in the object.
985985

986986
|===
987987
=== .status.currentMetrics[].containerResource

rest_api/cluster_apis/ipaddress-ipam-cluster-x-k8s-io-v1beta1.adoc

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,30 +66,30 @@ Required::
6666

6767
| `address`
6868
| `string`
69-
| Address is the IP address.
69+
| address is the IP address.
7070

7171
| `claimRef`
7272
| `object`
73-
| ClaimRef is a reference to the claim this IPAddress was created for.
73+
| claimRef is a reference to the claim this IPAddress was created for.
7474

7575
| `gateway`
7676
| `string`
77-
| Gateway is the network gateway of the network the address is from.
77+
| gateway is the network gateway of the network the address is from.
7878

7979
| `poolRef`
8080
| `object`
81-
| PoolRef is a reference to the pool that this IPAddress was created from.
81+
| poolRef is a reference to the pool that this IPAddress was created from.
8282

8383
| `prefix`
8484
| `integer`
85-
| Prefix is the prefix of the address.
85+
| prefix is the prefix of the address.
8686

8787
|===
8888
=== .spec.claimRef
8989
Description::
9090
+
9191
--
92-
ClaimRef is a reference to the claim this IPAddress was created for.
92+
claimRef is a reference to the claim this IPAddress was created for.
9393
--
9494

9595
Type::
@@ -108,16 +108,14 @@ Type::
108108
This field is effectively required, but due to backwards compatibility is
109109
allowed to be empty. Instances of this type with an empty value here are
110110
almost certainly wrong.
111-
TODO: Add other useful fields. apiVersion, kind, uid?
112111
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
113-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
114112

115113
|===
116114
=== .spec.poolRef
117115
Description::
118116
+
119117
--
120-
PoolRef is a reference to the pool that this IPAddress was created from.
118+
poolRef is a reference to the pool that this IPAddress was created from.
121119
--
122120

123121
Type::

rest_api/cluster_apis/ipaddressclaim-ipam-cluster-x-k8s-io-v1beta1.adoc

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,18 @@ Required::
6767

6868
| `clusterName`
6969
| `string`
70-
| ClusterName is the name of the Cluster this object belongs to.
70+
| clusterName is the name of the Cluster this object belongs to.
7171

7272
| `poolRef`
7373
| `object`
74-
| PoolRef is a reference to the pool from which an IP address should be created.
74+
| poolRef is a reference to the pool from which an IP address should be created.
7575

7676
|===
7777
=== .spec.poolRef
7878
Description::
7979
+
8080
--
81-
PoolRef is a reference to the pool from which an IP address should be created.
81+
poolRef is a reference to the pool from which an IP address should be created.
8282
--
8383

8484
Type::
@@ -128,11 +128,11 @@ Type::
128128

129129
| `addressRef`
130130
| `object`
131-
| AddressRef is a reference to the address that was created for this claim.
131+
| addressRef is a reference to the address that was created for this claim.
132132

133133
| `conditions`
134134
| `array`
135-
| Conditions summarises the current state of the IPAddressClaim
135+
| conditions summarises the current state of the IPAddressClaim
136136

137137
| `conditions[]`
138138
| `object`
@@ -143,7 +143,7 @@ Type::
143143
Description::
144144
+
145145
--
146-
AddressRef is a reference to the address that was created for this claim.
146+
addressRef is a reference to the address that was created for this claim.
147147
--
148148

149149
Type::
@@ -162,16 +162,14 @@ Type::
162162
This field is effectively required, but due to backwards compatibility is
163163
allowed to be empty. Instances of this type with an empty value here are
164164
almost certainly wrong.
165-
TODO: Add other useful fields. apiVersion, kind, uid?
166165
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
167-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
168166

169167
|===
170168
=== .status.conditions
171169
Description::
172170
+
173171
--
174-
Conditions summarises the current state of the IPAddressClaim
172+
conditions summarises the current state of the IPAddressClaim
175173
--
176174

177175
Type::
@@ -216,21 +214,21 @@ This field may be empty.
216214
| `string`
217215
| The reason for the condition's last transition in CamelCase.
218216
The specific API may choose whether or not this field is considered a guaranteed API.
219-
This field may not be empty.
217+
This field may be empty.
220218

221219
| `severity`
222220
| `string`
223-
| Severity provides an explicit classification of Reason code, so the users or machines can immediately
221+
| severity provides an explicit classification of Reason code, so the users or machines can immediately
224222
understand the current situation and act accordingly.
225223
The Severity field MUST be set only when Status=False.
226224

227225
| `status`
228226
| `string`
229-
| Status of the condition, one of True, False, Unknown.
227+
| status of the condition, one of True, False, Unknown.
230228

231229
| `type`
232230
| `string`
233-
| Type of condition in CamelCase or in foo.example.com/CamelCase.
231+
| type of condition in CamelCase or in foo.example.com/CamelCase.
234232
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
235233
can be useful (see .node.status.conditions), the ability to deconflict is important.
236234

0 commit comments

Comments
 (0)