Skip to content

Commit 6e9bc4e

Browse files
authored
Merge pull request #111381 from jab-rh/apis-4-22-ec5
Add OpenShift 4.22ec5 APIs
2 parents 32d6814 + ce6d516 commit 6e9bc4e

123 files changed

Lines changed: 9242 additions & 9882 deletions

File tree

Some content is hidden

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

_topic_maps/_topic_map.yml

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3930,15 +3930,6 @@ Topics:
39303930
File: horizontalpodautoscaler-autoscaling-v2
39313931
- Name: 'Scale [autoscaling/v1]'
39323932
File: scale-autoscaling-v1
3933-
- Name: Cluster APIs
3934-
Dir: cluster_apis
3935-
Topics:
3936-
- Name: About Cluster APIs
3937-
File: cluster-apis-index
3938-
- Name: 'IPAddress [ipam.cluster.x-k8s.io/v1beta1]'
3939-
File: ipaddress-ipam-cluster-x-k8s-io-v1beta1
3940-
- Name: 'IPAddressClaim [ipam.cluster.x-k8s.io/v1beta1]'
3941-
File: ipaddressclaim-ipam-cluster-x-k8s-io-v1beta1
39423933
- Name: Config APIs
39433934
Dir: config_apis
39443935
Topics:
@@ -3948,16 +3939,12 @@ Topics:
39483939
File: apiserver-config-openshift-io-v1
39493940
- Name: 'Authentication [config.openshift.io/v1]'
39503941
File: authentication-config-openshift-io-v1
3951-
- Name: 'Backup [config.openshift.io/v1alpha1]'
3952-
File: backup-config-openshift-io-v1alpha1
39533942
- Name: 'Build [config.openshift.io/v1]'
39543943
File: build-config-openshift-io-v1
39553944
- Name: 'ClusterImagePolicy [config.openshift.io/v1]'
39563945
File: clusterimagepolicy-config-openshift-io-v1
39573946
- Name: 'ClusterOperator [config.openshift.io/v1]'
39583947
File: clusteroperator-config-openshift-io-v1
3959-
- Name: 'ClusterMonitoring [config.openshift.io/v1alpha1]'
3960-
File: clustermonitoring-config-openshift-io-v1alpha1
39613948
- Name: 'ClusterVersion [config.openshift.io/v1]'
39623949
File: clusterversion-config-openshift-io-v1
39633950
- Name: 'Console [config.openshift.io/v1]'
@@ -3978,8 +3965,8 @@ Topics:
39783965
File: imagepolicy-config-openshift-io-v1
39793966
- Name: 'ImageTagMirrorSet [config.openshift.io/v1]'
39803967
File: imagetagmirrorset-config-openshift-io-v1
3981-
- Name: 'InsightsDataGather [config.openshift.io/v1alpha2]'
3982-
File: insightsdatagather-config-openshift-io-v1alpha2
3968+
- Name: 'InsightsDataGather [config.openshift.io/v1]'
3969+
File: insightsdatagather-config-openshift-io-v1
39833970
- Name: 'Infrastructure [config.openshift.io/v1]'
39843971
File: infrastructure-config-openshift-io-v1
39853972
- Name: 'Ingress [config.openshift.io/v1]'
@@ -4032,6 +4019,8 @@ Topics:
40324019
File: customresourcedefinition-apiextensions-k8s-io-v1
40334020
- Name: 'MutatingWebhookConfiguration [admissionregistration.k8s.io/v1]'
40344021
File: mutatingwebhookconfiguration-admissionregistration-k8s-io-v1
4022+
- Name: 'TestExtensionAdmission [testextension.redhat.io/v1]'
4023+
File: testextensionadmission-testextension-redhat-io-v1
40354024
- Name: 'ValidatingAdmissionPolicy [admissionregistration.k8s.io/v1]'
40364025
File: validatingadmissionpolicy-admissionregistration-k8s-io-v1
40374026
- Name: 'ValidatingAdmissionPolicyBinding [admissionregistration.k8s.io/v1]'
@@ -4092,10 +4081,6 @@ Topics:
40924081
File: machineosbuild-machineconfiguration-openshift-io-v1
40934082
- Name: 'MachineOSConfig [machineconfiguration.openshift.io/v1]'
40944083
File: machineosconfig-machineconfiguration-openshift-io-v1
4095-
- Name: 'InternalReleaseImage [machineconfiguration.openshift.io/v1alpha1]'
4096-
File: internalreleaseimage-machineconfiguration-openshift-io-v1alpha1
4097-
- Name: 'OSImageStream [machineconfiguration.openshift.io/v1alpha1]'
4098-
File: osimagestream-machineconfiguration-openshift-io-v1alpha1
40994084
- Name: 'PinnedImageSet [machineconfiguration.openshift.io/v1]'
41004085
File: pinnedimageset-machineconfiguration-openshift-io-v1
41014086
- Name: Metadata APIs
@@ -4134,8 +4119,8 @@ Topics:
41344119
File: alertrelabelconfig-monitoring-openshift-io-v1
41354120
- Name: 'AlertingRule [monitoring.openshift.io/v1]'
41364121
File: alertingrule-monitoring-openshift-io-v1
4137-
- Name: 'DataGather [insights.openshift.io/v1alpha2]'
4138-
File: datagather-insights-openshift-io-v1alpha2
4122+
- Name: 'DataGather [insights.openshift.io/v1]'
4123+
File: datagather-insights-openshift-io-v1
41394124
- Name: 'PodMonitor [monitoring.coreos.com/v1]'
41404125
File: podmonitor-monitoring-coreos-com-v1
41414126
- Name: 'Probe [monitoring.coreos.com/v1]'
@@ -4163,12 +4148,12 @@ Topics:
41634148
File: adminnetworkpolicy-policy-networking-k8s-io-v1alpha1
41644149
- Name: 'AdminPolicyBasedExternalRoute [k8s.ovn.org/v1]'
41654150
File: adminpolicybasedexternalroute-k8s-ovn-org-v1
4151+
- Name: 'BackendTLSPolicy [gateway.networking.k8s.io/v1]'
4152+
File: backendtlspolicy-gateway-networking-k8s-io-v1
41664153
- Name: 'BaselineAdminNetworkPolicy [policy.networking.k8s.io/v1alpha1]'
41674154
File: baselineadminnetworkpolicy-policy-networking-k8s-io-v1alpha1
41684155
- Name: 'CloudPrivateIPConfig [cloud.network.openshift.io/v1]'
41694156
File: cloudprivateipconfig-cloud-network-openshift-io-v1
4170-
- Name: 'DNSNameResolver [network.openshift.io/v1alpha1]'
4171-
File: dnsnameresolver-network-openshift-io-v1alpha1
41724157
- Name: 'EgressFirewall [k8s.ovn.org/v1]'
41734158
File: egressfirewall-k8s-ovn-org-v1
41744159
- Name: 'EgressIP [k8s.ovn.org/v1]'
@@ -4264,8 +4249,6 @@ Topics:
42644249
File: authentication-operator-openshift-io-v1
42654250
- Name: 'CloudCredential [operator.openshift.io/v1]'
42664251
File: cloudcredential-operator-openshift-io-v1
4267-
- Name: 'ClusterVersionOperator [operator.openshift.io/v1alpha1]'
4268-
File: clusterversionoperator-operator-openshift-io-v1alpha1
42694252
- Name: 'ClusterCSIDriver [operator.openshift.io/v1]'
42704253
File: clustercsidriver-operator-openshift-io-v1
42714254
- Name: 'Console [operator.openshift.io/v1]'
@@ -4284,8 +4267,6 @@ Topics:
42844267
File: dnsrecord-ingress-operator-openshift-io-v1
42854268
- Name: 'Etcd [operator.openshift.io/v1]'
42864269
File: etcd-operator-openshift-io-v1
4287-
- Name: 'EtcdBackup [operator.openshift.io/v1alpha1]'
4288-
File: etcdbackup-operator-openshift-io-v1alpha1
42894270
- Name: 'ImageContentSourcePolicy [operator.openshift.io/v1alpha1]'
42904271
File: imagecontentsourcepolicy-operator-openshift-io-v1alpha1
42914272
- Name: 'ImagePruner [imageregistry.operator.openshift.io/v1]'
@@ -4327,8 +4308,6 @@ Topics:
43274308
File: clustercatalog-olm-operatorframework-io-v1
43284309
- Name: 'ClusterExtension [olm.operatorframework.io/v1]'
43294310
File: clusterextension-olm-operatorframework-io-v1
4330-
- Name: 'ClusterExtensionRevision [olm.operatorframework.io/v1]'
4331-
File: clusterextensionrevision-olm-operatorframework-io-v1
43324311
- Name: 'ClusterServiceVersion [operators.coreos.com/v1alpha1]'
43334312
File: clusterserviceversion-operators-coreos-com-v1alpha1
43344313
- Name: 'InstallPlan [operators.coreos.com/v1alpha1]'
@@ -4431,6 +4410,8 @@ Topics:
44314410
File: appliedclusterresourcequota-quota-openshift-io-v1
44324411
- Name: 'ClusterResourceQuota [quota.openshift.io/v1]'
44334412
File: clusterresourcequota-quota-openshift-io-v1
4413+
- Name: 'DeviceClass [resource.k8s.io/v1]'
4414+
File: deviceclass-resource-k8s-io-v1
44344415
- Name: 'FlowSchema [flowcontrol.apiserver.k8s.io/v1]'
44354416
File: flowschema-flowcontrol-apiserver-k8s-io-v1
44364417
- Name: 'LimitRange [undefined/v1]'
@@ -4441,6 +4422,12 @@ Topics:
44414422
File: prioritylevelconfiguration-flowcontrol-apiserver-k8s-io-v1
44424423
- Name: 'ResourceQuota [undefined/v1]'
44434424
File: resourcequota-v1
4425+
- Name: 'ResourceClaim [resource.k8s.io/v1]'
4426+
File: resourceclaim-resource-k8s-io-v1
4427+
- Name: 'ResourceClaimTemplate [resource.k8s.io/v1]'
4428+
File: resourceclaimtemplate-resource-k8s-io-v1
4429+
- Name: 'ResourceSlice [resource.k8s.io/v1]'
4430+
File: resourceslice-resource-k8s-io-v1
44444431
- Name: Security APIs
44454432
Dir: security_apis
44464433
Topics:

api-config.yaml

Lines changed: 22 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ apiMap:
5757
- kind: Scale
5858
group: autoscaling
5959
version: v1
60-
- name: Cluster APIs
61-
resources:
60+
#- name: Cluster APIs
61+
# resources:
6262
# Not included in apis-4.17.0-rc.3
6363
# - kind: Cluster
6464
# group: cluster.x-k8s.io
@@ -119,9 +119,6 @@ apiMap:
119119
- kind: Authentication
120120
group: config.openshift.io
121121
version: v1
122-
- kind: Backup
123-
group: config.openshift.io
124-
version: v1alpha1
125122
- kind: Build
126123
group: config.openshift.io
127124
version: v1
@@ -131,9 +128,6 @@ apiMap:
131128
- kind: ClusterOperator
132129
group: config.openshift.io
133130
version: v1
134-
- kind: ClusterMonitoring
135-
group: config.openshift.io
136-
version: v1alpha1
137131
- kind: ClusterVersion
138132
group: config.openshift.io
139133
version: v1
@@ -166,7 +160,7 @@ apiMap:
166160
version: v1
167161
- kind: InsightsDataGather
168162
group: config.openshift.io
169-
version: v1alpha2
163+
version: v1
170164
- kind: Infrastructure
171165
group: config.openshift.io
172166
version: v1
@@ -234,6 +228,9 @@ apiMap:
234228
- kind: MutatingWebhookConfiguration
235229
group: admissionregistration.k8s.io
236230
version: v1
231+
- kind: TestExtensionAdmission
232+
group: testextension.redhat.io
233+
version: v1
237234
- kind: ValidatingAdmissionPolicy
238235
group: admissionregistration.k8s.io
239236
version: v1
@@ -313,12 +310,6 @@ apiMap:
313310
- kind: MachineOSConfig
314311
group: machineconfiguration.openshift.io
315312
version: v1
316-
- kind: InternalReleaseImage
317-
group: machineconfiguration.openshift.io
318-
version: v1alpha1
319-
- kind: OSImageStream
320-
group: machineconfiguration.openshift.io
321-
version: v1alpha1
322313
- kind: PinnedImageSet
323314
group: machineconfiguration.openshift.io
324315
version: v1
@@ -365,7 +356,7 @@ apiMap:
365356
version: v1
366357
- kind: DataGather
367358
group: insights.openshift.io
368-
version: v1alpha2
359+
version: v1
369360
- kind: PodMonitor
370361
group: monitoring.coreos.com
371362
version: v1
@@ -401,15 +392,15 @@ apiMap:
401392
- kind: AdminPolicyBasedExternalRoute
402393
group: k8s.ovn.org
403394
version: v1
395+
- kind: BackendTLSPolicy
396+
group: gateway.networking.k8s.io
397+
version: v1
404398
- kind: BaselineAdminNetworkPolicy
405399
group: policy.networking.k8s.io
406400
version: v1alpha1
407401
- kind: CloudPrivateIPConfig
408402
group: cloud.network.openshift.io
409403
version: v1
410-
- kind: DNSNameResolver
411-
group: network.openshift.io
412-
version: v1alpha1
413404
- kind: EgressFirewall
414405
group: k8s.ovn.org
415406
version: v1
@@ -539,9 +530,6 @@ apiMap:
539530
- kind: CloudCredential
540531
group: operator.openshift.io
541532
version: v1
542-
- kind: ClusterVersionOperator
543-
group: operator.openshift.io
544-
version: v1alpha1
545533
- kind: ClusterCSIDriver
546534
group: operator.openshift.io
547535
version: v1
@@ -569,9 +557,6 @@ apiMap:
569557
- kind: Etcd
570558
group: operator.openshift.io
571559
version: v1
572-
- kind: EtcdBackup
573-
group: operator.openshift.io
574-
version: v1alpha1
575560
- kind: ImageContentSourcePolicy
576561
group: operator.openshift.io
577562
version: v1alpha1
@@ -628,9 +613,6 @@ apiMap:
628613
- kind: ClusterExtension
629614
group: olm.operatorframework.io
630615
version: v1
631-
- kind: ClusterExtensionRevision
632-
group: olm.operatorframework.io
633-
version: v1
634616
- kind: ClusterServiceVersion
635617
group: operators.coreos.com
636618
version: v1alpha1
@@ -757,6 +739,9 @@ apiMap:
757739
- kind: ClusterResourceQuota
758740
group: quota.openshift.io
759741
version: v1
742+
- kind: DeviceClass
743+
group: resource.k8s.io
744+
version: v1
760745
- kind: FlowSchema
761746
group: flowcontrol.apiserver.k8s.io
762747
version: v1
@@ -773,24 +758,24 @@ apiMap:
773758
version: v1
774759
- kind: ResourceQuota
775760
version: v1
776-
# - kind: ResourceClaim
777-
# group: resource.k8s.io
778-
# version: v1alpha2
761+
- kind: ResourceClaim
762+
group: resource.k8s.io
763+
version: v1
764+
- kind: ResourceClaimTemplate
765+
group: resource.k8s.io
766+
version: v1
767+
- kind: ResourceSlice
768+
group: resource.k8s.io
769+
version: v1
779770
# - kind: ResourceClaimParameters
780771
# group: resource.k8s.io
781772
# version: v1alpha2
782-
# - kind: ResourceClaimTemplate
783-
# group: resource.k8s.io
784-
# version: v1alpha2
785773
# - kind: ResourceClass
786774
# group: resource.k8s.io
787775
# version: v1alpha2
788776
# - kind: ResourceClassParameters
789777
# group: resource.k8s.io
790778
# version: v1alpha2
791-
# - kind: ResourceSlice
792-
# group: resource.k8s.io
793-
# version: v1alpha2
794779
- name: Security APIs
795780
resources:
796781
- kind: CertificateSigningRequest

rest_api/autoscale_apis/horizontalpodautoscaler-autoscaling-v2.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,15 @@ Type::
114114

115115
Scaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.
116116

117-
The tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)
117+
The tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires the beta HPAConfigurableTolerance feature gate to be enabled.)
118118

119119
| `scaleUp`
120120
| `object`
121121
| HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.
122122

123123
Scaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.
124124

125-
The tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)
125+
The tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires the beta HPAConfigurableTolerance feature gate to be enabled.)
126126

127127
|===
128128
=== .spec.behavior.scaleDown
@@ -133,7 +133,7 @@ HPAScalingRules configures the scaling behavior for one direction via scaling Po
133133

134134
Scaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.
135135

136-
The tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)
136+
The tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires the beta HPAConfigurableTolerance feature gate to be enabled.)
137137
--
138138

139139
Type::
@@ -168,7 +168,7 @@ Type::
168168

169169
For example, if autoscaling is configured with a memory consumption target of 100Mi, and scale-down and scale-up tolerances of 5% and 1% respectively, scaling will be triggered when the actual consumption falls below 95Mi or exceeds 101Mi.
170170

171-
This is an alpha field and requires enabling the HPAConfigurableTolerance feature gate.
171+
This is an beta field and requires the HPAConfigurableTolerance feature gate to be enabled.
172172

173173
|===
174174
=== .spec.behavior.scaleDown.policies
@@ -226,7 +226,7 @@ HPAScalingRules configures the scaling behavior for one direction via scaling Po
226226

227227
Scaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.
228228

229-
The tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)
229+
The tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires the beta HPAConfigurableTolerance feature gate to be enabled.)
230230
--
231231

232232
Type::
@@ -261,7 +261,7 @@ Type::
261261

262262
For example, if autoscaling is configured with a memory consumption target of 100Mi, and scale-down and scale-up tolerances of 5% and 1% respectively, scaling will be triggered when the actual consumption falls below 95Mi or exceeds 101Mi.
263263

264-
This is an alpha field and requires enabling the HPAConfigurableTolerance feature gate.
264+
This is an beta field and requires the HPAConfigurableTolerance feature gate to be enabled.
265265

266266
|===
267267
=== .spec.behavior.scaleUp.policies

rest_api/cluster_apis/cluster-apis-index.adoc

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

0 commit comments

Comments
 (0)