Skip to content

Commit 0e83bfa

Browse files
authored
Merge pull request #76373 from jab-rh/apis-4-16-rc2
Add OCP 4.16 rc2 APIs
2 parents 40f368c + bb81a19 commit 0e83bfa

File tree

67 files changed

+11132
-1727
lines changed

Some content is hidden

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

67 files changed

+11132
-1727
lines changed

_topic_maps/_topic_map.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3468,8 +3468,6 @@ Topics:
34683468
File: kubeletconfig-machineconfiguration-openshift-io-v1
34693469
- Name: 'MachineConfig [machineconfiguration.openshift.io/v1]'
34703470
File: machineconfig-machineconfiguration-openshift-io-v1
3471-
- Name: 'MachineConfigNode [machineconfiguration.openshift.io/v1alpha1]'
3472-
File: machineconfignode-machineconfiguration-openshift-io-v1alpha1
34733471
- Name: 'MachineConfigPool [machineconfiguration.openshift.io/v1]'
34743472
File: machineconfigpool-machineconfiguration-openshift-io-v1
34753473
- Name: 'MachineHealthCheck [machine.openshift.io/v1beta1]'
@@ -3531,8 +3529,12 @@ Topics:
35313529
Topics:
35323530
- Name: About Network APIs
35333531
File: network-apis-index
3532+
- Name: 'AdminNetworkPolicy [policy.networking.k8s.io/v1alpha1]'
3533+
File: adminnetworkpolicy-policy-networking-k8s-io-v1alpha1
35343534
- Name: 'AdminPolicyBasedExternalRoute [k8s.ovn.org/v1]'
35353535
File: adminpolicybasedexternalroute-k8s-ovn-org-v1
3536+
- Name: 'BaselineAdminNetworkPolicy [policy.networking.k8s.io/v1alpha1]'
3537+
File: baselineadminnetworkpolicy-policy-networking-k8s-io-v1alpha1
35363538
- Name: 'CloudPrivateIPConfig [cloud.network.openshift.io/v1]'
35373539
File: cloudprivateipconfig-cloud-network-openshift-io-v1
35383540
- Name: 'EgressFirewall [k8s.ovn.org/v1]'
@@ -3553,6 +3555,10 @@ Topics:
35533555
File: ingress-networking-k8s-io-v1
35543556
- Name: 'IngressClass [networking.k8s.io/v1]'
35553557
File: ingressclass-networking-k8s-io-v1
3558+
- Name: 'IPAddress [ipam.cluster.x-k8s.io/v1beta1]'
3559+
File: ipaddress-ipam-cluster-x-k8s-io-v1beta1
3560+
- Name: 'IPAddressClaim [ipam.cluster.x-k8s.io/v1beta1]'
3561+
File: ipaddressclaim-ipam-cluster-x-k8s-io-v1beta1
35563562
- Name: 'IPPool [whereabouts.cni.cncf.io/v1alpha1]'
35573563
File: ippool-whereabouts-cni-cncf-io-v1alpha1
35583564
- Name: 'NetworkAttachmentDefinition [k8s.cni.cncf.io/v1]'
@@ -3704,10 +3710,14 @@ Topics:
37043710
File: bmceventsubscription-metal3-io-v1alpha1
37053711
- Name: 'BareMetalHost [metal3.io/v1alpha1]'
37063712
File: baremetalhost-metal3-io-v1alpha1
3713+
- Name: 'DataImage [metal3.io/v1alpha1]'
3714+
File: dataimage-metal3-io-v1alpha1
37073715
- Name: 'FirmwareSchema [metal3.io/v1alpha1]'
37083716
File: firmwareschema-metal3-io-v1alpha1
37093717
- Name: 'HardwareData [metal3.io/v1alpha1]'
37103718
File: hardwaredata-metal3-io-v1alpha1
3719+
- Name: 'HostFirmwareComponents [metal3.io/v1alpha1]'
3720+
File: hostfirmwarecomponents-metal3-io-v1alpha1
37113721
- Name: 'HostFirmwareSettings [metal3.io/v1alpha1]'
37123722
File: hostfirmwaresettings-metal3-io-v1alpha1
37133723
- Name: 'Metal3Remediation [infrastructure.cluster.x-k8s.io/v1beta1]'
@@ -3755,14 +3765,14 @@ Topics:
37553765
File: appliedclusterresourcequota-quota-openshift-io-v1
37563766
- Name: 'ClusterResourceQuota [quota.openshift.io/v1]'
37573767
File: clusterresourcequota-quota-openshift-io-v1
3758-
- Name: 'FlowSchema [flowcontrol.apiserver.k8s.io/v1beta3]'
3759-
File: flowschema-flowcontrol-apiserver-k8s-io-v1beta3
3768+
- Name: 'FlowSchema [flowcontrol.apiserver.k8s.io/v1]'
3769+
File: flowschema-flowcontrol-apiserver-k8s-io-v1
37603770
- Name: 'LimitRange [undefined/v1]'
37613771
File: limitrange-v1
37623772
- Name: 'PriorityClass [scheduling.k8s.io/v1]'
37633773
File: priorityclass-scheduling-k8s-io-v1
3764-
- Name: 'PriorityLevelConfiguration [flowcontrol.apiserver.k8s.io/v1beta3]'
3765-
File: prioritylevelconfiguration-flowcontrol-apiserver-k8s-io-v1beta3
3774+
- Name: 'PriorityLevelConfiguration [flowcontrol.apiserver.k8s.io/v1]'
3775+
File: prioritylevelconfiguration-flowcontrol-apiserver-k8s-io-v1
37663776
- Name: 'ResourceQuota [undefined/v1]'
37673777
File: resourcequota-v1
37683778
- Name: Security APIs

api-config.yaml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,6 @@ apiMap:
217217
- kind: MachineConfig
218218
group: machineconfiguration.openshift.io
219219
version: v1
220-
- kind: MachineConfigNode
221-
group: machineconfiguration.openshift.io
222-
version: v1alpha1
223220
- kind: MachineConfigPool
224221
group: machineconfiguration.openshift.io
225222
version: v1
@@ -294,9 +291,15 @@ apiMap:
294291
# - kind: ClusterNetwork
295292
# group: network.openshift.io
296293
# version: v1
294+
- kind: AdminNetworkPolicy
295+
group: policy.networking.k8s.io
296+
version: v1alpha1
297297
- kind: AdminPolicyBasedExternalRoute
298298
group: k8s.ovn.org
299299
version: v1
300+
- kind: BaselineAdminNetworkPolicy
301+
group: policy.networking.k8s.io
302+
version: v1alpha1
300303
- kind: CloudPrivateIPConfig
301304
group: cloud.network.openshift.io
302305
version: v1
@@ -334,6 +337,12 @@ apiMap:
334337
- kind: IngressClass
335338
group: networking.k8s.io
336339
version: v1
340+
- kind: IPAddress
341+
group: ipam.cluster.x-k8s.io
342+
version: v1beta1
343+
- kind: IPAddressClaim
344+
group: ipam.cluster.x-k8s.io
345+
version: v1beta1
337346
- kind: IPPool
338347
group: whereabouts.cni.cncf.io
339348
version: v1alpha1
@@ -536,12 +545,18 @@ apiMap:
536545
- kind: BareMetalHost
537546
group: metal3.io
538547
version: v1alpha1
548+
- kind: DataImage
549+
group: metal3.io
550+
version: v1alpha1
539551
- kind: FirmwareSchema
540552
group: metal3.io
541553
version: v1alpha1
542554
- kind: HardwareData
543555
group: metal3.io
544556
version: v1alpha1
557+
- kind: HostFirmwareComponents
558+
group: metal3.io
559+
version: v1alpha1
545560
- kind: HostFirmwareSettings
546561
group: metal3.io
547562
version: v1alpha1
@@ -598,15 +613,15 @@ apiMap:
598613
version: v1
599614
- kind: FlowSchema
600615
group: flowcontrol.apiserver.k8s.io
601-
version: v1beta3
616+
version: v1
602617
- kind: LimitRange
603618
version: v1
604619
- kind: PriorityClass
605620
group: scheduling.k8s.io
606621
version: v1
607622
- kind: PriorityLevelConfiguration
608623
group: flowcontrol.apiserver.k8s.io
609-
version: v1beta3
624+
version: v1
610625
- kind: ResourceQuota
611626
version: v1
612627
- name: Security APIs

rest_api/autoscale_apis/clusterautoscaler-autoscaling-openshift-io-v1.adoc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ Type::
7171
| `array (string)`
7272
| BalancingIgnoredLabels sets "--balancing-ignore-label <label name>" flag on cluster-autoscaler for each listed label. This option specifies labels that cluster autoscaler should ignore when considering node group similarity. For example, if you have nodes with "topology.ebs.csi.aws.com/zone" label, you can add name of this label here to prevent cluster autoscaler from spliting nodes into different node groups based on its value.
7373

74+
| `expanders`
75+
| `array (string)`
76+
| Sets the type and order of expanders to be used during scale out operations. This option specifies an ordered list, highest priority first, of expanders that will be used by the cluster autoscaler to select node groups for expansion when scaling out. Expanders instruct the autoscaler on how to choose node groups when scaling out the cluster. They can be specified in order so that the result from the first expander is used as the input to the second, and so forth. For example, if set to `[LeastWaste, Random]` the autoscaler will first evaluate node groups to determine which will have the least resource waste, if multiple groups are selected the autoscaler will then randomly choose between those groups to determine the group for scaling. The following expanders are available: * LeastWaste - selects the node group that will have the least idle CPU (if tied, unused memory) after scale-up. * Priority - selects the node group that has the highest priority assigned by the user. For details, please see https://github.com/openshift/kubernetes-autoscaler/blob/master/cluster-autoscaler/expander/priority/readme.md * Random - selects the node group randomly. If not specified, the default value is `Random`, available options are: `LeastWaste`, `Priority`, `Random`.
77+
7478
| `ignoreDaemonsetsUtilization`
7579
| `boolean`
7680
| Enables/Disables `--ignore-daemonsets-utilization` CA feature flag. Should CA ignore DaemonSet pods when calculating resource utilization for scaling down. false by default
@@ -140,7 +144,7 @@ Type::
140144

141145
| `memory`
142146
| `object`
143-
| Minimum and maximum number of gigabytes of memory in cluster, in the format <min>:<max>. Cluster autoscaler will not scale the cluster beyond these numbers.
147+
| Minimum and maximum number of GiB of memory in cluster, in the format <min>:<max>. Cluster autoscaler will not scale the cluster beyond these numbers.
144148

145149
|===
146150
=== .spec.resourceLimits.cores
@@ -223,7 +227,7 @@ Required::
223227
Description::
224228
+
225229
--
226-
Minimum and maximum number of gigabytes of memory in cluster, in the format <min>:<max>. Cluster autoscaler will not scale the cluster beyond these numbers.
230+
Minimum and maximum number of GiB of memory in cluster, in the format <min>:<max>. Cluster autoscaler will not scale the cluster beyond these numbers.
227231
--
228232

229233
Type::

rest_api/config_apis/apiserver-config-openshift-io-v1.adoc

Lines changed: 55 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -327,29 +327,79 @@ Type::
327327
| `custom`
328328
| ``
329329
| custom is a user-defined TLS security profile. Be extremely careful using a custom profile as invalid configurations can be catastrophic. An example custom profile looks like this:
330-
ciphers: - ECDHE-ECDSA-CHACHA20-POLY1305 - ECDHE-RSA-CHACHA20-POLY1305 - ECDHE-RSA-AES128-GCM-SHA256 - ECDHE-ECDSA-AES128-GCM-SHA256 minTLSVersion: VersionTLS11
330+
ciphers:
331+
- ECDHE-ECDSA-CHACHA20-POLY1305
332+
- ECDHE-RSA-CHACHA20-POLY1305
333+
- ECDHE-RSA-AES128-GCM-SHA256
334+
- ECDHE-ECDSA-AES128-GCM-SHA256
335+
minTLSVersion: VersionTLS11
331336

332337
| `intermediate`
333338
| ``
334339
| intermediate is a TLS security profile based on:
335340
https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28recommended.29
336341
and looks like this (yaml):
337-
ciphers: - TLS_AES_128_GCM_SHA256 - TLS_AES_256_GCM_SHA384 - TLS_CHACHA20_POLY1305_SHA256 - ECDHE-ECDSA-AES128-GCM-SHA256 - ECDHE-RSA-AES128-GCM-SHA256 - ECDHE-ECDSA-AES256-GCM-SHA384 - ECDHE-RSA-AES256-GCM-SHA384 - ECDHE-ECDSA-CHACHA20-POLY1305 - ECDHE-RSA-CHACHA20-POLY1305 - DHE-RSA-AES128-GCM-SHA256 - DHE-RSA-AES256-GCM-SHA384 minTLSVersion: VersionTLS12
342+
ciphers:
343+
- TLS_AES_128_GCM_SHA256
344+
- TLS_AES_256_GCM_SHA384
345+
- TLS_CHACHA20_POLY1305_SHA256
346+
- ECDHE-ECDSA-AES128-GCM-SHA256
347+
- ECDHE-RSA-AES128-GCM-SHA256
348+
- ECDHE-ECDSA-AES256-GCM-SHA384
349+
- ECDHE-RSA-AES256-GCM-SHA384
350+
- ECDHE-ECDSA-CHACHA20-POLY1305
351+
- ECDHE-RSA-CHACHA20-POLY1305
352+
- DHE-RSA-AES128-GCM-SHA256
353+
- DHE-RSA-AES256-GCM-SHA384
354+
minTLSVersion: VersionTLS12
338355

339356
| `modern`
340357
| ``
341358
| modern is a TLS security profile based on:
342359
https://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility
343360
and looks like this (yaml):
344-
ciphers: - TLS_AES_128_GCM_SHA256 - TLS_AES_256_GCM_SHA384 - TLS_CHACHA20_POLY1305_SHA256 minTLSVersion: VersionTLS13
345-
NOTE: Currently unsupported.
361+
ciphers:
362+
- TLS_AES_128_GCM_SHA256
363+
- TLS_AES_256_GCM_SHA384
364+
- TLS_CHACHA20_POLY1305_SHA256
365+
minTLSVersion: VersionTLS13
346366

347367
| `old`
348368
| ``
349369
| old is a TLS security profile based on:
350370
https://wiki.mozilla.org/Security/Server_Side_TLS#Old_backward_compatibility
351371
and looks like this (yaml):
352-
ciphers: - TLS_AES_128_GCM_SHA256 - TLS_AES_256_GCM_SHA384 - TLS_CHACHA20_POLY1305_SHA256 - ECDHE-ECDSA-AES128-GCM-SHA256 - ECDHE-RSA-AES128-GCM-SHA256 - ECDHE-ECDSA-AES256-GCM-SHA384 - ECDHE-RSA-AES256-GCM-SHA384 - ECDHE-ECDSA-CHACHA20-POLY1305 - ECDHE-RSA-CHACHA20-POLY1305 - DHE-RSA-AES128-GCM-SHA256 - DHE-RSA-AES256-GCM-SHA384 - DHE-RSA-CHACHA20-POLY1305 - ECDHE-ECDSA-AES128-SHA256 - ECDHE-RSA-AES128-SHA256 - ECDHE-ECDSA-AES128-SHA - ECDHE-RSA-AES128-SHA - ECDHE-ECDSA-AES256-SHA384 - ECDHE-RSA-AES256-SHA384 - ECDHE-ECDSA-AES256-SHA - ECDHE-RSA-AES256-SHA - DHE-RSA-AES128-SHA256 - DHE-RSA-AES256-SHA256 - AES128-GCM-SHA256 - AES256-GCM-SHA384 - AES128-SHA256 - AES256-SHA256 - AES128-SHA - AES256-SHA - DES-CBC3-SHA minTLSVersion: VersionTLS10
372+
ciphers:
373+
- TLS_AES_128_GCM_SHA256
374+
- TLS_AES_256_GCM_SHA384
375+
- TLS_CHACHA20_POLY1305_SHA256
376+
- ECDHE-ECDSA-AES128-GCM-SHA256
377+
- ECDHE-RSA-AES128-GCM-SHA256
378+
- ECDHE-ECDSA-AES256-GCM-SHA384
379+
- ECDHE-RSA-AES256-GCM-SHA384
380+
- ECDHE-ECDSA-CHACHA20-POLY1305
381+
- ECDHE-RSA-CHACHA20-POLY1305
382+
- DHE-RSA-AES128-GCM-SHA256
383+
- DHE-RSA-AES256-GCM-SHA384
384+
- DHE-RSA-CHACHA20-POLY1305
385+
- ECDHE-ECDSA-AES128-SHA256
386+
- ECDHE-RSA-AES128-SHA256
387+
- ECDHE-ECDSA-AES128-SHA
388+
- ECDHE-RSA-AES128-SHA
389+
- ECDHE-ECDSA-AES256-SHA384
390+
- ECDHE-RSA-AES256-SHA384
391+
- ECDHE-ECDSA-AES256-SHA
392+
- ECDHE-RSA-AES256-SHA
393+
- DHE-RSA-AES128-SHA256
394+
- DHE-RSA-AES256-SHA256
395+
- AES128-GCM-SHA256
396+
- AES256-GCM-SHA384
397+
- AES128-SHA256
398+
- AES256-SHA256
399+
- AES128-SHA
400+
- AES256-SHA
401+
- DES-CBC3-SHA
402+
minTLSVersion: VersionTLS10
353403

354404
| `type`
355405
| `string`

rest_api/config_apis/clusterversion-config-openshift-io-v1.adoc

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

346346
| `conditions`
347347
| `array`
348-
| conditions represents the observations of the conditional update's current status. Known types are: * Evaluating, for whether the cluster-version operator will attempt to evaluate any risks[].matchingRules. * Recommended, for whether the update is recommended for the current cluster.
348+
| conditions represents the observations of the conditional update's current status. Known types are: * Recommended, for whether the update is recommended for the current cluster.
349349

350350
| `conditions[]`
351351
| `object`
@@ -370,7 +370,7 @@ Required::
370370
Description::
371371
+
372372
--
373-
conditions represents the observations of the conditional update's current status. Known types are: * Evaluating, for whether the cluster-version operator will attempt to evaluate any risks[].matchingRules. * Recommended, for whether the update is recommended for the current cluster.
373+
conditions represents the observations of the conditional update's current status. Known types are: * Recommended, for whether the update is recommended for the current cluster.
374374
--
375375

376376
Type::

0 commit comments

Comments
 (0)